@nx/web 23.2.0-beta.0 → 23.2.0-beta.10

package/dist/src/executors/file-server/file-server.impl.js

@@ -8,9 +8,6 @@ const pc = tslib_1.__importStar(require("picocolors"));
 const devkit_1 = require("@nx/devkit");
 const fs_1 = require("fs");
 const path_1 = require("path");
-const package_json_1 = require("nx/src/utils/package-json");
-const client_1 = require("nx/src/daemon/client/client");
-const utils_1 = require("nx/src/tasks-runner/utils");
 const internal_2 = require("@nx/js/internal");
 const detect_port_1 = tslib_1.__importDefault(require("detect-port"));
 function getHttpServerArgs(options) {
@@ -79,7 +76,7 @@ function getBuildTargetOutputPath(options, context) {
             const buildTarget = project.data.targets[target.target];
             outputPath = buildTarget.outputs?.[0];
             if (outputPath) {
-                outputPath = (0, utils_1.interpolate)(outputPath, {
+                outputPath = (0, internal_1.interpolate)(outputPath, {
                     projectName: project.data.name,
                     projectRoot: project.data.root,
                 });
@@ -96,7 +93,7 @@ function getBuildTargetOutputPath(options, context) {
     return outputPath;
 }
 function createFileWatcher(project, changeHandler) {
-    return client_1.daemonClient.registerFileWatcher({
+    return internal_1.daemonClient.registerFileWatcher({
         watchProjects: project ? [project] : 'all',
         includeGlobalWorkspaceFiles: true,
         includeDependencies: true,
@@ -159,12 +156,12 @@ async function* fileServerExecutor(options, context) {
                 }
             }
         };
-        if (!client_1.daemonClient.enabled() && options.watch) {
+        if (!internal_1.daemonClient.enabled() && options.watch) {
             devkit_1.output.warn({
                 title: 'Nx Daemon is not enabled. Static server is not watching for changes.',
             });
         }
-        if (client_1.daemonClient.enabled() && options.watch) {
+        if (internal_1.daemonClient.enabled() && options.watch) {
             disposeWatch = await createFileWatcher(context.projectName, run);
         }
         // perform initial run
@@ -182,7 +179,7 @@ async function* fileServerExecutor(options, context) {
         options.proxyUrl ??= `http${options.ssl ? 's' : ''}://localhost:${port}?`;
     }
     const args = getHttpServerArgs(options);
-    const { path: pathToHttpServerPkgJson, packageJson } = (0, package_json_1.readModulePackageJson)('http-server', module.paths);
+    const { path: pathToHttpServerPkgJson, packageJson } = (0, internal_1.readModulePackageJson)('http-server', module.paths);
     const pathToHttpServerBin = packageJson.bin['http-server'];
     const pathToHttpServer = (0, path_1.resolve)(pathToHttpServerPkgJson.replace('package.json', ''), pathToHttpServerBin);
     // detect port as close to when used to prevent port being used by another process

package/dist/src/generators/application/application.js

@@ -201,6 +201,7 @@ async function applicationGeneratorInternal(host, schema) {
         js: false,
         skipFormat: true,
         platform: 'web',
+        formatter: options.formatter,
     });
     tasks.push(jsInitTask);
     const webTask = await (0, init_1.webInitGenerator)(host, {
@@ -213,8 +214,21 @@ async function applicationGeneratorInternal(host, schema) {
         await setupBundler(host, options);
     }
     createApplicationFiles(host, options);
+    let enableTypedLinting = false;
+    if (options.linter !== 'eslint') {
+        tasks.push(await (0, internal_2.addLintingToProject)(host, {
+            linter: options.linter,
+            project: options.projectName,
+            unitTestRunner: options.unitTestRunner,
+            addPlugin: options.addPlugin,
+        }));
+    }
     if (options.linter === 'eslint') {
         const { lintProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/eslint', versions_1.nxVersion);
+        // CommonJS `require` instead of dynamic ESM `import`: `ensurePackage`
+        // exposes the temp install via `Module._initPaths`, which ESM ignores.
+        const { isTypedLintingEnabled, addIgnoresToLintConfig, } = require('@nx/eslint/internal');
+        enableTypedLinting = isTypedLintingEnabled(options);
         const lintTask = await lintProjectGenerator(host, {
             linter: options.linter,
             project: options.projectName,
@@ -223,15 +237,12 @@ async function applicationGeneratorInternal(host, schema) {
             ],
             unitTestRunner: options.unitTestRunner,
             skipFormat: true,
-            setParserOptionsProject: options.setParserOptionsProject,
+            enableTypedLinting,
             addPlugin: options.addPlugin,
         });
         tasks.push(lintTask);
         // Add out-tsc ignore pattern when using TS solution setup
         if (options.isUsingTsSolutionConfig) {
-            // CommonJS `require` instead of dynamic ESM `import` — `ensurePackage`
-            // exposes the temp install via `Module._initPaths`, which ESM ignores.
-            const { addIgnoresToLintConfig, } = require('@nx/eslint/internal');
             addIgnoresToLintConfig(host, options.appProjectRoot, ['**/out-tsc']);
         }
     }
@@ -263,7 +274,7 @@ async function applicationGeneratorInternal(host, schema) {
     if (options.bundler !== 'vite' && options.unitTestRunner === 'vitest') {
         const { createOrEditViteConfig } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
         (0, devkit_1.ensurePackage)('@nx/vitest', versions_1.nxVersion);
-        // CommonJS `require` instead of dynamic ESM `import` — `ensurePackage`
+        // CommonJS `require` instead of dynamic ESM `import`: `ensurePackage`
         // exposes the temp install via `Module._initPaths`, which ESM ignores.
         const { configurationGenerator, } = require('@nx/vitest/generators');
         const vitestTask = await configurationGenerator(host, {
@@ -351,6 +362,7 @@ async function applicationGeneratorInternal(host, schema) {
             baseUrl: e2eWebServerInfo.e2eWebServerAddress,
             directory: 'src',
             skipFormat: true,
+            enableTypedLinting,
             webServerCommands: {
                 default: e2eWebServerInfo.e2eWebServerCommand,
                 production: e2eWebServerInfo.e2eCiWebServerCommand,
@@ -392,7 +404,7 @@ async function applicationGeneratorInternal(host, schema) {
             directory: 'src',
             js: false,
             linter: options.linter,
-            setParserOptionsProject: options.setParserOptionsProject,
+            enableTypedLinting,
             webServerCommand: e2eWebServerInfo.e2eCiWebServerCommand,
             webServerAddress: e2eWebServerInfo.e2eCiBaseUrl,
             addPlugin: options.addPlugin,
@@ -404,7 +416,9 @@ async function applicationGeneratorInternal(host, schema) {
         const jestTask = await configurationGenerator(host, {
             project: options.projectName,
             skipSerializers: true,
-            setupFile: 'web-components',
+            // No setup file: the `web-components` one only ever held the
+            // `document-register-element` polyfill, which is long gone.
+            setupFile: 'none',
             compiler: options.compiler,
             skipFormat: true,
             addPlugin: options.addPlugin,
@@ -464,7 +478,7 @@ async function normalizeOptions(host, options) {
         ? options.tags.split(',').map((s) => s.trim())
         : [];
     options.style = options.style || 'css';
-    options.linter = options.linter || 'eslint';
+    options.linter = await (0, internal_2.normalizeLinterOption)(host, options.linter);
     options.unitTestRunner = options.unitTestRunner || 'jest';
     options.e2eTestRunner = options.e2eTestRunner || 'playwright';
     return {

package/dist/src/generators/application/schema.d.ts

@@ -1,4 +1,4 @@
-import type { Linter, LinterType } from '@nx/eslint';
+import type { LinterType } from '@nx/js';
 
 export interface Schema {
   directory: string;
@@ -12,7 +12,12 @@ export interface Schema {
   unitTestRunner?: 'jest' | 'vitest' | 'none';
   inSourceTests?: boolean;
   e2eTestRunner?: 'cypress' | 'playwright' | 'none';
-  linter?: Linter | LinterType;
+  linter?: LinterType;
+  formatter?: 'none' | 'prettier' | 'oxfmt';
+  enableTypedLinting?: boolean;
+  /**
+   * @deprecated Use `enableTypedLinting` instead. This option will be removed in Nx v24.
+   */
   setParserOptionsProject?: boolean;
   strict?: boolean;
   addPlugin?: boolean;

package/dist/src/generators/application/schema.json

@@ -57,11 +57,14 @@
       "x-priority": "important"
     },
     "linter": {
-      "description": "The tool to use for running lint checks.",
+      "description": "The tool to use for running lint checks. Defaults to the linter the workspace already uses.",
       "type": "string",
-      "enum": ["eslint", "none"],
-      "default": "none",
-      "x-prompt": "Which linter would you like to use?"
+      "enum": ["eslint", "oxlint", "none"]
+    },
+    "formatter": {
+      "description": "The tool to use for code formatting.",
+      "type": "string",
+      "enum": ["none", "prettier", "oxfmt"]
     },
     "skipFormat": {
       "description": "Skip formatting files",
@@ -92,11 +95,17 @@
       "type": "string",
       "description": "Add tags to the application (used for linting)"
     },
-    "setParserOptionsProject": {
+    "enableTypedLinting": {
       "type": "boolean",
-      "description": "Whether or not to configure the ESLint `parserOptions.project` option. We do not do this by default for lint performance reasons.",
+      "description": "Whether to enable typed linting. For flat configs, this configures the recommended `parserOptions.projectService` and `tsconfigRootDir`. For legacy `.eslintrc` configs, this configures `parserOptions.project`. We do not enable this by default for lint performance reasons.",
       "default": false
     },
+    "setParserOptionsProject": {
+      "type": "boolean",
+      "description": "Deprecated alias for `enableTypedLinting`.",
+      "default": false,
+      "x-deprecated": "Use `enableTypedLinting` instead. This option will be removed in Nx v24."
+    },
     "strict": {
       "type": "boolean",
       "description": "Creates an application with strict mode and strict type checking.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/web",
-  "version": "23.2.0-beta.0",
+  "version": "23.2.0-beta.10",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -79,20 +79,20 @@
     "http-server": "^14.1.0",
     "picocolors": "^1.1.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.2.0-beta.0",
-    "@nx/js": "23.2.0-beta.0"
+    "@nx/devkit": "23.2.0-beta.10",
+    "@nx/js": "23.2.0-beta.10"
   },
   "devDependencies": {
-    "nx": "23.2.0-beta.0",
-    "@nx/vitest": "23.2.0-beta.0"
+    "@nx/vitest": "23.2.0-beta.10",
+    "nx": "23.2.0-beta.10"
   },
   "peerDependencies": {
-    "@nx/cypress": "23.2.0-beta.0",
-    "@nx/jest": "23.2.0-beta.0",
-    "@nx/vite": "23.2.0-beta.0",
-    "@nx/webpack": "23.2.0-beta.0",
-    "@nx/playwright": "23.2.0-beta.0",
-    "@nx/eslint": "23.2.0-beta.0"
+    "@nx/cypress": "23.2.0-beta.10",
+    "@nx/eslint": "23.2.0-beta.10",
+    "@nx/jest": "23.2.0-beta.10",
+    "@nx/webpack": "23.2.0-beta.10",
+    "@nx/vite": "23.2.0-beta.10",
+    "@nx/playwright": "23.2.0-beta.10"
   },
   "peerDependenciesMeta": {
     "@nx/cypress": {