From b0e7512d7aebc2c5effd30e5c1b657b613b85f08 Mon Sep 17 00:00:00 2001 From: undefined Date: Tue, 3 Aug 2021 20:37:35 +0800 Subject: [PATCH] w: remove useless jest --- .github/workflows/build.yml | 8 -------- build/jest.js | 24 ------------------------ jest-mongodb-config.js | 12 ------------ jest.config.js | 16 ---------------- package.json | 5 ----- packages/geoip/download.js | 2 +- packages/geoip/package.json | 6 +++--- 7 files changed, 4 insertions(+), 69 deletions(-) delete mode 100644 build/jest.js delete mode 100644 jest-mongodb-config.js delete mode 100644 jest.config.js diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 07f5cc95..d20e8e74 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,14 +35,6 @@ jobs: yarn build:ui:production - name: Lint run: yarn lint:ci - # - name: Unit Test - # run: yarn jest - # - name: Report Coverage - # uses: codecov/codecov-action@v1 - # with: - # token: ${{ secrets.CODECOV_TOKEN }} - # file: ./.coverage/lcov.info - # name: codecov - name: Publish if: ${{ github.event_name == 'push' }} run: node build/publish.js diff --git a/build/jest.js b/build/jest.js deleted file mode 100644 index b01271c9..00000000 --- a/build/jest.js +++ /dev/null @@ -1,24 +0,0 @@ -/* eslint-disable import/no-extraneous-dependencies */ -const spawn = require('cross-spawn'); - -const args = ['jest', '--coverage']; -const [, , argv2, argv3] = process.argv; - -if (argv2 && !argv2.startsWith('-')) { - args.push(argv2); - if (argv3 && !argv3.startsWith('-')) { - args.push('--collectCoverageFrom'); - if (argv3.endsWith('.ts')) { - args.push(`**/${argv3}`); - } else { - args.push(`**/${argv3}/**/*.ts`); - } - args.push(...process.argv.slice(4)); - } else { - args.push(...process.argv.slice(3)); - } -} else { - args.push('packages/.+\\.spec\\.ts', ...process.argv.slice(2)); -} - -spawn('npx', args, { stdio: 'inherit' }); diff --git a/jest-mongodb-config.js b/jest-mongodb-config.js deleted file mode 100644 index 4ed1ad05..00000000 --- a/jest-mongodb-config.js +++ /dev/null @@ -1,12 +0,0 @@ -module.exports = { - mongodbMemoryServerOptions: { - binary: { - version: '4.0.3', - skipMD5: true, - }, - instance: { - dbName: 'jest', - }, - autoStart: false, - }, -}; diff --git a/jest.config.js b/jest.config.js deleted file mode 100644 index 9725f81d..00000000 --- a/jest.config.js +++ /dev/null @@ -1,16 +0,0 @@ -module.exports = { - preset: '@shelf/jest-mongodb', - transform: { - '^.+\\.ts?$': 'ts-jest', - }, - moduleFileExtensions: ['ts', 'js', 'json'], - collectCoverage: true, - coverageDirectory: '/.coverage', - coverageProvider: 'v8', - coverageReporters: ['text', 'lcov'], - coveragePathIgnorePatterns: [ - 'node_modules/', - 'tests/', - 'dist/', - ], -}; diff --git a/package.json b/package.json index 6ae63650..5bdf847a 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,6 @@ "lint:ui": "yarn run --cwd=packages/ui-default eslint . --fix", "lint:ui:ci": "yarn run --cwd=packages/ui-default eslint .", "pub": "node build/publish", - "jest": "node build/jest", "typedoc": "cross-env NODE_OPTIONS=--max_old_space_size=8192 typedoc", "debug:all": "node --async-stack-traces --trace-deprecation --enable-source-maps build/start --debug --template", "debug": "node --async-stack-traces --trace-deprecation --enable-source-maps node_modules/hydrooj/bin/hydrooj --debug --template", @@ -28,9 +27,7 @@ "version": "1.0.0", "license": "AGPL-3.0-only", "devDependencies": { - "@shelf/jest-mongodb": "^1.3.4", "@types/cross-spawn": "^6.0.2", - "@types/jest": "^26.0.24", "@types/node": "^15.14.3", "@types/semver": "^7.3.8", "@typescript-eslint/eslint-plugin": "^4.28.4", @@ -44,13 +41,11 @@ "eslint-plugin-import": "^2.23.4", "fs-extra": "^10.0.0", "globby": "^11.0.4", - "jest": "^27.0.6", "latest-version": "^5.1.0", "mongodb": "^3.6.10", "nmls": "^3.0.1", "ora": "^5.4.1", "semver": "^7.3.5", - "ts-jest": "^27.0.4", "typedoc": "^0.21.4", "typescript": "4.2.4" } diff --git a/packages/geoip/download.js b/packages/geoip/download.js index 934f2194..3fdf898a 100644 --- a/packages/geoip/download.js +++ b/packages/geoip/download.js @@ -2,4 +2,4 @@ const { spawnSync } = require('child_process'); const os = require('os'); if (os.platform() === 'linux') { spawnSync('bash download.sh'); -} \ No newline at end of file +} diff --git a/packages/geoip/package.json b/packages/geoip/package.json index a1c071de..96d8544c 100644 --- a/packages/geoip/package.json +++ b/packages/geoip/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/geoip", - "version": "1.2.0", + "version": "1.2.1", "main": "package.json", "repository": "git@github.com:hydro-dev/Hydro.git", "author": "undefined ", @@ -10,9 +10,9 @@ }, "preferUnplugged": true, "scripts": { - "postinstall": "node download.js" + "prepublish": "node download.js" }, "peerDependencies": { - "hydrooj": "^2.15.0" + "hydrooj": "*" } }