Skip to content

Commit 5954a39

Browse files
NetanelBasalNetanelBasal
committed
chore(general): 🤖 update nx
1 parent b699664 commit 5954a39

10 files changed

+3356
-4982
lines changed

‎.env

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Nx 18 enables using plugins to infer targets by default
2+
# This is disabled for existing workspaces to maintain compatibility
3+
# For more info, see: https://nx.dev/concepts/inferred-tasks
4+
NX_ADD_PLUGINS=false

‎devtools/project.json

+1-8
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,7 @@
3131
},
3232
"lint": {
3333
"executor": "@nx/eslint:lint",
34-
"outputs": ["{options.outputFile}"],
35-
"options": {
36-
"lintFilePatterns": [
37-
"devtools/**/*.ts",
38-
"devtools/**/*.html",
39-
"devtools/package.json"
40-
]
41-
}
34+
"outputs": ["{options.outputFile}"]
4235
},
4336
"version": {
4437
"executor": "@jscutlery/semver:version",

‎e2e/playwright.config.ts

+19-21
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,31 @@
1-
import { defineConfig } from '@playwright/test';
1+
import { defineConfig, devices } from '@playwright/test';
22
import { nxE2EPreset } from '@nx/playwright/preset';
3-
43
import { workspaceRoot } from '@nx/devkit';
5-
64
// For CI, you may want to set BASE_URL to the deployed application.
75
const baseURL = process.env['BASE_URL'] || 'http://localhost:4200';
8-
96
/**
107
* Read environment variables from file.
118
* https://github.com/motdotla/dotenv
129
*/
1310
// require('dotenv').config();
14-
1511
/**
1612
* See https://playwright.dev/docs/test-configuration.
1713
*/
18-
export default defineConfig({
19-
...nxE2EPreset(__filename, { testDir: './src' }),
20-
/* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
21-
use: {
22-
baseURL,
23-
/* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
24-
trace: 'on-first-retry',
25-
},
26-
/* Run your local dev server before starting the tests */
27-
webServer: {
28-
command: 'npx nx serve query',
29-
url: 'http://localhost:4200',
30-
reuseExistingServer: !process.env.CI,
31-
cwd: workspaceRoot,
32-
},
33-
});
14+
export default defineConfig({ ...nxE2EPreset(__filename, { testDir: './src' }),
15+
/* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
16+
use: {
17+
baseURL,
18+
/* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
19+
trace: 'on-first-retry',
20+
},
21+
/* Run your local dev server before starting the tests */
22+
webServer: {
23+
command: 'npx nx serve query',
24+
url: 'http://localhost:4200',
25+
reuseExistingServer: !process.env.CI,
26+
cwd: workspaceRoot,
27+
}, projects: [
28+
{ name: "chromium", use: { ...devices["Desktop Chrome"] } },
29+
{ name: "firefox", use: { ...devices["Desktop Firefox"] } },
30+
{ name: "webkit", use: { ...devices["Desktop Safari"] } }
31+
] });

‎e2e/project.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@
1313
},
1414
"lint": {
1515
"executor": "@nx/eslint:lint",
16-
"outputs": ["{options.outputFile}"],
17-
"options": {
18-
"lintFilePatterns": ["e2e/**/*.{js,ts}"]
19-
}
16+
"outputs": ["{options.outputFile}"]
2017
}
2118
},
2219
"implicitDependencies": ["query"]

‎migrations.json

+52-54
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,92 @@
11
{
22
"migrations": [
33
{
4-
"version": "17.1.0-beta.2",
5-
"description": "Move jest executor options to nx.json targetDefaults",
6-
"implementation": "./src/migrations/update-17-1-0/move-options-to-target-defaults",
7-
"package": "@nx/jest",
8-
"name": "move-options-to-target-defaults"
4+
"cli": "nx",
5+
"version": "17.3.0-beta.6",
6+
"description": "Updates the nx wrapper.",
7+
"implementation": "./src/migrations/update-17-3-0/update-nxw",
8+
"package": "nx",
9+
"name": "17.3.0-update-nx-wrapper"
910
},
1011
{
11-
"version": "17.1.0-beta.1",
12-
"description": "Updates for @typescript-utils/utils v6.9.1+",
13-
"implementation": "./src/migrations/update-17-1-0/update-typescript-eslint",
14-
"package": "@nx/eslint",
15-
"name": "update-typescript-eslint"
12+
"cli": "nx",
13+
"version": "18.0.0-beta.2",
14+
"description": "Updates .env to disabled adding plugins when generating projects in an existing Nx workspace",
15+
"implementation": "./src/migrations/update-18-0-0/disable-crystal-for-existing-workspaces",
16+
"x-repair-skip": true,
17+
"package": "nx",
18+
"name": "18.0.0-disable-adding-plugins-for-existing-workspaces"
1619
},
1720
{
1821
"cli": "nx",
19-
"version": "17.1.0-beta.5",
20-
"requires": {
21-
"@angular/core": ">=17.0.0"
22-
},
23-
"description": "Update the @angular/cli package version to ~17.0.0.",
24-
"factory": "./src/migrations/update-17-1-0/update-angular-cli",
22+
"version": "17.2.0-beta.2",
23+
"description": "Rename '@nx/angular:webpack-dev-server' executor to '@nx/angular:dev-server'",
24+
"factory": "./src/migrations/update-17-2-0/rename-webpack-dev-server",
2525
"package": "@nx/angular",
26-
"name": "update-angular-cli-version-17-0-0"
26+
"name": "rename-webpack-dev-server-executor"
2727
},
2828
{
2929
"cli": "nx",
30-
"version": "17.1.0-beta.5",
30+
"version": "17.3.0-beta.10",
3131
"requires": {
32-
"@angular/core": ">=17.0.0"
32+
"@angular/core": ">=17.1.0"
3333
},
34-
"description": "Rename 'browserTarget' to 'buildTarget'.",
35-
"factory": "./src/migrations/update-17-1-0/browser-target-to-build-target",
34+
"description": "Update the @angular/cli package version to ~17.1.0.",
35+
"factory": "./src/migrations/update-17-3-0/update-angular-cli",
3636
"package": "@nx/angular",
37-
"name": "rename-browser-target-to-build-target"
37+
"name": "update-angular-cli-version-17-1-0"
3838
},
3939
{
4040
"cli": "nx",
41-
"version": "17.1.0-beta.5",
41+
"version": "17.3.0-beta.10",
4242
"requires": {
43-
"@angular/core": ">=17.0.0"
43+
"@angular/core": ">=17.1.0"
4444
},
45-
"description": "Replace usages of '@nguniversal/builders' with '@angular-devkit/build-angular'.",
46-
"factory": "./src/migrations/update-17-1-0/replace-nguniversal-builders",
45+
"description": "Add 'browser-sync' as dev dependency when '@angular-devkit/build-angular:ssr-dev-server' or '@nx/angular:module-federation-dev-ssr' is used.",
46+
"factory": "./src/migrations/update-17-3-0/add-browser-sync-dependency",
4747
"package": "@nx/angular",
48-
"name": "replace-nguniversal-builders"
48+
"name": "add-browser-sync-dependency"
4949
},
5050
{
5151
"cli": "nx",
52-
"version": "17.1.0-beta.5",
52+
"version": "17.3.0-beta.10",
5353
"requires": {
54-
"@angular/core": ">=17.0.0"
54+
"@angular/core": ">=17.1.0"
5555
},
56-
"description": "Replace usages of '@nguniversal/' packages with '@angular/ssr'.",
57-
"factory": "./src/migrations/update-17-1-0/replace-nguniversal-engines",
56+
"description": "Add 'autoprefixer' as dev dependency when '@nx/angular:ng-packagr-lite' or '@nx/angular:package` is used.",
57+
"factory": "./src/migrations/update-17-3-0/add-autoprefixer-dependency",
5858
"package": "@nx/angular",
59-
"name": "replace-nguniversal-engines"
59+
"name": "add-autoprefixer-dependency"
6060
},
6161
{
6262
"cli": "nx",
63-
"version": "17.1.0-beta.5",
64-
"requires": {
65-
"@angular/core": ">=17.0.0"
66-
},
67-
"description": "Replace the deep imports from 'zone.js/dist/zone' and 'zone.js/dist/zone-testing' with 'zone.js' and 'zone.js/testing'.",
68-
"factory": "./src/migrations/update-17-1-0/update-zone-js-deep-import",
63+
"version": "18.0.0-beta.0",
64+
"description": "Add NX_MF_DEV_SERVER_STATIC_REMOTES to inputs for task hashing when '@nx/angular:webpack-browser' is used for Module Federation.",
65+
"factory": "./src/migrations/update-18-0-0/add-mf-env-var-to-target-defaults",
6966
"package": "@nx/angular",
70-
"name": "update-zone-js-deep-import"
67+
"name": "add-module-federation-env-var-to-target-defaults"
7168
},
7269
{
73-
"version": "17.0.0",
74-
"description": "Angular v17 introduces a new control flow syntax that uses the @ and } characters. This migration replaces the existing usages with their corresponding HTML entities.",
75-
"factory": "./migrations/block-template-entities/bundle",
76-
"package": "@angular/core",
77-
"name": "block-template-entities"
70+
"version": "17.2.0-beta.0",
71+
"description": "Simplify eslintFilePatterns",
72+
"implementation": "./src/migrations/update-17-2-0/simplify-eslint-patterns",
73+
"package": "@nx/eslint",
74+
"name": "simplify-eslint-patterns"
7875
},
7976
{
80-
"version": "17.0.0",
81-
"description": "CompilerOption.useJit and CompilerOption.missingTranslation are unused under Ivy. This migration removes their usage",
82-
"factory": "./migrations/compiler-options/bundle",
83-
"package": "@angular/core",
84-
"name": "migration-v17-compiler-options"
77+
"version": "17.2.9",
78+
"description": "Move executor options to target defaults",
79+
"implementation": "./src/migrations/update-17-2-9/move-options-to-target-defaults",
80+
"package": "@nx/eslint",
81+
"name": "move-options-to-target-defaults"
8582
},
8683
{
87-
"version": "17.0.0",
88-
"description": "Updates `TransferState`, `makeStateKey`, `StateKey` imports from `@angular/platform-browser` to `@angular/core`.",
89-
"factory": "./migrations/transfer-state/bundle",
90-
"package": "@angular/core",
91-
"name": "migration-transfer-state"
84+
"cli": "nx",
85+
"version": "17.3.1-beta.0",
86+
"description": "Add project property to playwright config",
87+
"implementation": "./src/migrations/update-17-3-1/add-project-to-config",
88+
"package": "@nx/playwright",
89+
"name": "17-3-1-add-project-to-config"
9290
}
9391
]
9492
}

‎nx.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,6 @@
66
"dependsOn": ["^build"],
77
"inputs": ["production", "^production"]
88
},
9-
"lint": {
10-
"cache": true,
11-
"inputs": [
12-
"default",
13-
"{workspaceRoot}/.eslintrc.json",
14-
"{workspaceRoot}/.eslintignore",
15-
"{workspaceRoot}/eslint.config.js"
16-
]
17-
},
189
"e2e": {
1910
"cache": true,
2011
"inputs": ["default", "^production"]
@@ -31,6 +22,15 @@
3122
"codeCoverage": true
3223
}
3324
}
25+
},
26+
"@nx/eslint:lint": {
27+
"cache": true,
28+
"inputs": [
29+
"default",
30+
"{workspaceRoot}/.eslintrc.json",
31+
"{workspaceRoot}/.eslintignore",
32+
"{workspaceRoot}/eslint.config.js"
33+
]
3434
}
3535
},
3636
"namedInputs": {

0 commit comments

Comments
 (0)