Skip to content

Commit

Permalink
chore(repo): update nx to 17.1.0-beta.4 (nrwl#20124)
Browse files Browse the repository at this point in the history
  • Loading branch information
FrozenPandaz authored Nov 8, 2023
1 parent 801e866 commit c7d0d21
Show file tree
Hide file tree
Showing 15 changed files with 796 additions and 836 deletions.
1 change: 0 additions & 1 deletion e2e/eslint/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"executor": "@nx/jest:jest",
"options": {
"jestConfig": "e2e/eslint/jest.config.ts",
"passWithNoTests": true,
"runInBand": true
},
"outputs": ["{workspaceRoot}/coverage/e2e/eslint"]
Expand Down
3 changes: 1 addition & 2 deletions nx-dev/ui-home/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/nx-dev/ui-home"],
"options": {
"jestConfig": "nx-dev/ui-home/jest.config.ts",
"passWithNoTests": true
"jestConfig": "nx-dev/ui-home/jest.config.ts"
}
}
}
Expand Down
9 changes: 1 addition & 8 deletions nx-dev/util-ai/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,7 @@
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"options": {
"jestConfig": "nx-dev/util-ai/jest.config.ts",
"passWithNoTests": true
},
"configurations": {
"ci": {
"ci": true,
"codeCoverage": true
}
"jestConfig": "nx-dev/util-ai/jest.config.ts"
}
}
},
Expand Down
16 changes: 13 additions & 3 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,6 @@
],
"cache": true
},
"lint-base": {
"cache": true
},
"build-ng": {
"cache": true
},
Expand All @@ -195,6 +192,19 @@
},
"copy-docs": {
"cache": true
},
"@nx/jest:jest": {
"cache": true,
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
"options": {
"passWithNoTests": true
},
"configurations": {
"ci": {
"ci": true,
"codeCoverage": true
}
}
}
},
"plugins": ["@monodon/rust"],
Expand Down
50 changes: 25 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
"@angular-devkit/build-angular": "~17.0.0-rc.4",
"@angular-devkit/core": "~17.0.0-rc.4",
"@angular-devkit/schematics": "~17.0.0-rc.4",
"@angular-eslint/eslint-plugin": "~17.0.0-alpha.0",
"@angular-eslint/eslint-plugin-template": "~17.0.0-alpha.0",
"@angular-eslint/template-parser": "~17.0.0-alpha.0",
"@angular-eslint/eslint-plugin": "17.0.0",
"@angular-eslint/eslint-plugin-template": "17.0.0",
"@angular-eslint/template-parser": "17.0.0",
"@angular/cli": "~17.0.0-rc.4",
"@angular/common": "~17.0.0-rc.3",
"@angular/compiler": "~17.0.0-rc.3",
Expand Down Expand Up @@ -63,19 +63,19 @@
"@ngrx/effects": "~16.0.0",
"@ngrx/router-store": "~16.0.0",
"@ngrx/store": "~16.0.0",
"@nx/angular": "17.0.0-rc.2",
"@nx/cypress": "17.0.0-rc.2",
"@nx/devkit": "17.0.0-rc.2",
"@nx/esbuild": "17.0.0-rc.2",
"@nx/eslint-plugin": "17.0.0-rc.2",
"@nx/jest": "17.0.0-rc.2",
"@nx/js": "17.0.0-rc.2",
"@nx/next": "17.0.0-rc.2",
"@nx/playwright": "17.0.0-rc.2",
"@nx/react": "17.0.0-rc.2",
"@nx/storybook": "17.0.0-rc.2",
"@nx/web": "17.0.0-rc.2",
"@nx/webpack": "17.0.0-rc.2",
"@nx/angular": "17.1.0-beta.4",
"@nx/cypress": "17.1.0-beta.4",
"@nx/devkit": "17.1.0-beta.4",
"@nx/esbuild": "17.1.0-beta.4",
"@nx/eslint-plugin": "17.1.0-beta.4",
"@nx/jest": "17.1.0-beta.4",
"@nx/js": "17.1.0-beta.4",
"@nx/next": "17.1.0-beta.4",
"@nx/playwright": "17.1.0-beta.4",
"@nx/react": "17.1.0-beta.4",
"@nx/storybook": "17.1.0-beta.4",
"@nx/web": "17.1.0-beta.4",
"@nx/webpack": "17.1.0-beta.4",
"@parcel/watcher": "2.0.4",
"@phenomnomnominal/tsquery": "~5.0.1",
"@playwright/test": "^1.36.1",
Expand All @@ -90,10 +90,10 @@
"@rollup/plugin-url": "^7.0.0",
"@schematics/angular": "~17.0.0-rc.4",
"@side/jest-runtime": "^1.1.0",
"@storybook/addon-essentials": "7.2.2",
"@storybook/core-server": "7.2.2",
"@storybook/react": "7.2.2",
"@storybook/react-webpack5": "7.2.2",
"@storybook/addon-essentials": "7.5.3",
"@storybook/core-server": "7.5.3",
"@storybook/react": "7.5.3",
"@storybook/react-webpack5": "7.5.3",
"@storybook/types": "^7.1.1",
"@supabase/supabase-js": "^2.26.0",
"@svgr/rollup": "^8.0.1",
Expand Down Expand Up @@ -126,10 +126,10 @@
"@types/tmp": "^0.2.0",
"@types/yargs": "^17.0.10",
"@types/yarnpkg__lockfile": "^1.1.5",
"@typescript-eslint/eslint-plugin": "^6.9.1",
"@typescript-eslint/parser": "^6.9.1",
"@typescript-eslint/eslint-plugin": "6.10.0",
"@typescript-eslint/parser": "6.10.0",
"@typescript-eslint/type-utils": "^6.9.1",
"@typescript-eslint/utils": "^6.9.1",
"@typescript-eslint/utils": "6.10.0",
"@xstate/immer": "0.3.1",
"@xstate/inspect": "0.7.0",
"@xstate/react": "3.0.1",
Expand Down Expand Up @@ -227,7 +227,7 @@
"node-fetch": "^2.6.7",
"npm-package-arg": "11.0.1",
"nuxi": "npm:[email protected]",
"nx": "17.0.0-rc.2",
"nx": "17.1.0-beta.4",
"octokit": "^2.0.14",
"open": "^8.4.0",
"openai": "~4.3.1",
Expand Down Expand Up @@ -293,7 +293,7 @@
"xstate": "4.34.0",
"yargs": "^17.6.2",
"yargs-parser": "21.1.1",
"@nx/eslint": "17.0.0-rc.2"
"@nx/eslint": "17.1.0-beta.4"
},
"author": "Victor Savkin",
"license": "MIT",
Expand Down
3 changes: 1 addition & 2 deletions packages/nuxt/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
"test": {
"executor": "@nx/jest:jest",
"options": {
"jestConfig": "packages/nuxt/jest.config.ts",
"passWithNoTests": true
"jestConfig": "packages/nuxt/jest.config.ts"
},
"outputs": ["{workspaceRoot}/coverage/packages/nuxt"]
},
Expand Down
1 change: 1 addition & 0 deletions packages/nx/bin/init-local.ts
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ function handleAngularCLIFallbacks(workspace: WorkspaceTypeAndRoot) {
}
} else {
try {
// nx-ignore-next-line
const cli = require.resolve('@angular/cli/lib/init.js', {
paths: [workspace.dir],
});
Expand Down
1 change: 1 addition & 0 deletions packages/nx/bin/nx.ts
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ function resolveNx(workspace: WorkspaceTypeAndRoot | null) {
} catch {
// TODO(v17): Remove this
// fallback for old CLI install setup
// nx-ignore-next-line
return require.resolve('@nrwl/cli/bin/nx.js', {
paths: [workspace ? workspace.dir : globalsRoot],
});
Expand Down
1 change: 1 addition & 0 deletions packages/nx/src/utils/find-workspace-root.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export interface WorkspaceTypeAndRoot {

function isAngularCliInstalled(root: string): boolean {
try {
// nx-ignore-next-line
require.resolve('@angular/cli', {
paths: [root],
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ exports[`@nx/storybook:init dependencies for package.json should add angular rel
"@angular/forms": "*",
"@nx/js": "0.0.1",
"@nx/storybook": "0.0.1",
"@storybook/addon-essentials": "7.2.2",
"@storybook/angular": "7.2.2",
"@storybook/core-server": "7.2.2",
"@storybook/addon-essentials": "7.5.3",
"@storybook/angular": "7.5.3",
"@storybook/core-server": "7.5.3",
"@swc-node/register": "~1.6.7",
"@swc/core": "~1.3.85",
"existing": "1.0.0",
Expand Down
3 changes: 1 addition & 2 deletions packages/vite/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
"test": {
"executor": "@nx/jest:jest",
"options": {
"jestConfig": "packages/vite/jest.config.ts",
"passWithNoTests": true
"jestConfig": "packages/vite/jest.config.ts"
},
"outputs": ["{workspaceRoot}/coverage/packages/vite"]
},
Expand Down
3 changes: 1 addition & 2 deletions packages/vue/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
"test": {
"executor": "@nx/jest:jest",
"options": {
"jestConfig": "packages/vue/jest.config.ts",
"passWithNoTests": true
"jestConfig": "packages/vue/jest.config.ts"
},
"outputs": ["{workspaceRoot}/coverage/packages/vue"]
},
Expand Down
Loading

0 comments on commit c7d0d21

Please sign in to comment.