From df11946d522de4cc3f5a9b364a438f7f077574fd Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Sat, 8 Jul 2023 16:56:54 +0000 Subject: [PATCH] revert 679d89fa59bf4628e6e27ca73af8630080d7a063 revert build: :zap: build megalodon with swc Do it right this time --- packages/README.md | 2 +- packages/megalodon/.swcrc | 19 ------------------- packages/megalodon/package.json | 9 ++------- pnpm-lock.yaml | 16 +++------------- 4 files changed, 6 insertions(+), 40 deletions(-) delete mode 100644 packages/megalodon/.swcrc diff --git a/packages/README.md b/packages/README.md index ed4b8f6c4..0ed7c6403 100644 --- a/packages/README.md +++ b/packages/README.md @@ -7,4 +7,4 @@ This directory contains all of the packages Calckey uses. - `client`: Web interface written in Vue3 and TypeScript - `sw`: Web [Service Worker](https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API) written in TypeScript - `calckey-js`: TypeScript SDK for both backend and client, also published on [NPM](https://www.npmjs.com/package/calckey-js) for public use -- `megalodon`: TypeScript library used for Mastodon API compatibility +- `megalodon`: TypeScript library used for partial Mastodon API compatibility diff --git a/packages/megalodon/.swcrc b/packages/megalodon/.swcrc deleted file mode 100644 index c590064ec..000000000 --- a/packages/megalodon/.swcrc +++ /dev/null @@ -1,19 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/swcrc", - "jsc": { - "parser": { - "syntax": "typescript", - "dynamicImport": true, - "decorators": true - }, - "transform": { - "decoratorMetadata": true - }, - "target": "es2022" - }, - "minify": false, - "module": { - "type": "commonjs", - "strict": true - } -} diff --git a/packages/megalodon/package.json b/packages/megalodon/package.json index 646b3040b..43479b2e7 100644 --- a/packages/megalodon/package.json +++ b/packages/megalodon/package.json @@ -4,7 +4,7 @@ "main": "./lib/src/index.js", "typings": "./lib/src/index.d.ts", "scripts": { - "build": "pnpm swc src -d lib/src -D", + "build": "tsc -p ./", "lint": "eslint --ext .js,.ts src", "doc": "typedoc --out ../docs ./src", "test": "NODE_ENV=test jest -u --maxWorkers=3" @@ -49,8 +49,6 @@ "async-lock": "1.4.0" }, "devDependencies": { - "@swc/cli": "^0.1.62", - "@swc/core": "^1.3.62", "@types/core-js": "^2.5.0", "@types/form-data": "^2.5.0", "@types/jest": "^29.4.0", @@ -79,8 +77,5 @@ "directories": { "lib": "lib", "test": "test" - }, - "optionalDependencies": { - "@swc/core-android-arm64": "1.3.11" - } + } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b9522c434..b18c93854 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -789,7 +789,7 @@ importers: version: 2.30.0 emojilib: specifier: github:thatonecalculator/emojilib - version: github.com/thatonecalculator/emojilib/15fd9504f943763a057ff803ee2009ec0524c96b + version: github.com/thatonecalculator/emojilib/9d16541664dc8fef3201ae9b647477070676a52e escape-regexp: specifier: 0.0.1 version: 0.0.1 @@ -970,17 +970,7 @@ importers: ws: specifier: 8.12.0 version: 8.12.0 - optionalDependencies: - '@swc/core-android-arm64': - specifier: 1.3.11 - version: 1.3.11 devDependencies: - '@swc/cli': - specifier: ^0.1.62 - version: 0.1.62(@swc/core@1.3.62)(chokidar@3.3.1) - '@swc/core': - specifier: ^1.3.62 - version: 1.3.62 '@types/async-lock': specifier: 1.4.0 version: 1.4.0 @@ -17439,8 +17429,8 @@ packages: url-polyfill: 1.1.12 dev: true - github.com/thatonecalculator/emojilib/15fd9504f943763a057ff803ee2009ec0524c96b: - resolution: {tarball: https://codeload.github.com/thatonecalculator/emojilib/tar.gz/15fd9504f943763a057ff803ee2009ec0524c96b} + github.com/thatonecalculator/emojilib/9d16541664dc8fef3201ae9b647477070676a52e: + resolution: {tarball: https://codeload.github.com/thatonecalculator/emojilib/tar.gz/9d16541664dc8fef3201ae9b647477070676a52e} name: emojilib version: 3.0.10 dev: true