@nx/angular 16.6.0-beta.1 → 16.6.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "16.6.0-beta.1",
+  "version": "16.6.0-beta.3",
   "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, 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- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -66,14 +66,14 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/angular": "16.6.0-beta.1",
-    "@nx/cypress": "16.6.0-beta.1",
-    "@nx/devkit": "16.6.0-beta.1",
-    "@nx/jest": "16.6.0-beta.1",
-    "@nx/js": "16.6.0-beta.1",
-    "@nx/linter": "16.6.0-beta.1",
-    "@nx/webpack": "16.6.0-beta.1",
-    "@nx/workspace": "16.6.0-beta.1",
+    "@nrwl/angular": "16.6.0-beta.3",
+    "@nx/cypress": "16.6.0-beta.3",
+    "@nx/devkit": "16.6.0-beta.3",
+    "@nx/jest": "16.6.0-beta.3",
+    "@nx/js": "16.6.0-beta.3",
+    "@nx/linter": "16.6.0-beta.3",
+    "@nx/webpack": "16.6.0-beta.3",
+    "@nx/workspace": "16.6.0-beta.3",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@typescript-eslint/type-utils": "^5.36.1",
     "chalk": "^4.1.0",
@@ -85,8 +85,6 @@
     "magic-string": "~0.26.2",
     "minimatch": "3.0.5",
     "semver": "7.5.3",
-    "ts-node": "10.9.1",
-    "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0",
     "webpack": "^5.80.0",
     "webpack-merge": "5.7.3"
@@ -110,5 +108,5 @@
   "module": "fesm2022/nx-angular.mjs",
   "typings": "index.d.ts",
   "sideEffects": false,
-  "gitHead": "cf9f5cbe6a7ce3b916ec6505dc8488f669cbc52b"
+  "gitHead": "cd8c61d7a3b8ab9bc7bab068f5ca49bbf14abbf5"
 }

package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js

@@ -6,6 +6,7 @@ const devkit_1 = require("@nx/devkit");
 const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
 const webpack_dev_server_impl_1 = require("../webpack-dev-server/webpack-dev-server.impl");
 const project_graph_1 = require("nx/src/project-graph/project-graph");
+const executor_utils_1 = require("nx/src/command-line/run/executor-utils");
 const module_federation_1 = require("../utilities/module-federation");
 const fs_1 = require("fs");
 const path_1 = require("path");
@@ -15,7 +16,6 @@ function executeModuleFederationDevServerBuilder(schema, context) {
     const options = tslib_1.__rest(schema, []);
     const projectGraph = (0, devkit_1.readCachedProjectGraph)();
     const { projects: workspaceProjects } = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph);
-    const ws = new devkit_1.Workspaces(devkit_1.workspaceRoot);
     const project = workspaceProjects[context.target.project];
     let pathToManifestFile = (0, path_1.join)(context.workspaceRoot, project.sourceRoot, 'assets/module-federation.manifest.json');
     if (options.pathToManifestFile) {
@@ -53,7 +53,7 @@ function executeModuleFederationDevServerBuilder(schema, context) {
         const runOptions = {};
         if (options.verbose) {
             const [collection, executor] = workspaceProjects[remote].targets[target].executor.split(':');
-            const { schema } = ws.readExecutor(collection, executor);
+            const { schema } = (0, executor_utils_1.getExecutorInformation)(collection, executor, devkit_1.workspaceRoot);
             if (schema.additionalProperties || 'verbose' in schema.properties) {
                 runOptions.verbose = options.verbose;
             }

package/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeModuleFederationDevSSRBuilder = void 0;
 const tslib_1 = require("tslib");
 const project_graph_1 = require("nx/src/project-graph/project-graph");
+const executor_utils_1 = require("nx/src/command-line/run/executor-utils");
 const devkit_1 = require("@nx/devkit");
 const module_federation_1 = require("../utilities/module-federation");
 const operators_1 = require("rxjs/operators");
@@ -16,7 +17,6 @@ function executeModuleFederationDevSSRBuilder(schema, context) {
     const options = tslib_1.__rest(schema, []);
     const projectGraph = (0, devkit_1.readCachedProjectGraph)();
     const { projects: workspaceProjects } = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph);
-    const ws = new devkit_1.Workspaces(devkit_1.workspaceRoot);
     const project = workspaceProjects[context.target.project];
     let pathToManifestFile = (0, path_1.join)(context.workspaceRoot, project.sourceRoot, 'assets/module-federation.manifest.json');
     if (options.pathToManifestFile) {
@@ -52,7 +52,7 @@ function executeModuleFederationDevSSRBuilder(schema, context) {
         const runOptions = {};
         if (options.verbose) {
             const [collection, executor] = workspaceProjects[remote].targets[target].executor.split(':');
-            const { schema } = ws.readExecutor(collection, executor);
+            const { schema } = (0, executor_utils_1.getExecutorInformation)(collection, executor, devkit_1.workspaceRoot);
             if (schema.additionalProperties || 'verbose' in schema.properties) {
                 runOptions.verbose = options.verbose;
             }

package/src/builders/utilities/module-federation.js

@@ -4,6 +4,7 @@ exports.validateDevRemotes = exports.getStaticRemotes = exports.getDynamicRemote
 const path_1 = require("path");
 const fs_1 = require("fs");
 const devkit_1 = require("@nx/devkit");
+const tsnode_register_1 = require("@nx/js/src/utils/typescript/tsnode-register");
 function getDynamicRemotes(project, context, workspaceProjects, remotesToSkip, pathToManifestFile = (0, path_1.join)(context.workspaceRoot, project.sourceRoot, 'assets/module-federation.manifest.json')) {
     // check for dynamic remotes
     // we should only check for dynamic based on what we generate
@@ -40,15 +41,27 @@ function getDynamicRemotes(project, context, workspaceProjects, remotesToSkip, p
     return dynamicRemotes;
 }
 exports.getDynamicRemotes = getDynamicRemotes;
-function getStaticRemotes(project, context, workspaceProjects, remotesToSkip) {
-    const mfConfigPath = (0, path_1.join)(context.workspaceRoot, project.root, 'module-federation.config.js');
-    let mfeConfig;
+function getModuleFederationConfig(tsconfigPath, workspaceRoot, projectRoot) {
+    const moduleFederationConfigPathJS = (0, path_1.join)(workspaceRoot, projectRoot, 'module-federation.config.js');
+    const moduleFederationConfigPathTS = (0, path_1.join)(workspaceRoot, projectRoot, 'module-federation.config.ts');
+    let moduleFederationConfigPath = moduleFederationConfigPathJS;
+    if ((0, fs_1.existsSync)(moduleFederationConfigPathTS)) {
+        (0, tsnode_register_1.tsNodeRegister)(moduleFederationConfigPathTS, tsconfigPath);
+        moduleFederationConfigPath = moduleFederationConfigPathTS;
+    }
     try {
-        mfeConfig = require(mfConfigPath);
+        const config = require(moduleFederationConfigPath);
+        return {
+            mfeConfig: config.default || config,
+            mfConfigPath: moduleFederationConfigPath,
+        };
     }
     catch (_a) {
-        throw new Error(`Could not load ${mfConfigPath}. Was this project generated with "@nx/angular:host"?`);
+        throw new Error(`Could not load ${moduleFederationConfigPath}. Was this project generated with "@nx/angular:host"?`);
     }
+}
+function getStaticRemotes(project, context, workspaceProjects, remotesToSkip) {
+    const { mfeConfig, mfConfigPath } = getModuleFederationConfig(project.targets.build.options.tsConfig, context.workspaceRoot, project.root);
     const remotesConfig = Array.isArray(mfeConfig.remotes) && mfeConfig.remotes.length > 0
         ? mfeConfig.remotes
         : [];

package/src/builders/utilities/webpack.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveIndexHtmlTransformer = exports.resolveCustomWebpackConfig = exports.mergeCustomWebpackConfig = void 0;
 const tslib_1 = require("tslib");
 const webpack_merge_1 = require("webpack-merge");
+const tsnode_register_1 = require("@nx/js/src/utils/typescript/tsnode-register");
 function mergeCustomWebpackConfig(baseWebpackConfig, pathToWebpackConfig, options, target) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const customWebpackConfiguration = resolveCustomWebpackConfig(pathToWebpackConfig, options.tsConfig);
@@ -23,7 +24,7 @@ function mergeCustomWebpackConfig(baseWebpackConfig, pathToWebpackConfig, option
 exports.mergeCustomWebpackConfig = mergeCustomWebpackConfig;
 function resolveCustomWebpackConfig(path, tsConfig) {
     var _a;
-    tsNodeRegister(path, tsConfig);
+    (0, tsnode_register_1.tsNodeRegister)(path, tsConfig);
     const customWebpackConfig = require(path);
     // If the user provides a configuration in TS file
     // then there are 2 cases for exporting an object. The first one is:
@@ -35,29 +36,9 @@ function resolveCustomWebpackConfig(path, tsConfig) {
 exports.resolveCustomWebpackConfig = resolveCustomWebpackConfig;
 function resolveIndexHtmlTransformer(path, tsConfig, target) {
     var _a;
-    tsNodeRegister(path, tsConfig);
+    (0, tsnode_register_1.tsNodeRegister)(path, tsConfig);
     const indexTransformer = require(path);
     const transform = (_a = indexTransformer.default) !== null && _a !== void 0 ? _a : indexTransformer;
     return (indexHtml) => transform(target, indexHtml);
 }
 exports.resolveIndexHtmlTransformer = resolveIndexHtmlTransformer;
-function tsNodeRegister(file, tsConfig) {
-    if (!(file === null || file === void 0 ? void 0 : file.endsWith('.ts')))
-        return;
-    // Register TS compiler lazily
-    require('ts-node').register({
-        project: tsConfig,
-        compilerOptions: {
-            module: 'CommonJS',
-            types: ['node'],
-        },
-    });
-    if (!tsConfig)
-        return;
-    // Register paths in tsConfig
-    const tsconfigPaths = require('tsconfig-paths');
-    const { absoluteBaseUrl: baseUrl, paths } = tsconfigPaths.loadConfig(tsConfig);
-    if (baseUrl && paths) {
-        tsconfigPaths.register({ baseUrl, paths });
-    }
-}

package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js

@@ -14,7 +14,7 @@ function generateStorybookConfiguration(tree, options) {
             linter: options.linter,
             cypressDirectory: options.cypressDirectory,
             tsConfiguration: options.tsConfiguration,
-            configureTestRunner: options.configureTestRunner,
+            interactionTests: options.interactionTests,
             configureStaticServe: options.configureStaticServe,
             skipFormat: true,
         });

package/src/generators/storybook-configuration/schema.d.ts

@@ -11,5 +11,5 @@ export interface StorybookConfigurationOptions {
   tsConfiguration?: boolean;
   skipFormat?: boolean;
   ignorePaths?: string[];
-  configureTestRunner?: boolean;
+  interactionTests?: boolean;
 }

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

@@ -18,12 +18,18 @@
       "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
+    },
     "configureCypress": {
       "type": "boolean",
       "description": "Specifies whether to configure Cypress or not.",
-      "x-prompt": "Configure a Cypress e2e app to run against the storybook instance?",
-      "default": true,
-      "x-priority": "important"
+      "x-deprecated": "Please use Storybook interaction tests instead."
     },
     "generateStories": {
       "type": "boolean",
@@ -35,9 +41,7 @@
     "generateCypressSpecs": {
       "type": "boolean",
       "description": "Specifies whether to automatically generate test files in the generated Cypress e2e app.",
-      "x-prompt": "Automatically generate test files in the generated Cypress e2e app?",
-      "default": true,
-      "x-priority": "important"
+      "x-deprecated": "Please use Storybook interaction tests instead."
     },
     "configureStaticServe": {
       "type": "boolean",
@@ -48,7 +52,8 @@
     },
     "cypressDirectory": {
       "type": "string",
-      "description": "A directory where the Cypress project will be placed. Placed at the root by default."
+      "description": "A directory where the Cypress project will be placed. Placed at the root by default.",
+      "x-deprecated": "Please use Storybook interaction tests instead."
     },
     "linter": {
       "description": "The tool to use for running lint checks.",
@@ -59,7 +64,7 @@
     "tsConfiguration": {
       "type": "boolean",
       "description": "Configure your project with TypeScript. Generate main.ts and preview.ts files, instead of main.js and preview.js.",
-      "default": false,
+      "default": true,
       "x-priority": "important"
     },
     "skipFormat": {
@@ -82,10 +87,6 @@
         "**/**/src/**/*.other.*",
         "libs/my-lib/src/not-stories/**,**/**/src/**/*.other.*,apps/my-app/**/*.something.ts"
       ]
-    },
-    "configureTestRunner": {
-      "type": "boolean",
-      "description": "Add a Storybook Test-Runner target."
     }
   },
   "additionalProperties": false,