From 44c67e2ebfcdb426c08e8f2320a4763ce9a1ba76 Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Sat, 23 Mar 2024 15:52:52 +0800 Subject: [PATCH] remove babel and compile test files --- packages/api/.dockerignore | 1 + packages/api/.eslintignore | 2 -- packages/api/mocha-config.json | 3 ++- packages/api/package.json | 7 +++--- packages/api/test/babel-register.js | 3 --- packages/api/tsconfig.json | 4 ++-- tsconfig.json | 1 - yarn.lock | 37 ++++------------------------- 8 files changed, 12 insertions(+), 46 deletions(-) delete mode 100644 packages/api/test/babel-register.js diff --git a/packages/api/.dockerignore b/packages/api/.dockerignore index 4534f100a..db2866f3c 100644 --- a/packages/api/.dockerignore +++ b/packages/api/.dockerignore @@ -6,3 +6,4 @@ Dockerfile .dockerignore *.yaml .secrets*.yaml +test diff --git a/packages/api/.eslintignore b/packages/api/.eslintignore index 4a2dcf8e2..a784fd752 100644 --- a/packages/api/.eslintignore +++ b/packages/api/.eslintignore @@ -1,5 +1,3 @@ node_modules/ dist/ -readabilityjs/ src/generated/ -test/resolvers/ diff --git a/packages/api/mocha-config.json b/packages/api/mocha-config.json index 1309d5869..ebe512a91 100644 --- a/packages/api/mocha-config.json +++ b/packages/api/mocha-config.json @@ -2,5 +2,6 @@ "extension": ["ts"], "spec": "test/**/*.test.ts", "reporter": "mocha-unfunk-reporter", - "require": ["test/babel-register.js", "test/global-setup.ts", "test/global-teardown.ts"] + "require": ["test/global-setup.ts", "test/global-teardown.ts"], + "timeout": 10000 } diff --git a/packages/api/package.json b/packages/api/package.json index 95aa34d84..3b694314d 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -6,12 +6,12 @@ "build": "tsc", "dev": "ts-node-dev --debounce 100 --respawn --transpile-only src/server.ts", "dev_qp": "ts-node-dev --debounce 100 --respawn --transpile-only src/queue-processor.ts", - "start": "node dist/server.js", - "start_queue_processor": "node dist/queue-processor.js", + "start": "node dist/src/server.js", + "start_queue_processor": "node dist/src/queue-processor.js", "lint": "eslint src --ext ts,js,tsx,jsx", "lint:fix": "eslint src --fix --ext ts,js,tsx,jsx", "test:typecheck": "tsc --noEmit", - "test": "nyc mocha -r ts-node/register --config mocha-config.json --timeout 10000" + "test": "nyc mocha -r ts-node/register --config mocha-config.json" }, "dependencies": { "@bmatei/apollo-prometheus-exporter": "^3.0.0", @@ -116,7 +116,6 @@ "youtubei": "1.3.7" }, "devDependencies": { - "@babel/register": "^7.14.5", "@istanbuljs/nyc-config-typescript": "^1.0.2", "@types/addressparser": "^1.0.1", "@types/analytics-node": "^3.1.7", diff --git a/packages/api/test/babel-register.js b/packages/api/test/babel-register.js deleted file mode 100644 index a6f65f60a..000000000 --- a/packages/api/test/babel-register.js +++ /dev/null @@ -1,3 +0,0 @@ -const register = require('@babel/register').default - -register({ extensions: ['.ts', '.tsx', '.js', '.jsx'] }) diff --git a/packages/api/tsconfig.json b/packages/api/tsconfig.json index 7c8caecfd..bbc8a9aee 100644 --- a/packages/api/tsconfig.json +++ b/packages/api/tsconfig.json @@ -6,6 +6,6 @@ "compilerOptions": { "outDir": "dist" }, - "include": ["src", "test"], - "exclude": ["./src/generated", "./test"] + "include": ["src/**/*.ts", "test/**/*.ts"], + "exclude": ["./src/generated"] } diff --git a/tsconfig.json b/tsconfig.json index 3fd6afacb..9e833a858 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,6 +1,5 @@ { "$schema": "https://json.schemastore.org/tsconfig", - "display": "Node 14", "compilerOptions": { "lib": ["es2020", "dom"], diff --git a/yarn.lock b/yarn.lock index f31031bd2..074fd4c76 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2233,17 +2233,6 @@ pirates "^4.0.5" source-map-support "^0.5.16" -"@babel/register@^7.14.5": - version "7.15.3" - resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.15.3.tgz#6b40a549e06ec06c885b2ec42c3dd711f55fe752" - integrity sha512-mj4IY1ZJkorClxKTImccn4T81+UKTo4Ux0+OFSV9hME1ooqS9UV+pJ6BjD0qXPK4T3XW/KNa79XByjeEMZz+fw== - dependencies: - clone-deep "^4.0.1" - find-cache-dir "^2.0.0" - make-dir "^2.1.0" - pirates "^4.0.0" - source-map-support "^0.5.16" - "@babel/runtime-corejs3@^7.10.2", "@babel/runtime-corejs3@^7.9.2": version "7.15.3" resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.15.3.tgz#28754263988198f2a928c09733ade2fb4d28089d" @@ -11686,16 +11675,10 @@ camelcase@^6.0.0, camelcase@^6.2.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== -caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001251, caniuse-lite@^1.0.30001286, caniuse-lite@^1.0.30001317: - version "1.0.30001527" - resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001527.tgz" - integrity sha512-YkJi7RwPgWtXVSgK4lG9AHH57nSzvvOp9MesgXmw4Q7n0C3H04L0foHqfxcmSAm5AcWb8dW9AYj2tR7/5GnddQ== - -caniuse-lite@^1.0.30001406: - version "1.0.30001554" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001554.tgz#ba80d88dff9acbc0cd4b7535fc30e0191c5e2e2a" - integrity sha512-A2E3U//MBwbJVzebddm1YfNp7Nud5Ip+IPn4BozBmn4KqVX7AvluoIDFWjsv5OkGnKUXQVmMSoMKLa3ScCblcQ== - +caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001251, caniuse-lite@^1.0.30001286, caniuse-lite@^1.0.30001317, caniuse-lite@^1.0.30001406: + version "1.0.30001600" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001600.tgz" + integrity sha512-+2S9/2JFhYmYaDpZvo0lKkfvuKIglrx68MwOBqMGHhQsNkLjB5xtc/TGoEPs+MxjSyN/72qer2g97nzR641mOQ== capital-case@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/capital-case/-/capital-case-1.0.4.tgz#9d130292353c9249f6b00fa5852bee38a717e669" @@ -23333,11 +23316,6 @@ node-mailjet@^6.0.5: json-bigint "^1.0.0" url-join "^4.0.0" -node-modules-regexp@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40" - integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= - node-plop@~0.26.2: version "0.26.2" resolved "https://registry.yarnpkg.com/node-plop/-/node-plop-0.26.2.tgz#c2523596dab4e28360e615b768b11b4d60d5b1b9" @@ -25178,13 +25156,6 @@ pify@^4.0.1: resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== -pirates@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87" - integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA== - dependencies: - node-modules-regexp "^1.0.0" - pirates@^4.0.1, pirates@^4.0.4, pirates@^4.0.5: version "4.0.5" resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b"