@nx/web 23.2.0-beta.5 → 23.2.0-beta.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -214,6 +214,14 @@ async function applicationGeneratorInternal(host, schema) {
|
|
|
214
214
|
}
|
|
215
215
|
createApplicationFiles(host, options);
|
|
216
216
|
let enableTypedLinting = false;
|
|
217
|
+
if (options.linter !== 'eslint') {
|
|
218
|
+
tasks.push(await (0, internal_2.addLintingToProject)(host, {
|
|
219
|
+
linter: options.linter,
|
|
220
|
+
project: options.projectName,
|
|
221
|
+
unitTestRunner: options.unitTestRunner,
|
|
222
|
+
addPlugin: options.addPlugin,
|
|
223
|
+
}));
|
|
224
|
+
}
|
|
217
225
|
if (options.linter === 'eslint') {
|
|
218
226
|
const { lintProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/eslint', versions_1.nxVersion);
|
|
219
227
|
// CommonJS `require` instead of dynamic ESM `import`: `ensurePackage`
|
|
@@ -407,7 +415,9 @@ async function applicationGeneratorInternal(host, schema) {
|
|
|
407
415
|
const jestTask = await configurationGenerator(host, {
|
|
408
416
|
project: options.projectName,
|
|
409
417
|
skipSerializers: true,
|
|
410
|
-
|
|
418
|
+
// No setup file: the `web-components` one only ever held the
|
|
419
|
+
// `document-register-element` polyfill, which is long gone.
|
|
420
|
+
setupFile: 'none',
|
|
411
421
|
compiler: options.compiler,
|
|
412
422
|
skipFormat: true,
|
|
413
423
|
addPlugin: options.addPlugin,
|
|
@@ -467,7 +477,7 @@ async function normalizeOptions(host, options) {
|
|
|
467
477
|
? options.tags.split(',').map((s) => s.trim())
|
|
468
478
|
: [];
|
|
469
479
|
options.style = options.style || 'css';
|
|
470
|
-
options.linter = options.linter
|
|
480
|
+
options.linter = await (0, internal_2.normalizeLinterOption)(host, options.linter);
|
|
471
481
|
options.unitTestRunner = options.unitTestRunner || 'jest';
|
|
472
482
|
options.e2eTestRunner = options.e2eTestRunner || 'playwright';
|
|
473
483
|
return {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { LinterType } from '@nx/js';
|
|
2
2
|
|
|
3
3
|
export interface Schema {
|
|
4
4
|
directory: string;
|
|
@@ -12,7 +12,7 @@ export interface Schema {
|
|
|
12
12
|
unitTestRunner?: 'jest' | 'vitest' | 'none';
|
|
13
13
|
inSourceTests?: boolean;
|
|
14
14
|
e2eTestRunner?: 'cypress' | 'playwright' | 'none';
|
|
15
|
-
linter?:
|
|
15
|
+
linter?: LinterType;
|
|
16
16
|
enableTypedLinting?: boolean;
|
|
17
17
|
/**
|
|
18
18
|
* @deprecated Use `enableTypedLinting` instead. This option will be removed in Nx v24.
|
|
@@ -57,11 +57,9 @@
|
|
|
57
57
|
"x-priority": "important"
|
|
58
58
|
},
|
|
59
59
|
"linter": {
|
|
60
|
-
"description": "The tool to use for running lint checks.",
|
|
60
|
+
"description": "The tool to use for running lint checks. Defaults to the linter the workspace already uses.",
|
|
61
61
|
"type": "string",
|
|
62
|
-
"enum": ["eslint", "none"]
|
|
63
|
-
"default": "none",
|
|
64
|
-
"x-prompt": "Which linter would you like to use?"
|
|
62
|
+
"enum": ["eslint", "oxlint", "none"]
|
|
65
63
|
},
|
|
66
64
|
"skipFormat": {
|
|
67
65
|
"description": "Skip formatting files",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/web",
|
|
3
|
-
"version": "23.2.0-beta.
|
|
3
|
+
"version": "23.2.0-beta.7",
|
|
4
4
|
"private": false,
|
|
5
5
|
"type": "commonjs",
|
|
6
6
|
"files": [
|
|
@@ -79,20 +79,20 @@
|
|
|
79
79
|
"http-server": "^14.1.0",
|
|
80
80
|
"picocolors": "^1.1.0",
|
|
81
81
|
"tslib": "^2.3.0",
|
|
82
|
-
"@nx/devkit": "23.2.0-beta.
|
|
83
|
-
"@nx/js": "23.2.0-beta.
|
|
82
|
+
"@nx/devkit": "23.2.0-beta.7",
|
|
83
|
+
"@nx/js": "23.2.0-beta.7"
|
|
84
84
|
},
|
|
85
85
|
"devDependencies": {
|
|
86
|
-
"@nx/vitest": "23.2.0-beta.
|
|
87
|
-
"nx": "23.2.0-beta.
|
|
86
|
+
"@nx/vitest": "23.2.0-beta.7",
|
|
87
|
+
"nx": "23.2.0-beta.7"
|
|
88
88
|
},
|
|
89
89
|
"peerDependencies": {
|
|
90
|
-
"@nx/cypress": "23.2.0-beta.
|
|
91
|
-
"@nx/
|
|
92
|
-
"@nx/
|
|
93
|
-
"@nx/
|
|
94
|
-
"@nx/
|
|
95
|
-
"@nx/
|
|
90
|
+
"@nx/cypress": "23.2.0-beta.7",
|
|
91
|
+
"@nx/eslint": "23.2.0-beta.7",
|
|
92
|
+
"@nx/jest": "23.2.0-beta.7",
|
|
93
|
+
"@nx/playwright": "23.2.0-beta.7",
|
|
94
|
+
"@nx/vite": "23.2.0-beta.7",
|
|
95
|
+
"@nx/webpack": "23.2.0-beta.7"
|
|
96
96
|
},
|
|
97
97
|
"peerDependenciesMeta": {
|
|
98
98
|
"@nx/cypress": {
|