diff --git a/webapp/boards/jest.config.js b/webapp/boards/jest.config.js index 05b4cd53e9..85b8e69719 100644 --- a/webapp/boards/jest.config.js +++ b/webapp/boards/jest.config.js @@ -7,7 +7,7 @@ const config = { transform: { "^.+\\.(t|j)sx?$": ["@swc/jest"] }, - moduleFileExtensions: [ + moduleFileExtensions: [ "ts", "tsx", "js", @@ -20,7 +20,6 @@ const config = { "/nanoevents/", "node_modules/(?!react-native|react-router|react-day-picker)" ], - maxWorkers: "80%", testEnvironment: "jsdom", collectCoverage: true, collectCoverageFrom: [ diff --git a/webapp/boards/package.json b/webapp/boards/package.json index 241571048f..da149e9f85 100644 --- a/webapp/boards/package.json +++ b/webapp/boards/package.json @@ -103,7 +103,6 @@ "@typescript-eslint/eslint-plugin": "5.57.1", "@typescript-eslint/parser": "5.57.1", "babel-eslint": "10.1.0", - "cross-env": "^7.0.3", "css-loader": "6.7.1", "eslint-import-resolver-webpack": "0.13.2", "eslint-plugin-babel": "^5.3.1", diff --git a/webapp/channels/build/contrib/gitlab/.gitlab-ci.yml b/webapp/channels/build/contrib/gitlab/.gitlab-ci.yml index 66b2cef95e..9d9bb1c246 100644 --- a/webapp/channels/build/contrib/gitlab/.gitlab-ci.yml +++ b/webapp/channels/build/contrib/gitlab/.gitlab-ci.yml @@ -13,4 +13,4 @@ test: before_script: - npm ci --ignore-scripts script: - - npm run test:speed + - npm run test diff --git a/webapp/channels/package.json b/webapp/channels/package.json index b948c1d924..12beb235e3 100644 --- a/webapp/channels/package.json +++ b/webapp/channels/package.json @@ -156,7 +156,6 @@ "babel-plugin-typescript-to-proptypes": "1.4.2", "bundle-loader": "0.2.0", "copy-webpack-plugin": "11.0.0", - "cross-env": "7.0.3", "css-loader": "5.2.6", "dotenv-webpack": "8.0.1", "enzyme": "3.11.0", @@ -216,15 +215,13 @@ "build": "cross-env NODE_ENV=production webpack", "run": "webpack --progress --watch", "dev-server": "webpack serve --mode development", - "test": "cross-env TZ=Etc/UTC jest --maxWorkers=50%", + "test": "cross-env TZ=Etc/UTC jest", + "test:watch": "cross-env TZ=Etc/UTC jest --watch", + "test:updatesnapshot": "cross-env TZ=Etc/UTC jest --updateSnapshot", + "test:debug": "cross-env TZ=Etc/UTC jest --forceExit --detectOpenHandles --verbose", "test-ci": "cross-env TZ=Etc/UTC jest --ci --maxWorkers=100%", "clean": "rm -rf dist node_modules .eslintcache .stylelintcache tsconfig.tsbuildinfo", "stats": "cross-env NODE_ENV=production webpack --profile --json > webpack_stats.json", - "updatesnapshot": "cross-env TZ=Etc/UTC jest --updateSnapshot", - "test:debug": "cross-env TZ=Etc/UTC jest --forceExit --detectOpenHandles", - "test:speed": "cross-env TZ=Etc/UTC jest", - "test:watch": "cross-env TZ=Etc/UTC jest --watch", - "test:coverage": "cross-env TZ=Etc/UTC jest --coverage", "mmjstool": "mmjstool", "i18n-extract": "npm run mmjstool -- i18n extract-webapp --webapp-dir ./src", "i18n-clean-empty": "npm run mmjstool -- i18n clean-empty --webapp-dir ./src", diff --git a/webapp/package-lock.json b/webapp/package-lock.json index f00c8fe841..b666571cc3 100644 --- a/webapp/package-lock.json +++ b/webapp/package-lock.json @@ -19,6 +19,7 @@ "blessed": "0.1.81", "chalk": "4.1.2", "concurrently": "7.6.0", + "cross-env": "7.0.3", "eslint": "8.37.0", "strip-ansi": "6.0.1" }, @@ -106,7 +107,6 @@ "@typescript-eslint/eslint-plugin": "5.57.1", "@typescript-eslint/parser": "5.57.1", "babel-eslint": "10.1.0", - "cross-env": "^7.0.3", "css-loader": "6.7.1", "eslint-import-resolver-webpack": "0.13.2", "eslint-plugin-babel": "^5.3.1", @@ -3702,7 +3702,6 @@ "babel-plugin-typescript-to-proptypes": "1.4.2", "bundle-loader": "0.2.0", "copy-webpack-plugin": "11.0.0", - "cross-env": "7.0.3", "css-loader": "5.2.6", "dotenv-webpack": "8.0.1", "enzyme": "3.11.0", @@ -44037,7 +44036,6 @@ "babel-eslint": "10.1.0", "color": "^4.2.1", "core-js": "3.21.1", - "cross-env": "^7.0.3", "css-loader": "6.7.1", "draft-js": "^0.11.7", "emoji-mart": "^3.0.1", @@ -54469,7 +54467,6 @@ "copy-webpack-plugin": "11.0.0", "core-js": "3.26.0", "country-list": "2.2.0", - "cross-env": "7.0.3", "crypto-browserify": "3.12.0", "css-loader": "5.2.6", "css-vars-ponyfill": "2.4.8", diff --git a/webapp/package.json b/webapp/package.json index e799178631..1127b9407f 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -20,6 +20,7 @@ "blessed": "0.1.81", "chalk": "4.1.2", "concurrently": "7.6.0", + "cross-env": "7.0.3", "eslint": "8.37.0", "strip-ansi": "6.0.1" }, diff --git a/webapp/playbooks/package.json b/webapp/playbooks/package.json index b36df25faa..f604532cba 100644 --- a/webapp/playbooks/package.json +++ b/webapp/playbooks/package.json @@ -119,9 +119,11 @@ "dev-server": "webpack serve --mode=development", "check": "eslint --ignore-pattern node_modules --ignore-pattern dist --ext .js --ext .jsx --ext tsx --ext ts . --quiet --cache", "fix": "eslint --ignore-pattern node_modules --ignore-pattern dist --ext .js --ext .jsx --ext tsx --ext ts . --quiet --fix --cache", - "test": "jest --forceExit --detectOpenHandles --verbose", - "test:watch": "jest --watch", - "test-ci": "jest --ci --forceExit --detectOpenHandles --maxWorkers=100%", + "test": "cross-env TZ=Etc/UTC jest", + "test:watch": "cross-env TZ=Etc/UTC jest --watch", + "test:updatesnapshot": "cross-env TZ=Etc/UTC jest --updateSnapshot", + "test:debug": "cross-env TZ=Etc/UTC jest --forceExit --detectOpenHandles --verbose", + "test-ci": "cross-env TZ=Etc/UTC jest --ci --maxWorkers=100%", "check-types": "tsc -b", "extract": "formatjs extract 'src/**/*.{ts,tsx}' --out-file i18n/temp.json --id-interpolation-pattern '[sha512:contenthash:base64:6]' && formatjs compile 'i18n/temp.json' --out-file i18n/en.json && rm i18n/temp.json", "graphql": "graphql-codegen --config graphql_gen.ts",