Skip to content

Commit

Permalink
chore: update to Nx@17 (#732)
Browse files Browse the repository at this point in the history
  • Loading branch information
nsbarsukov authored Dec 7, 2023
1 parent b56623d commit 2fc5ab4
Show file tree
Hide file tree
Showing 11 changed files with 352 additions and 473 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ Thumbs.db
# cypress
**/cypress/**/screenshots/**

.nx/cache
.ssl
RELEASE_BODY.md
projects/demo/routesFile.txt
33 changes: 19 additions & 14 deletions nx.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"npmScope": "maskito",
"affected": {
"defaultBase": "origin/main"
},
Expand Down Expand Up @@ -49,15 +48,6 @@
}
}
},
"tasksRunnerOptions": {
"default": {
"runner": "nx/tasks-runners/default",
"options": {
"cacheableOperations": ["build", "test", "lint"],
"parallel": 3
}
}
},
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"namedInputs": {
"default": ["{projectRoot}/**/*", "sharedGlobals"],
Expand All @@ -79,10 +69,25 @@
},
"targetDefaults": {
"build": {
"inputs": ["production", "^production"]
"inputs": ["production", "^production"],
"cache": true
},
"lint": {
"cache": true
},
"test": {
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"]
"@nx/jest:jest": {
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
"cache": true,
"options": {
"passWithNoTests": true
},
"configurations": {
"ci": {
"ci": true,
"codeCoverage": true
}
}
}
}
},
"parallel": 3
}
735 changes: 306 additions & 429 deletions package-lock.json

Large diffs are not rendered by default.

25 changes: 12 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,18 +89,17 @@
"@babel/core": "7.23.5",
"@babel/preset-react": "7.23.3",
"@commitlint/cli": "18.4.3",
"@nrwl/tao": "16.10.0",
"@nx/angular": "16.10.0",
"@nx/eslint-plugin": "16.10.0",
"@nx/jest": "16.10.0",
"@nx/js": "16.10.0",
"@nx/linter": "16.10.0",
"@nx/node": "16.10.0",
"@nx/react": "16.10.0",
"@nx/rollup": "16.10.0",
"@nx/web": "16.10.0",
"@nx/webpack": "16.10.0",
"@nx/workspace": "16.10.0",
"@nx/angular": "17.1.3",
"@nx/eslint": "17.1.3",
"@nx/eslint-plugin": "17.1.3",
"@nx/jest": "17.1.3",
"@nx/js": "17.1.3",
"@nx/node": "17.1.3",
"@nx/react": "17.1.3",
"@nx/rollup": "17.1.3",
"@nx/web": "17.1.3",
"@nx/webpack": "17.1.3",
"@nx/workspace": "17.1.3",
"@pmmmwh/react-refresh-webpack-plugin": "0.5.11",
"@schematics/angular": "15.2.10",
"@svgr/webpack": "8.1.0",
Expand Down Expand Up @@ -128,7 +127,7 @@
"jest-preset-angular": "13.1.4",
"lint-staged": "15.2.0",
"ng-packagr": "15.2.2",
"nx": "16.10.0",
"nx": "17.1.3",
"postcss": "8.4.32",
"postcss-import": "15.1.0",
"postcss-preset-env": "9.3.0",
Expand Down
3 changes: 1 addition & 2 deletions projects/angular/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/angular"],
"options": {
"jestConfig": "projects/angular/jest.config.ts",
"passWithNoTests": true
"jestConfig": "projects/angular/jest.config.ts"
}
},
"publish": {
Expand Down
4 changes: 2 additions & 2 deletions projects/core/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"tsConfig": "projects/core/tsconfig.lib.json",
"format": ["esm", "cjs"],
"compiler": "tsc",
"external": "all",
"assets": [
{
"glob": "projects/core/README.md",
Expand All @@ -27,8 +28,7 @@
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/core"],
"options": {
"jestConfig": "projects/core/jest.config.ts",
"passWithNoTests": true
"jestConfig": "projects/core/jest.config.ts"
}
},
"publish": {
Expand Down
3 changes: 1 addition & 2 deletions projects/demo/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,7 @@
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/demo"],
"options": {
"jestConfig": "projects/demo/jest.config.ts",
"passWithNoTests": true
"jestConfig": "projects/demo/jest.config.ts"
}
},
"server": {
Expand Down
4 changes: 2 additions & 2 deletions projects/kit/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"tsConfig": "projects/kit/tsconfig.workaround.json",
"format": ["esm", "cjs"],
"compiler": "tsc",
"external": "all",
"assets": [
{
"glob": "projects/kit/README.md",
Expand All @@ -34,8 +35,7 @@
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/kit"],
"options": {
"jestConfig": "projects/kit/jest.config.ts",
"passWithNoTests": true
"jestConfig": "projects/kit/jest.config.ts"
}
},
"publish": {
Expand Down
4 changes: 2 additions & 2 deletions projects/phone/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"tsConfig": "projects/phone/tsconfig.workaround.json",
"format": ["esm", "cjs"],
"compiler": "tsc",
"external": "all",
"assets": [
{
"glob": "projects/phone/README.md",
Expand All @@ -34,8 +35,7 @@
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/phone"],
"options": {
"jestConfig": "projects/phone/jest.config.ts",
"passWithNoTests": true
"jestConfig": "projects/phone/jest.config.ts"
}
},
"publish": {
Expand Down
7 changes: 3 additions & 4 deletions projects/react/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"tsConfig": "projects/react/tsconfig.lib.json",
"project": "projects/react/package.json",
"entryFile": "projects/react/src/index.ts",
"external": ["react/jsx-runtime"],
"external": "all",
"rollupConfig": "@nx/react/plugins/bundle-rollup",
"assets": [
{
Expand All @@ -32,7 +32,7 @@
]
},
"lint": {
"executor": "@nx/linter:eslint",
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["projects/react/**/*.{ts,tsx,js,jsx}"]
Expand All @@ -42,8 +42,7 @@
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/projects/react"],
"options": {
"jestConfig": "projects/react/jest.config.ts",
"passWithNoTests": true
"jestConfig": "projects/react/jest.config.ts"
}
},
"publish": {
Expand Down
6 changes: 3 additions & 3 deletions projects/vue/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"entryFile": "projects/vue/src/index.ts",
"format": ["esm", "cjs"],
"compiler": "tsc",
"external": "all",
"assets": [
{
"glob": "projects/vue/README.md",
Expand All @@ -32,7 +33,7 @@
]
},
"lint": {
"executor": "@nx/linter:eslint",
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["projects/vue/**/*.{ts,js}"]
Expand All @@ -42,8 +43,7 @@
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/projects/vue"],
"options": {
"jestConfig": "projects/vue/jest.config.ts",
"passWithNoTests": true
"jestConfig": "projects/vue/jest.config.ts"
}
},
"publish": {
Expand Down

0 comments on commit 2fc5ab4

Please sign in to comment.