Skip to content

Commit

Permalink
feat: 🛠️ upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
MuttakinHasib committed Dec 13, 2023
1 parent 6b7e524 commit c6113b8
Show file tree
Hide file tree
Showing 12 changed files with 61 additions and 91 deletions.
5 changes: 1 addition & 4 deletions apps/admin/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,7 @@
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["apps/admin/**/*.{ts,tsx,js,jsx}"]
}
"outputs": ["{options.outputFile}"]
}
},
"tags": []
Expand Down
8 changes: 2 additions & 6 deletions apps/api-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -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}"]
}
}
}
14 changes: 2 additions & 12 deletions apps/api/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
},
Expand Down
5 changes: 1 addition & 4 deletions apps/web/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,7 @@
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["apps/web/**/*.{ts,tsx,js,jsx}"]
}
"outputs": ["{options.outputFile}"]
}
},
"tags": []
Expand Down
5 changes: 1 addition & 4 deletions libs/client/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@
"targets": {
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["libs/client/**/*.{ts,tsx,js,jsx}"]
}
"outputs": ["{options.outputFile}"]
}
}
}
5 changes: 1 addition & 4 deletions libs/common/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@
"targets": {
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["libs/common/**/*.ts"]
}
"outputs": ["{options.outputFile}"]
}
},
"tags": []
Expand Down
5 changes: 1 addition & 4 deletions libs/mail/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@
"targets": {
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["libs/mail/**/*.ts"]
}
"outputs": ["{options.outputFile}"]
}
},
"tags": []
Expand Down
5 changes: 1 addition & 4 deletions libs/types/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@
"targets": {
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["libs/types/**/*.ts"]
}
"outputs": ["{options.outputFile}"]
}
},
"tags": []
Expand Down
5 changes: 1 addition & 4 deletions libs/ui/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@
"targets": {
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["libs/ui/**/*.{ts,tsx,js,jsx}"]
}
"outputs": ["{options.outputFile}"]
}
}
}
41 changes: 20 additions & 21 deletions migrations.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
}
19 changes: 12 additions & 7 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
"inputs": ["production", "^production"],
"cache": true
},
"test": {
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
"cache": true
},
"lint": {
"inputs": [
"default",
Expand All @@ -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": {
Expand Down
35 changes: 18 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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"
}
}

1 comment on commit c6113b8

@vercel
Copy link

@vercel vercel bot commented on c6113b8 Dec 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.