From c6113b82236bb62a175ad6f556eebd1f1db103a3 Mon Sep 17 00:00:00 2001 From: Muttakin Islam Hasib Date: Wed, 13 Dec 2023 19:02:23 +0600 Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=9B=A0=EF=B8=8F=20=20upgrade?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/admin/project.json | 5 +---- apps/api-e2e/project.json | 8 ++------ apps/api/project.json | 14 ++----------- apps/web/project.json | 5 +---- libs/client/project.json | 5 +---- libs/common/project.json | 5 +---- libs/mail/project.json | 5 +---- libs/types/project.json | 5 +---- libs/ui/project.json | 5 +---- migrations.json | 41 +++++++++++++++++++-------------------- nx.json | 19 +++++++++++------- package.json | 35 +++++++++++++++++---------------- 12 files changed, 61 insertions(+), 91 deletions(-) diff --git a/apps/admin/project.json b/apps/admin/project.json index 14e7e4c..d18eec6 100644 --- a/apps/admin/project.json +++ b/apps/admin/project.json @@ -45,10 +45,7 @@ }, "lint": { "executor": "@nx/eslint:lint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["apps/admin/**/*.{ts,tsx,js,jsx}"] - } + "outputs": ["{options.outputFile}"] } }, "tags": [] diff --git a/apps/api-e2e/project.json b/apps/api-e2e/project.json index 32065f2..b741d2f 100644 --- a/apps/api-e2e/project.json +++ b/apps/api-e2e/project.json @@ -8,16 +8,12 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{e2eProjectRoot}"], "options": { - "jestConfig": "apps/api-e2e/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/api-e2e/jest.config.ts" } }, "lint": { "executor": "@nx/eslint:lint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["apps/api-e2e/**/*.{js,ts}"] - } + "outputs": ["{options.outputFile}"] } } } diff --git a/apps/api/project.json b/apps/api/project.json index 8903048..c9c4b9d 100644 --- a/apps/api/project.json +++ b/apps/api/project.json @@ -47,23 +47,13 @@ }, "lint": { "executor": "@nx/eslint:lint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["apps/api/**/*.ts"] - } + "outputs": ["{options.outputFile}"] }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "apps/api/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "apps/api/jest.config.ts" } } }, diff --git a/apps/web/project.json b/apps/web/project.json index 0abb257..dd89ca8 100644 --- a/apps/web/project.json +++ b/apps/web/project.json @@ -44,10 +44,7 @@ }, "lint": { "executor": "@nx/eslint:lint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["apps/web/**/*.{ts,tsx,js,jsx}"] - } + "outputs": ["{options.outputFile}"] } }, "tags": [] diff --git a/libs/client/project.json b/libs/client/project.json index b1a1965..760ed87 100644 --- a/libs/client/project.json +++ b/libs/client/project.json @@ -7,10 +7,7 @@ "targets": { "lint": { "executor": "@nx/eslint:lint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/client/**/*.{ts,tsx,js,jsx}"] - } + "outputs": ["{options.outputFile}"] } } } diff --git a/libs/common/project.json b/libs/common/project.json index 557f99a..4269553 100644 --- a/libs/common/project.json +++ b/libs/common/project.json @@ -6,10 +6,7 @@ "targets": { "lint": { "executor": "@nx/eslint:lint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/common/**/*.ts"] - } + "outputs": ["{options.outputFile}"] } }, "tags": [] diff --git a/libs/mail/project.json b/libs/mail/project.json index 15ec2da..9c6a035 100644 --- a/libs/mail/project.json +++ b/libs/mail/project.json @@ -6,10 +6,7 @@ "targets": { "lint": { "executor": "@nx/eslint:lint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/mail/**/*.ts"] - } + "outputs": ["{options.outputFile}"] } }, "tags": [] diff --git a/libs/types/project.json b/libs/types/project.json index 9f775ed..f8484a4 100644 --- a/libs/types/project.json +++ b/libs/types/project.json @@ -6,10 +6,7 @@ "targets": { "lint": { "executor": "@nx/eslint:lint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/types/**/*.ts"] - } + "outputs": ["{options.outputFile}"] } }, "tags": [] diff --git a/libs/ui/project.json b/libs/ui/project.json index 9b55fd7..2ab7f5c 100644 --- a/libs/ui/project.json +++ b/libs/ui/project.json @@ -7,10 +7,7 @@ "targets": { "lint": { "executor": "@nx/eslint:lint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/ui/**/*.{ts,tsx,js,jsx}"] - } + "outputs": ["{options.outputFile}"] } } } diff --git a/migrations.json b/migrations.json index 2429579..994b08c 100644 --- a/migrations.json +++ b/migrations.json @@ -2,33 +2,32 @@ "migrations": [ { "cli": "nx", - "version": "17.0.0-beta.1", - "description": "Updates the default cache directory to .nx/cache", - "implementation": "./src/migrations/update-17-0-0/move-cache-directory", - "package": "nx", - "name": "17.0.0-move-cache-directory" + "version": "17.2.1-beta.0", + "description": "Add webpack.config.js file when webpackConfig is not defined", + "implementation": "./src/migrations/update-17-2-1/webpack-config-setup", + "package": "@nx/webpack", + "name": "update-17-2-1-webpack-config-setup" }, { - "cli": "nx", - "version": "17.0.0-beta.3", - "description": "Use minimal config for tasksRunnerOptions", - "implementation": "./src/migrations/update-17-0-0/use-minimal-config-for-tasks-runner-options", - "package": "nx", - "name": "17.0.0-use-minimal-config-for-tasks-runner-options" + "version": "17.1.0-beta.1", + "description": "Updates for @typescript-utils/utils v6.9.1+", + "implementation": "./src/migrations/update-17-1-0/update-typescript-eslint", + "package": "@nx/eslint", + "name": "update-typescript-eslint" }, { - "version": "17.0.0-rc.1", - "description": "Migration for v17.0.0-rc.1", - "implementation": "./src/migrations/update-17-0-0/rm-default-collection-npm-scope", - "package": "nx", - "name": "rm-default-collection-npm-scope" + "version": "17.2.0-beta.0", + "description": "Simplify eslintFilePatterns", + "implementation": "./src/migrations/update-17-2-0/simplify-eslint-patterns", + "package": "@nx/eslint", + "name": "simplify-eslint-patterns" }, { - "version": "17.0.0-beta.7", - "description": "update-17-0-0-rename-to-eslint", - "implementation": "./src/migrations/update-17-0-0-rename-to-eslint/update-17-0-0-rename-to-eslint", - "package": "@nx/eslint", - "name": "update-17-0-0-rename-to-eslint" + "version": "17.1.0-beta.2", + "description": "Move jest executor options to nx.json targetDefaults", + "implementation": "./src/migrations/update-17-1-0/move-options-to-target-defaults", + "package": "@nx/jest", + "name": "move-options-to-target-defaults" } ] } diff --git a/nx.json b/nx.json index 27711f0..3992817 100644 --- a/nx.json +++ b/nx.json @@ -6,10 +6,6 @@ "inputs": ["production", "^production"], "cache": true }, - "test": { - "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"], - "cache": true - }, "lint": { "inputs": [ "default", @@ -19,9 +15,18 @@ ], "cache": true }, - "e2e": { - "inputs": ["default", "^production"], - "cache": true + "@nx/jest:jest": { + "cache": true, + "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"], + "options": { + "passWithNoTests": true + }, + "configurations": { + "ci": { + "ci": true, + "codeCoverage": true + } + } } }, "namedInputs": { diff --git a/package.json b/package.json index 72e4898..5e336a9 100644 --- a/package.json +++ b/package.json @@ -97,17 +97,17 @@ "devDependencies": { "@nestjs/schematics": "^10.0.1", "@nestjs/testing": "^10.0.2", - "@nx/cypress": "17.0.2", - "@nx/eslint": "17.0.2", - "@nx/eslint-plugin": "17.0.2", - "@nx/jest": "17.0.2", - "@nx/js": "17.0.2", - "@nx/nest": "17.0.2", - "@nx/next": "17.0.2", - "@nx/node": "17.0.2", - "@nx/react": "17.0.2", - "@nx/webpack": "17.0.2", - "@nx/workspace": "17.0.2", + "@nx/cypress": "17.2.3", + "@nx/eslint": "17.2.3", + "@nx/eslint-plugin": "17.2.3", + "@nx/jest": "17.2.3", + "@nx/js": "17.2.3", + "@nx/nest": "17.2.3", + "@nx/next": "17.2.3", + "@nx/node": "17.2.3", + "@nx/react": "17.2.3", + "@nx/webpack": "17.2.3", + "@nx/workspace": "17.2.3", "@swc/cli": "~0.1.62", "@swc/core": "^1.3.93", "@swc/plugin-styled-components": "^1.5.67", @@ -117,7 +117,7 @@ "@types/express-session": "^1.17.9", "@types/jest": "^29.4.0", "@types/lodash": "^4.14.200", - "@types/node": "18.14.2", + "@types/node": "18.16.9", "@types/nodemailer": "^6.4.14", "@types/passport": "^1.0.14", "@types/passport-local": "^1.0.37", @@ -126,12 +126,12 @@ "@types/react-is": "18.2.2", "@types/react-slick": "^0.23.11", "@types/styled-components": "5.1.26", - "@typescript-eslint/eslint-plugin": "^5.60.1", - "@typescript-eslint/parser": "^5.60.1", + "@typescript-eslint/eslint-plugin": "6.14.0", + "@typescript-eslint/parser": "6.14.0", "autoprefixer": "10.4.13", "babel-plugin-styled-components": "1.10.7", "cypress": "^13.0.0", - "eslint": "~8.46.0", + "eslint": "8.48.0", "eslint-config-next": "^14.0.2", "eslint-config-prettier": "9.0.0", "eslint-plugin-import": "2.27.5", @@ -142,13 +142,14 @@ "jest": "^29.4.1", "jest-environment-jsdom": "^29.4.1", "jest-environment-node": "^29.4.1", - "nx": "^17.0.2", + "nx": "17.2.3", "postcss": "8.4.21", "prettier": "^2.6.2", "sass": "1.62.1", "tailwindcss": "3.2.7", "ts-jest": "^29.1.0", "ts-node": "10.9.1", - "typescript": "~5.1.3" + "typescript": "5.2.2" } } +