@nx/angular 22.7.0-pr.33655.2b96277 → 22.7.0-pr.33655.57246dd

package/src/generators/storybook-configuration/schema.json

@@ -1,83 +1,83 @@
 {
-    "$schema": "https://json-schema.org/schema",
-    "$id": "NxAngularStorybookConfigurationGenerator",
-    "title": "Adds Storybook configuration to a project.",
-    "description": "Adds Storybook configuration to a project to be able to use and create stories.",
-    "cli": "nx",
-    "type": "object",
-    "properties": {
-        "project": {
-            "type": "string",
-            "aliases": ["name", "projectName"],
-            "description": "Project for which to generate Storybook configuration.",
-            "$default": {
-                "$source": "argv",
-                "index": 0
-            },
-            "x-prompt": "For which project do you want to generate Storybook configuration?",
-            "x-dropdown": "projects",
-            "x-priority": "important"
-        },
-        "interactionTests": {
-            "type": "boolean",
-            "description": "Set up Storybook interaction tests.",
-            "x-prompt": "Do you want to set up Storybook interaction tests?",
-            "alias": ["configureTestRunner"],
-            "x-priority": "important",
-            "default": true
-        },
-        "generateStories": {
-            "type": "boolean",
-            "description": "Specifies whether to automatically generate `*.stories.ts` files for components declared in this project or not.",
-            "x-prompt": "Automatically generate *.stories.ts files for components declared in this project?",
-            "default": true,
-            "x-priority": "important"
-        },
-        "configureStaticServe": {
-            "type": "boolean",
-            "description": "Specifies whether to configure a static file server target for serving storybook. Helpful for speeding up CI build/test times.",
-            "x-prompt": "Configure a static file server for the storybook instance?",
-            "default": true,
-            "x-priority": "important"
-        },
-        "linter": {
-            "description": "The tool to use for running lint checks.",
-            "type": "string",
-            "enum": ["eslint", "none"],
-            "default": "eslint"
-        },
-        "tsConfiguration": {
-            "type": "boolean",
-            "description": "Configure your project with TypeScript. Generate main.ts and preview.ts files, instead of main.js and preview.js.",
-            "default": true,
-            "x-priority": "important"
-        },
-        "skipFormat": {
-            "description": "Skip formatting files.",
-            "type": "boolean",
-            "default": false,
-            "x-priority": "internal"
-        },
-        "ignorePaths": {
-            "type": "array",
-            "description": "Paths to ignore when looking for components.",
-            "items": {
-                "type": "string",
-                "description": "Path to ignore."
-            },
-            "default": [
-                "*.stories.ts,*.stories.tsx,*.stories.js,*.stories.jsx,*.stories.mdx"
-            ],
-            "examples": [
-                "apps/my-app/src/not-stories/**",
-                "**/**/src/**/not-stories/**",
-                "libs/my-lib/**/*.something.ts",
-                "**/**/src/**/*.other.*",
-                "libs/my-lib/src/not-stories/**,**/**/src/**/*.other.*,apps/my-app/**/*.something.ts"
-            ]
-        }
+  "$schema": "https://json-schema.org/schema",
+  "$id": "NxAngularStorybookConfigurationGenerator",
+  "title": "Adds Storybook configuration to a project.",
+  "description": "Adds Storybook configuration to a project to be able to use and create stories.",
+  "cli": "nx",
+  "type": "object",
+  "properties": {
+    "project": {
+      "type": "string",
+      "aliases": ["name", "projectName"],
+      "description": "Project for which to generate Storybook configuration.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "For which project do you want to generate Storybook configuration?",
+      "x-dropdown": "projects",
+      "x-priority": "important"
     },
-    "additionalProperties": false,
-    "required": ["project"],
-    "examplesFile": "../../../docs/storybook-configuration-examples.md"
+    "interactionTests": {
+      "type": "boolean",
+      "description": "Set up Storybook interaction tests.",
+      "x-prompt": "Do you want to set up Storybook interaction tests?",
+      "alias": ["configureTestRunner"],
+      "x-priority": "important",
+      "default": true
+    },
+    "generateStories": {
+      "type": "boolean",
+      "description": "Specifies whether to automatically generate `*.stories.ts` files for components declared in this project or not.",
+      "x-prompt": "Automatically generate *.stories.ts files for components declared in this project?",
+      "default": true,
+      "x-priority": "important"
+    },
+    "configureStaticServe": {
+      "type": "boolean",
+      "description": "Specifies whether to configure a static file server target for serving storybook. Helpful for speeding up CI build/test times.",
+      "x-prompt": "Configure a static file server for the storybook instance?",
+      "default": true,
+      "x-priority": "important"
+    },
+    "linter": {
+      "description": "The tool to use for running lint checks.",
+      "type": "string",
+      "enum": ["eslint", "none"],
+      "default": "eslint"
+    },
+    "tsConfiguration": {
+      "type": "boolean",
+      "description": "Configure your project with TypeScript. Generate main.ts and preview.ts files, instead of main.js and preview.js.",
+      "default": true,
+      "x-priority": "important"
+    },
+    "skipFormat": {
+      "description": "Skip formatting files.",
+      "type": "boolean",
+      "default": false,
+      "x-priority": "internal"
+    },
+    "ignorePaths": {
+      "type": "array",
+      "description": "Paths to ignore when looking for components.",
+      "items": {
+        "type": "string",
+        "description": "Path to ignore."
+      },
+      "default": [
+        "*.stories.ts,*.stories.tsx,*.stories.js,*.stories.jsx,*.stories.mdx"
+      ],
+      "examples": [
+        "apps/my-app/src/not-stories/**",
+        "**/**/src/**/not-stories/**",
+        "libs/my-lib/**/*.something.ts",
+        "**/**/src/**/*.other.*",
+        "libs/my-lib/src/not-stories/**,**/**/src/**/*.other.*,apps/my-app/**/*.something.ts"
+      ]
+    }
+  },
+  "additionalProperties": false,
+  "required": ["project"],
+  "examplesFile": "../../../docs/storybook-configuration-examples.md"
 }

package/src/generators/web-worker/schema.json

@@ -1,48 +1,48 @@
 {
-    "$schema": "http://json-schema.org/draft-07/schema",
-    "$id": "NxAngularWebWorkerGenerator",
-    "title": "Angular Web Worker Options Schema",
-    "description": "Creates a new, generic web worker definition in the given or default project.",
-    "cli": "nx",
-    "type": "object",
-    "properties": {
-        "path": {
-            "type": "string",
-            "format": "path",
-            "description": "The path at which to create the worker file, relative to the current workspace."
-        },
-        "project": {
-            "type": "string",
-            "description": "The name of the project.",
-            "$default": {
-                "$source": "projectName"
-            },
-            "x-dropdown": "projects",
-            "x-priority": "important"
-        },
-        "name": {
-            "type": "string",
-            "description": "The name of the worker.",
-            "$default": {
-                "$source": "argv",
-                "index": 0
-            },
-            "x-prompt": "What name would you like to use for the worker?",
-            "x-priority": "important"
-        },
-        "snippet": {
-            "type": "boolean",
-            "default": true,
-            "description": "Add a worker creation snippet in a sibling file of the same name."
-        },
-        "skipFormat": {
-            "description": "Skip formatting files.",
-            "type": "boolean",
-            "default": false,
-            "x-priority": "internal"
-        }
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "NxAngularWebWorkerGenerator",
+  "title": "Angular Web Worker Options Schema",
+  "description": "Creates a new, generic web worker definition in the given or default project.",
+  "cli": "nx",
+  "type": "object",
+  "properties": {
+    "path": {
+      "type": "string",
+      "format": "path",
+      "description": "The path at which to create the worker file, relative to the current workspace."
     },
-    "additionalProperties": false,
-    "required": ["name", "project"],
-    "examplesFile": "../../../docs/web-worker-examples.md"
+    "project": {
+      "type": "string",
+      "description": "The name of the project.",
+      "$default": {
+        "$source": "projectName"
+      },
+      "x-dropdown": "projects",
+      "x-priority": "important"
+    },
+    "name": {
+      "type": "string",
+      "description": "The name of the worker.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "What name would you like to use for the worker?",
+      "x-priority": "important"
+    },
+    "snippet": {
+      "type": "boolean",
+      "default": true,
+      "description": "Add a worker creation snippet in a sibling file of the same name."
+    },
+    "skipFormat": {
+      "description": "Skip formatting files.",
+      "type": "boolean",
+      "default": false,
+      "x-priority": "internal"
+    }
+  },
+  "additionalProperties": false,
+  "required": ["name", "project"],
+  "examplesFile": "../../../docs/web-worker-examples.md"
 }

package/src/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/angular/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,aAAa,EAQnB,MAAM,YAAY,CAAC;AAYpB,MAAM,WAAW,oBAAoB;IACnC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAOD,KAAK,0BAA0B,GAAG;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACrC,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B,CAAC;AACF,MAAM,MAAM,2BAA2B,GAAG;IACxC,WAAW,EAAE,aAAa,GAAG,SAAS,CAAC;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;IACvD,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;CACtD,CAAC;AAkDF,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,oBAAoB,CAqB7D,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/angular/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,aAAa,EAQnB,MAAM,YAAY,CAAC;AAYpB,MAAM,WAAW,oBAAoB;IACnC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAOD,KAAK,0BAA0B,GAAG;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACrC,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B,CAAC;AACF,MAAM,MAAM,2BAA2B,GAAG;IACxC,WAAW,EAAE,aAAa,GAAG,SAAS,CAAC;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;IACvD,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;CACtD,CAAC;AAgDF,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,oBAAoB,CAwB7D,CAAC"}

package/src/plugins/plugin.js

@@ -46,7 +46,6 @@ const knownExecutors = {
         '@angular/build:unit-test',
     ]),
 };
-const pmc = (0, devkit_1.getPackageManagerCommand)();
 function readProjectsCache(cachePath) {
     return (0, node_fs_1.existsSync)(cachePath) ? (0, devkit_1.readJsonFile)(cachePath) : {};
 }
@@ -59,15 +58,16 @@ exports.createNodesV2 = [
         const optionsHash = (0, devkit_internals_1.hashObject)(options);
         const cachePath = (0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, `angular-${optionsHash}.hash`);
         const projectsCache = readProjectsCache(cachePath);
+        const pmc = (0, devkit_1.getPackageManagerCommand)((0, devkit_1.detectPackageManager)(context.workspaceRoot));
         try {
-            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, projectsCache), configFiles, options, context);
+            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, projectsCache, pmc), configFiles, options, context);
         }
         finally {
             writeProjectsToCache(cachePath, projectsCache);
         }
     },
 ];
-async function createNodesInternal(configFilePath, options, context, projectsCache) {
+async function createNodesInternal(configFilePath, options, context, projectsCache, pmc) {
     const angularWorkspaceRoot = (0, node_path_1.dirname)(configFilePath);
     // Do not create a project if package.json isn't there
     const siblingFiles = (0, node_fs_1.readdirSync)((0, node_path_1.join)(context.workspaceRoot, angularWorkspaceRoot));
@@ -75,10 +75,10 @@ async function createNodesInternal(configFilePath, options, context, projectsCac
         return {};
     }
     const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(angularWorkspaceRoot, options, context, [(0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))]);
-    projectsCache[hash] ??= await buildAngularProjects(configFilePath, options, angularWorkspaceRoot, context);
+    projectsCache[hash] ??= await buildAngularProjects(configFilePath, options, angularWorkspaceRoot, context, pmc);
     return { projects: projectsCache[hash] };
 }
-async function buildAngularProjects(configFilePath, options, angularWorkspaceRoot, context) {
+async function buildAngularProjects(configFilePath, options, angularWorkspaceRoot, context, pmc) {
     const projects = {};
     const absoluteConfigFilePath = (0, node_path_1.join)(context.workspaceRoot, configFilePath);
     const angularJson = (0, devkit_1.readJsonFile)(absoluteConfigFilePath);

package/assets.json

@@ -1,23 +0,0 @@
-{
-    "outDir": "dist/packages/angular",
-    "assets": [
-        {
-            "glob": "**/files/**"
-        },
-        {
-            "glob": "**/files/**/.gitkeep"
-        },
-        {
-            "glob": "**/*.json",
-            "ignore": ["tsconfig*.json", "project.json", ".eslintrc.json"]
-        },
-        {
-            "glob": "**/*.js",
-            "ignore": ["**/jest.config.js"]
-        },
-        {
-            "glob": "**/*.d.ts"
-        },
-        "LICENSE"
-    ]
-}

package/mf/ng-package.json

@@ -1,6 +0,0 @@
-{
-  "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
-  "lib": {
-    "entryFile": "index.ts"
-  }
-}

package/ng-package.json

@@ -1,21 +0,0 @@
-{
-    "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
-    "lib": {
-        "entryFile": "index.ts"
-    },
-    "dest": "../../dist/packages/angular",
-    "deleteDestPath": false,
-    "allowedNonPeerDependencies": [
-        "nx",
-        "@nx/",
-        "@phenomnomnominal/tsquery",
-        "@typescript-eslint/",
-        "enquirer",
-        "magic-string",
-        "picocolors",
-        "picomatch",
-        "semver",
-        "webpack-merge"
-    ],
-    "keepLifecycleScripts": true
-}

package/project.json

@@ -1,24 +0,0 @@
-{
-    "name": "angular",
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "sourceRoot": "packages/angular",
-    "projectType": "library",
-    "targets": {
-        "build-ng": {
-            "dependsOn": ["build-base", "typecheck"],
-            "executor": "@nx/angular:package",
-            "options": {
-                "project": "packages/angular/ng-package.json",
-                "tsConfig": "packages/angular/tsconfig.lib.runtime.json"
-            },
-            "outputs": ["{workspaceRoot}/dist/packages/angular"]
-        },
-        "build": {
-            "dependsOn": ["^build", "build-ng", "typecheck", "build-base"],
-            "outputs": ["{workspaceRoot}/dist/packages/angular/README.md"],
-            "command": "node ./scripts/copy-readme.js angular",
-            "inputs": ["copyReadme"]
-        }
-    },
-    "implicitDependencies": ["vite"]
-}