@nx/angular 0.0.0-pr-3-49a51e7 → 0.0.0-pr-30418-80f02f7

package/ng-package.json

@@ -15,7 +15,7 @@
     "@typescript-eslint/",
     "picocolors",
     "ignore",
-    "minimatch",
+    "picomatch",
     "rxjs-for-await",
     "webpack-merge",
     "ts-node",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "0.0.0-pr-3-49a51e7",
+  "version": "0.0.0-pr-30418-80f02f7",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Playwright and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -67,19 +67,19 @@
     "@typescript-eslint/type-utils": "^8.0.0",
     "enquirer": "~2.3.6",
     "picocolors": "^1.1.0",
+    "picomatch": "4.0.2",
     "magic-string": "~0.30.2",
-    "minimatch": "9.0.3",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "0.0.0-pr-3-49a51e7",
-    "@nx/js": "0.0.0-pr-3-49a51e7",
-    "@nx/eslint": "0.0.0-pr-3-49a51e7",
-    "@nx/webpack": "0.0.0-pr-3-49a51e7",
-    "@nx/rspack": "0.0.0-pr-3-49a51e7",
-    "@nx/module-federation": "0.0.0-pr-3-49a51e7",
-    "@nx/web": "0.0.0-pr-3-49a51e7",
-    "@nx/workspace": "0.0.0-pr-3-49a51e7",
+    "@nx/devkit": "0.0.0-pr-30418-80f02f7",
+    "@nx/js": "0.0.0-pr-30418-80f02f7",
+    "@nx/eslint": "0.0.0-pr-30418-80f02f7",
+    "@nx/webpack": "0.0.0-pr-30418-80f02f7",
+    "@nx/rspack": "0.0.0-pr-30418-80f02f7",
+    "@nx/module-federation": "0.0.0-pr-30418-80f02f7",
+    "@nx/web": "0.0.0-pr-30418-80f02f7",
+    "@nx/workspace": "0.0.0-pr-30418-80f02f7",
     "piscina": "^4.4.0"
   },
   "peerDependencies": {

package/src/executors/delegate-build/delegate-build.impl.d.ts

@@ -2,7 +2,5 @@ import type { ExecutorContext } from '@nx/devkit';
 import type { DelegateBuildExecutorSchema } from './schema';
 export declare function delegateBuildExecutor(options: DelegateBuildExecutorSchema, context: ExecutorContext): AsyncGenerator<{
     success: boolean;
-}, {
-    success: boolean;
-}, any>;
+}, void, any>;
 export default delegateBuildExecutor;

package/src/executors/delegate-build/delegate-build.impl.js

@@ -6,9 +6,6 @@ const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
 async function* delegateBuildExecutor(options, context) {
     const { target, dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
     options.tsConfig = (0, buildable_libs_utils_1.createTmpTsConfig)((0, devkit_1.joinPathFragments)(context.root, options.tsConfig), context.root, target.data.root, dependencies);
-    if (!(0, buildable_libs_utils_1.checkDependentProjectsHaveBeenBuilt)(context.root, context.projectName, context.targetName, dependencies)) {
-        return { success: false };
-    }
     const { buildTarget, ...targetOptions } = options;
     const delegateTarget = (0, devkit_1.parseTargetString)(buildTarget, context);
     yield* await (0, devkit_1.runExecutor)(delegateTarget, targetOptions, context);

package/src/executors/package/package.impl.js

@@ -31,10 +31,7 @@ function createLibraryExecutor(initializeNgPackagr) {
         if (angularMajorVersion < 18 && options.poll !== undefined) {
             throw new Error(`The "poll" option requires Angular version 18.0.0 or greater. You are currently using version ${angularVersion}.`);
         }
-        const { target, dependencies, topLevelDependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
-        if (!(0, buildable_libs_utils_1.checkDependentProjectsHaveBeenBuilt)(context.root, context.projectName, context.targetName, dependencies)) {
-            return Promise.resolve({ success: false });
-        }
+        const { dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
         if (options.watch) {
             return yield* (0, rxjs_for_await_1.eachValueFrom)((0, rxjs_1.from)(initializeNgPackagr(options, context, dependencies)).pipe((0, operators_1.switchMap)((packagr) => packagr.watch()), (0, operators_1.mapTo)({ success: true })));
         }

package/src/generators/convert-to-rspack/lib/update-tsconfig.js

@@ -2,13 +2,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateTsconfig = updateTsconfig;
 const devkit_1 = require("@nx/devkit");
+const js_1 = require("@nx/js");
 function updateTsconfig(tree, projectRoot) {
     const tsconfigPath = (0, devkit_1.joinPathFragments)(projectRoot, 'tsconfig.json');
     const tsconfig = (0, devkit_1.readJson)(tree, tsconfigPath);
-    tsconfig['ts-node'] = {
-        compilerOptions: {
-            module: 'CommonJS',
-        },
-    };
+    tsconfig['ts-node'] ??= {};
+    tsconfig['ts-node'].compilerOptions ??= {};
+    tsconfig['ts-node'].compilerOptions.module = 'CommonJS';
+    tsconfig['ts-node'].compilerOptions.moduleResolution = 'Node10';
+    if (tsconfig.compilerOptions?.customConditions) {
+        tsconfig['ts-node'].compilerOptions.customConditions = null;
+    }
+    else {
+        const rootTsconfigFile = (0, js_1.getRootTsConfigFileName)(tree);
+        if (rootTsconfigFile) {
+            const rootTsconfigJson = (0, devkit_1.readJson)(tree, rootTsconfigFile);
+            if (rootTsconfigJson.compilerOptions?.customConditions) {
+                tsconfig['ts-node'].compilerOptions.customConditions = null;
+            }
+        }
+    }
     (0, devkit_1.writeJson)(tree, tsconfigPath, tsconfig);
 }

package/src/generators/library/lib/add-project.js

@@ -4,6 +4,7 @@ exports.addProject = addProject;
 const devkit_1 = require("@nx/devkit");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const add_release_config_1 = require("@nx/js/src/generators/library/utils/add-release-config");
+const use_legacy_versioning_1 = require("nx/src/command-line/release/config/use-legacy-versioning");
 async function addProject(tree, libraryOptions) {
     const project = {
         name: libraryOptions.name,
@@ -36,7 +37,8 @@ async function addProject(tree, libraryOptions) {
             defaultConfiguration: 'production',
         };
         if (libraryOptions.publishable) {
-            await (0, add_release_config_1.addReleaseConfigForNonTsSolution)(tree, libraryOptions.name, project);
+            const nxJson = (0, devkit_1.readJson)(tree, 'nx.json');
+            await (0, add_release_config_1.addReleaseConfigForNonTsSolution)((0, use_legacy_versioning_1.shouldUseLegacyVersioning)(nxJson.release), tree, libraryOptions.name, project);
         }
     }
     (0, devkit_1.addProjectConfiguration)(tree, libraryOptions.name, project);

package/src/generators/stories/stories.js

@@ -7,7 +7,7 @@ const component_story_1 = tslib_1.__importDefault(require("../component-story/co
 const component_info_1 = require("../utils/storybook-ast/component-info");
 const entry_point_1 = require("../utils/storybook-ast/entry-point");
 const module_info_1 = require("../utils/storybook-ast/module-info");
-const minimatch_1 = require("minimatch");
+const picomatch = require("picomatch");
 const versions_1 = require("../../utils/versions");
 async function angularStoriesGenerator(tree, options) {
     const entryPoints = (0, entry_point_1.getProjectEntryPoints)(tree, options.name);
@@ -17,7 +17,7 @@ async function angularStoriesGenerator(tree, options) {
         componentsInfo.push(...(0, component_info_1.getComponentsInfo)(tree, entryPoint, moduleFilePaths, options.name), ...(0, component_info_1.getStandaloneComponentsInfo)(tree, entryPoint));
     }
     const componentInfos = componentsInfo.filter((f) => !options.ignorePaths?.some((pattern) => {
-        const shouldIgnorePath = (0, minimatch_1.minimatch)((0, devkit_1.joinPathFragments)(f.moduleFolderPath, f.path, `${f.componentFileName}.ts`), pattern);
+        const shouldIgnorePath = picomatch(pattern)((0, devkit_1.joinPathFragments)(f.moduleFolderPath, f.path, `${f.componentFileName}.ts`));
         return shouldIgnorePath;
     }));
     for (const info of componentInfos) {

package/src/migrations/update-19-6-0/turn-off-dts-by-default.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
-const minimatch_1 = require("minimatch");
+const picomatch = require("picomatch");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 async function default_1(tree) {
     (0, devkit_1.visitNotIgnoredFiles)(tree, '', (path) => {
         const webpackConfigGlob = '**/webpack*.config*.{js,ts,mjs,cjs}';
-        const result = (0, minimatch_1.minimatch)(path, webpackConfigGlob);
+        const result = picomatch(webpackConfigGlob)(path);
         if (!result) {
             return;
         }