@nx/web 0.0.0-pr-27957-a99d5ea → 0.0.0-pr-28229-afe192c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/web",
-  "version": "0.0.0-pr-27957-a99d5ea",
+  "version": "0.0.0-pr-28229-afe192c",
   "private": false,
   "description": "The Nx Plugin for Web Components contains generators for managing Web Component applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Jest, Playwright, Cypress, and Storybook.\n\n- Scaffolding for creating buildable libraries that can be published to npm.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -31,17 +31,16 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "chalk": "^4.1.0",
     "detect-port": "^1.5.1",
     "http-server": "^14.1.0",
+    "picocolors": "^1.1.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "0.0.0-pr-27957-a99d5ea",
-    "@nx/js": "0.0.0-pr-27957-a99d5ea",
-    "@nrwl/web": "0.0.0-pr-27957-a99d5ea"
+    "@nx/devkit": "0.0.0-pr-28229-afe192c",
+    "@nx/js": "0.0.0-pr-28229-afe192c"
   },
   "publishConfig": {
     "access": "public"
   },
   "type": "commonjs",
   "types": "./index.d.ts"
-}
+}

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = fileServerExecutor;
 const child_process_1 = require("child_process");
-const chalk = require("chalk");
+const pc = require("picocolors");
 const devkit_1 = require("@nx/devkit");
 const fs_1 = require("fs");
 const os_1 = require("os");
@@ -138,7 +138,7 @@ async function* fileServerExecutor(options, context) {
                     });
                 }
                 catch {
-                    throw new Error(`Build target failed: ${chalk.bold(options.buildTarget)}`);
+                    throw new Error(`Build target failed: ${pc.bold(options.buildTarget)}`);
                 }
                 finally {
                     process.env.NX_SERVE_STATIC_BUILD_RUNNING = undefined;

package/src/generators/application/application.js

@@ -156,7 +156,6 @@ function setDefaults(tree, options) {
 async function applicationGenerator(host, schema) {
     return await applicationGeneratorInternal(host, {
         addPlugin: false,
-        projectNameAndRootFormat: 'derived',
         ...schema,
     });
 }
@@ -211,6 +210,7 @@ async function applicationGeneratorInternal(host, schema) {
             inSourceTests: options.inSourceTests,
             skipFormat: true,
             addPlugin: options.addPlugin,
+            compiler: options.compiler,
         });
         tasks.push(vitestTask);
         createOrEditViteConfig(host, {
@@ -390,14 +390,12 @@ async function applicationGeneratorInternal(host, schema) {
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 async function normalizeOptions(host, options) {
-    const { projectName: appProjectName, projectRoot: appProjectRoot, projectNameAndRootFormat, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'application');
+    const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
-        callingGenerator: '@nx/web:application',
     });
-    options.projectNameAndRootFormat = projectNameAndRootFormat;
     const nxJson = (0, devkit_1.readNxJson)(host);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;

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

@@ -1,15 +1,13 @@
-import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter, LinterType } from '@nx/eslint';
 
 export interface Schema {
-  name: string;
+  directory: string;
+  name?: string;
   prefix?: string;
   style?: string;
   bundler?: 'webpack' | 'none' | 'vite';
   compiler?: 'babel' | 'swc';
   skipFormat?: boolean;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   tags?: string;
   unitTestRunner?: 'jest' | 'vitest' | 'none';
   inSourceTests?: boolean;

package/src/generators/application/schema.json

@@ -6,24 +6,20 @@
   "description": "Create a web application using `swc` or `babel` as compiler.",
   "type": "object",
   "properties": {
-    "name": {
-      "description": "The name of the application.",
+    "directory": {
+      "description": "The directory of the new application.",
       "type": "string",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the application?",
-      "pattern": "^[a-zA-Z][^:]*$"
-    },
-    "directory": {
-      "description": "The directory of the new application.",
-      "type": "string"
+      "x-prompt": "Which directory do you want to create the application in?"
     },
-    "projectNameAndRootFormat": {
-      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
+    "name": {
+      "description": "The name of the application.",
       "type": "string",
-      "enum": ["as-provided", "derived"]
+      "pattern": "^[a-zA-Z][^:]*$",
+      "x-priority": "important"
     },
     "style": {
       "description": "The file extension to be used for style files.",
@@ -77,7 +73,8 @@
     },
     "unitTestRunner": {
       "type": "string",
-      "enum": ["jest", "vitest", "none"],
+      "enum": ["vitest", "jest", "none"],
+      "default": "vitest",
       "description": "Test runner to use for unit tests. Default value is 'jest' when using 'webpack' or 'none' as the bundler and 'vitest' when using 'vite' as the bundler"
     },
     "inSourceTests": {
@@ -113,6 +110,6 @@
       "x-deprecated": "Nx only supports standaloneConfig"
     }
   },
-  "required": ["name"],
+  "required": ["directory"],
   "examplesFile": "../../../docs/application-examples.md"
 }