@nrwl/angular 14.7.0-beta.0 → 14.7.0-beta.3

package/CHANGELOG.md

@@ -3,6 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [14.7.0-beta.0](https://github.com/nrwl/nx/compare/14.6.3...14.7.0-beta.0) (2022-09-06)
+# [14.7.0-beta.3](https://github.com/nrwl/nx/compare/14.6.3...14.7.0-beta.3) (2022-09-09)
 
 **Note:** Version bump only for package @nrwl/angular

package/generators.d.ts

@@ -25,4 +25,6 @@ export * from './src/generators/stories/stories';
 export * from './src/generators/storybook-configuration/storybook-configuration';
 export * from './src/generators/upgrade-module/upgrade-module';
 export * from './src/generators/web-worker/web-worker';
+export * from './src/generators/cypress-component-configuration/cypress-component-configuration';
+export * from './src/generators/component-test/component-test';
 export * from './src/utils/test-runners';

package/generators.js

@@ -28,5 +28,7 @@ tslib_1.__exportStar(require("./src/generators/stories/stories"), exports);
 tslib_1.__exportStar(require("./src/generators/storybook-configuration/storybook-configuration"), exports);
 tslib_1.__exportStar(require("./src/generators/upgrade-module/upgrade-module"), exports);
 tslib_1.__exportStar(require("./src/generators/web-worker/web-worker"), exports);
+tslib_1.__exportStar(require("./src/generators/cypress-component-configuration/cypress-component-configuration"), exports);
+tslib_1.__exportStar(require("./src/generators/component-test/component-test"), exports);
 tslib_1.__exportStar(require("./src/utils/test-runners"), exports);
 //# sourceMappingURL=generators.js.map

package/generators.js.map

@@ -1 +1 @@
-{"version":3,"file":"generators.js","sourceRoot":"","sources":["../../../packages/angular/generators.ts"],"names":[],"mappings":";;;AAAA,mFAAyD;AACzD,mFAAyD;AACzD,6GAAmF;AACnF,yGAA+E;AAC/E,2FAAiE;AACjE,+EAAqD;AACrD,6GAAmF;AACnF,6FAAmE;AACnE,qEAA2C;AAC3C,qEAA2C;AAC3C,uFAA6D;AAC7D,uEAA6C;AAC7C,uHAA6F;AAC7F,2EAAiD;AACjD,qEAA2C;AAC3C,qEAA2C;AAC3C,yEAA+C;AAC/C,yFAA+D;AAC/D,+EAAqD;AACrD,iGAAuE;AACvE,qEAA2C;AAC3C,6EAAmD;AACnD,yFAA+D;AAC/D,2EAAiD;AACjD,2GAAiF;AACjF,yFAA+D;AAC/D,iFAAuD;AACvD,mEAAyC"}
+{"version":3,"file":"generators.js","sourceRoot":"","sources":["../../../packages/angular/generators.ts"],"names":[],"mappings":";;;AAAA,mFAAyD;AACzD,mFAAyD;AACzD,6GAAmF;AACnF,yGAA+E;AAC/E,2FAAiE;AACjE,+EAAqD;AACrD,6GAAmF;AACnF,6FAAmE;AACnE,qEAA2C;AAC3C,qEAA2C;AAC3C,uFAA6D;AAC7D,uEAA6C;AAC7C,uHAA6F;AAC7F,2EAAiD;AACjD,qEAA2C;AAC3C,qEAA2C;AAC3C,yEAA+C;AAC/C,yFAA+D;AAC/D,+EAAqD;AACrD,iGAAuE;AACvE,qEAA2C;AAC3C,6EAAmD;AACnD,yFAA+D;AAC/D,2EAAiD;AACjD,2GAAiF;AACjF,yFAA+D;AAC/D,iFAAuD;AACvD,2HAAiG;AACjG,yFAA+D;AAC/D,mEAAyC"}

package/generators.json

@@ -33,6 +33,11 @@
       "schema": "./src/generators/component-story/schema.json",
       "description": "Creates a `stories.ts` file for a component."
     },
+    "component-test": {
+      "factory": "./src/generators/component-test/compat",
+      "schema": "./src/generators/component-test/schema.json",
+      "description": "Creates a cypress component test file for a component."
+    },
     "convert-tslint-to-eslint": {
       "factory": "./src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint#conversionSchematic",
       "schema": "./src/generators/convert-tslint-to-eslint/schema.json",
@@ -146,6 +151,11 @@
       "schema": "./src/generators/storybook-configuration/schema.json",
       "description": "Adds Storybook configuration to a project."
     },
+    "cypress-component-configuration": {
+      "factory": "./src/generators/cypress-component-configuration/compat",
+      "schema": "./src/generators/cypress-component-configuration/schema.json",
+      "description": "Setup Cypress component testing for a project."
+    },
     "upgrade-module": {
       "factory": "./src/generators/upgrade-module/compat",
       "schema": "./src/generators/upgrade-module/schema.json",
@@ -194,6 +204,11 @@
       "schema": "./src/generators/component-story/schema.json",
       "description": "Creates a stories.ts file for a component."
     },
+    "component-test": {
+      "factory": "./src/generators/component-test/component-test",
+      "schema": "./src/generators/component-test/schema.json",
+      "description": "Creates a cypress component test file for a component."
+    },
     "convert-tslint-to-eslint": {
       "factory": "./src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint#conversionGenerator",
       "schema": "./src/generators/convert-tslint-to-eslint/schema.json",
@@ -307,6 +322,11 @@
       "schema": "./src/generators/storybook-configuration/schema.json",
       "description": "Adds Storybook configuration to a project."
     },
+    "cypress-component-configuration": {
+      "factory": "./src/generators/cypress-component-configuration/cypress-component-configuration",
+      "schema": "./src/generators/cypress-component-configuration/schema.json",
+      "description": "Setup Cypress component testing for a project."
+    },
     "upgrade-module": {
       "factory": "./src/generators/upgrade-module/upgrade-module",
       "schema": "./src/generators/upgrade-module/schema.json",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/angular",
-  "version": "14.7.0-beta.0",
+  "version": "14.7.0-beta.3",
   "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, Cypress, Karma, and Protractor. \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": {
     "type": "git",
@@ -23,6 +23,7 @@
     "./tailwind": "./tailwind.js",
     "./src/generators/utils": "./src/generators/utils/index.js",
     "./module-federation": "./module-federation/index.js",
+    "./plugins/component-testing": "./plugins/component-testing.js",
     "./package.json": {
       "default": "./package.json"
     },
@@ -65,13 +66,13 @@
   },
   "dependencies": {
     "@angular-devkit/schematics": "~14.2.0",
-    "@nrwl/cypress": "14.7.0-beta.0",
-    "@nrwl/devkit": "14.7.0-beta.0",
-    "@nrwl/jest": "14.7.0-beta.0",
-    "@nrwl/linter": "14.7.0-beta.0",
-    "@nrwl/storybook": "14.7.0-beta.0",
-    "@nrwl/web": "14.7.0-beta.0",
-    "@nrwl/workspace": "14.7.0-beta.0",
+    "@nrwl/cypress": "14.7.0-beta.3",
+    "@nrwl/devkit": "14.7.0-beta.3",
+    "@nrwl/jest": "14.7.0-beta.3",
+    "@nrwl/linter": "14.7.0-beta.3",
+    "@nrwl/storybook": "14.7.0-beta.3",
+    "@nrwl/web": "14.7.0-beta.3",
+    "@nrwl/workspace": "14.7.0-beta.3",
     "@phenomnomnominal/tsquery": "4.1.1",
     "@schematics/angular": "~14.2.0",
     "chalk": "4.1.0",
@@ -95,5 +96,5 @@
   "fesm2015": "fesm2015/nrwl-angular.mjs",
   "typings": "index.d.ts",
   "sideEffects": false,
-  "gitHead": "8c78beaa74c0c0c4d1c7a3512b6e9e18843bbd5a"
+  "gitHead": "6d0c6a83d42145984bafc9dd904c6885eaa53865"
 }

package/plugins/component-testing.d.ts

@@ -0,0 +1,38 @@
+import { NxComponentTestingOptions } from '@nrwl/cypress/plugins/cypress-preset';
+import type { BrowserBuilderSchema } from '../src/builders/webpack-browser/webpack-browser.impl';
+/**
+ * Angular nx preset for Cypress Component Testing
+ *
+ * This preset contains the base configuration
+ * for your component tests that nx recommends.
+ * including a devServer that supports nx workspaces.
+ * you can easily extend this within your cypress config via spreading the preset
+ * @example
+ * export default defineConfig({
+ *   component: {
+ *     ...nxComponentTestingPreset(__filename)
+ *     // add your own config here
+ *   }
+ * })
+ *
+ * @param pathToConfig will be used for loading project options and to construct the output paths for videos and screenshots
+ * @param options override options
+ */
+export declare function nxComponentTestingPreset(pathToConfig: string, options?: NxComponentTestingOptions): {
+    specPattern: string[];
+    devServer: {
+        options: {
+            projectConfig: {
+                root: string;
+                sourceRoot: string;
+                buildOptions: BrowserBuilderSchema;
+            };
+        };
+        framework: "angular";
+        bundler: "webpack";
+    };
+    videosFolder: string;
+    screenshotsFolder: string;
+    video: boolean;
+    chromeWebSecurity: boolean;
+};

package/plugins/component-testing.js

@@ -0,0 +1,202 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.nxComponentTestingPreset = void 0;
+const cypress_preset_1 = require("@nrwl/cypress/plugins/cypress-preset");
+const ct_helpers_1 = require("@nrwl/cypress/src/utils/ct-helpers");
+const devkit_1 = require("@nrwl/devkit");
+const runtime_lint_utils_1 = require("@nrwl/workspace/src/utils/runtime-lint-utils");
+const fs_1 = require("fs");
+const path_1 = require("path");
+/**
+ * Angular nx preset for Cypress Component Testing
+ *
+ * This preset contains the base configuration
+ * for your component tests that nx recommends.
+ * including a devServer that supports nx workspaces.
+ * you can easily extend this within your cypress config via spreading the preset
+ * @example
+ * export default defineConfig({
+ *   component: {
+ *     ...nxComponentTestingPreset(__filename)
+ *     // add your own config here
+ *   }
+ * })
+ *
+ * @param pathToConfig will be used for loading project options and to construct the output paths for videos and screenshots
+ * @param options override options
+ */
+function nxComponentTestingPreset(pathToConfig, options) {
+    var _a, _b, _c, _d;
+    let graph;
+    try {
+        graph = (0, devkit_1.readCachedProjectGraph)();
+    }
+    catch (e) {
+        throw new Error(
+        // don't want to strip indents so error stack has correct indentation
+        `Unable to read the project graph for component testing.
+This is likely due to not running via nx. i.e. 'nx component-test my-project'.
+Please open an issue if this error persists.
+${e.stack ? e.stack : e}`);
+    }
+    const ctProjectConfig = (0, cypress_preset_1.getProjectConfigByPath)(graph, pathToConfig);
+    const ctConfigurationName = process.env.NX_CYPRESS_TARGET_CONFIGURATION;
+    const ctContext = (0, cypress_preset_1.createExecutorContext)(graph, ctProjectConfig.targets, ctProjectConfig.name, (options === null || options === void 0 ? void 0 : options.ctTargetName) || 'component-test', ctConfigurationName);
+    const buildTarget = getBuildableTarget(ctContext);
+    if (!buildTarget.project && !((_b = (_a = graph.nodes) === null || _a === void 0 ? void 0 : _a[buildTarget.project]) === null || _b === void 0 ? void 0 : _b.data)) {
+        throw new Error((0, devkit_1.stripIndents) `Unable to find project configuration for build target. 
+    Project Name? ${buildTarget.project}
+    Has project config? ${!!((_d = (_c = graph.nodes) === null || _c === void 0 ? void 0 : _c[buildTarget.project]) === null || _d === void 0 ? void 0 : _d.data)}`);
+    }
+    const fromWorkspaceRoot = (0, path_1.relative)(devkit_1.workspaceRoot, pathToConfig);
+    const normalizedFromWorkspaceRootPath = (0, fs_1.lstatSync)(pathToConfig).isFile()
+        ? (0, path_1.dirname)(fromWorkspaceRoot)
+        : fromWorkspaceRoot;
+    const offset = (0, devkit_1.offsetFromRoot)(normalizedFromWorkspaceRootPath);
+    const buildContext = (0, cypress_preset_1.createExecutorContext)(graph, graph.nodes[buildTarget.project].data.targets, buildTarget.project, buildTarget.target, buildTarget.configuration);
+    const buildableProjectConfig = normalizeBuildTargetOptions(buildContext, ctContext, offset);
+    return Object.assign(Object.assign({}, (0, cypress_preset_1.nxBaseCypressPreset)(pathToConfig)), { 
+        // NOTE: cannot use a glob pattern since it will break cypress generated tsconfig.
+        specPattern: ['**/*.cy.ts', '**/*.cy.js'], devServer: Object.assign(Object.assign({}, {
+            framework: 'angular',
+            bundler: 'webpack',
+        }), { options: {
+                projectConfig: buildableProjectConfig,
+            } }) });
+}
+exports.nxComponentTestingPreset = nxComponentTestingPreset;
+function getBuildableTarget(ctContext) {
+    var _a;
+    const targets = (_a = ctContext.projectGraph.nodes[ctContext.projectName].data) === null || _a === void 0 ? void 0 : _a.targets;
+    const targetConfig = targets === null || targets === void 0 ? void 0 : targets[ctContext.targetName];
+    if (!targetConfig) {
+        throw new Error((0, devkit_1.stripIndents) `Unable to find component testing target configuration in project '${ctContext.projectName}'.
+      Has targets? ${!!targets}
+      Has target name? ${ctContext.targetName}
+      Has ct project name? ${ctContext.projectName}
+      `);
+    }
+    const cypressCtOptions = (0, devkit_1.readTargetOptions)({
+        project: ctContext.projectName,
+        target: ctContext.targetName,
+        configuration: ctContext.configurationName,
+    }, ctContext);
+    if (!cypressCtOptions.devServerTarget) {
+        throw new Error(`Unable to find the 'devServerTarget' executor option in the '${ctContext.targetName}' target of the '${ctContext.projectName}' project`);
+    }
+    return (0, devkit_1.parseTargetString)(cypressCtOptions.devServerTarget);
+}
+function normalizeBuildTargetOptions(buildContext, ctContext, offset) {
+    const options = (0, devkit_1.readTargetOptions)({
+        project: buildContext.projectName,
+        target: buildContext.targetName,
+        configuration: buildContext.configurationName,
+    }, buildContext);
+    const buildOptions = withSchemaDefaults(options);
+    // paths need to be unix paths for angular devkit
+    buildOptions.polyfills = (0, devkit_1.joinPathFragments)(offset, buildOptions.polyfills);
+    buildOptions.main = (0, devkit_1.joinPathFragments)(offset, buildOptions.main);
+    buildOptions.index =
+        typeof buildOptions.index === 'string'
+            ? (0, devkit_1.joinPathFragments)(offset, buildOptions.index)
+            : (buildOptions.index.input = (0, devkit_1.joinPathFragments)(offset, buildOptions.index.input));
+    buildOptions.tsConfig = (0, devkit_1.joinPathFragments)(offset, buildOptions.tsConfig);
+    buildOptions.fileReplacements = buildOptions.fileReplacements.map((fr) => {
+        fr.replace = (0, devkit_1.joinPathFragments)(offset, fr.replace);
+        fr.with = (0, devkit_1.joinPathFragments)(offset, fr.with);
+        return fr;
+    });
+    // if the ct project isn't being used in the build project
+    // then we don't want to have the assets/scripts/styles be included to
+    // prevent inclusion of unintended stuff like tailwind
+    if ((0, ct_helpers_1.isCtProjectUsingBuildProject)(ctContext.projectGraph, buildContext.projectName, ctContext.projectName)) {
+        buildOptions.assets = buildOptions.assets.map((asset) => {
+            return typeof asset === 'string'
+                ? (0, devkit_1.joinPathFragments)(offset, asset)
+                : (asset.input = (0, devkit_1.joinPathFragments)(offset, asset.input));
+        });
+        buildOptions.styles = buildOptions.styles.map((style) => {
+            return typeof style === 'string'
+                ? (0, devkit_1.joinPathFragments)(offset, style)
+                : (style.input = (0, devkit_1.joinPathFragments)(offset, style.input));
+        });
+        buildOptions.scripts = buildOptions.scripts.map((script) => {
+            return typeof script === 'string'
+                ? (0, devkit_1.joinPathFragments)(offset, script)
+                : (script.input = (0, devkit_1.joinPathFragments)(offset, script.input));
+        });
+    }
+    else {
+        const stylePath = getTempStylesForTailwind(ctContext);
+        buildOptions.styles = stylePath ? [stylePath] : [];
+        buildOptions.assets = [];
+        buildOptions.scripts = [];
+    }
+    const { root, sourceRoot } = buildContext.projectGraph.nodes[buildContext.projectName].data;
+    return {
+        root: (0, devkit_1.joinPathFragments)(offset, root),
+        sourceRoot: (0, devkit_1.joinPathFragments)(offset, sourceRoot),
+        buildOptions,
+    };
+}
+function withSchemaDefaults(options) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    if (!options.main) {
+        throw new Error('Missing executor options "main"');
+    }
+    if (!options.index) {
+        throw new Error('Missing executor options "index"');
+    }
+    if (!options.tsConfig) {
+        throw new Error('Missing executor options "tsConfig"');
+    }
+    // cypress defaults aot to false so we cannot use buildOptimizer
+    // otherwise the 'buildOptimizer' cannot be used without 'aot' error is thrown
+    options.buildOptimizer = false;
+    options.aot = false;
+    (_a = options.assets) !== null && _a !== void 0 ? _a : (options.assets = []);
+    (_b = options.allowedCommonJsDependencies) !== null && _b !== void 0 ? _b : (options.allowedCommonJsDependencies = []);
+    (_c = options.budgets) !== null && _c !== void 0 ? _c : (options.budgets = []);
+    (_d = options.commonChunk) !== null && _d !== void 0 ? _d : (options.commonChunk = true);
+    (_e = options.crossOrigin) !== null && _e !== void 0 ? _e : (options.crossOrigin = 'none');
+    (_f = options.deleteOutputPath) !== null && _f !== void 0 ? _f : (options.deleteOutputPath = true);
+    (_g = options.extractLicenses) !== null && _g !== void 0 ? _g : (options.extractLicenses = true);
+    (_h = options.fileReplacements) !== null && _h !== void 0 ? _h : (options.fileReplacements = []);
+    (_j = options.inlineStyleLanguage) !== null && _j !== void 0 ? _j : (options.inlineStyleLanguage = 'css');
+    (_k = options.i18nDuplicateTranslation) !== null && _k !== void 0 ? _k : (options.i18nDuplicateTranslation = 'warning');
+    (_l = options.outputHashing) !== null && _l !== void 0 ? _l : (options.outputHashing = 'none');
+    (_m = options.progress) !== null && _m !== void 0 ? _m : (options.progress = true);
+    (_o = options.scripts) !== null && _o !== void 0 ? _o : (options.scripts = []);
+    return options;
+}
+/**
+ * @returns a path from the workspace root to a temp file containing the base tailwind setup
+ * if tailwind is being used in the project root or workspace root
+ * this file should get cleaned up via the cypress executor
+ */
+function getTempStylesForTailwind(ctExecutorContext) {
+    const mappedGraph = (0, runtime_lint_utils_1.mapProjectGraphFiles)(ctExecutorContext.projectGraph);
+    const ctProjectConfig = ctExecutorContext.projectGraph.nodes[ctExecutorContext.projectName].data;
+    // angular only supports `tailwind.config.{js,cjs}`
+    const ctProjectTailwindConfig = (0, path_1.join)(ctProjectConfig.root, 'tailwind.config');
+    const isTailWindInCtProject = !!mappedGraph.allFiles[ctProjectTailwindConfig];
+    const isTailWindInRoot = !!mappedGraph.allFiles['tailwind.config'];
+    if (isTailWindInRoot || isTailWindInCtProject) {
+        const pathToStyle = (0, ct_helpers_1.getTempTailwindPath)(ctExecutorContext);
+        try {
+            (0, fs_1.mkdirSync)((0, path_1.dirname)(pathToStyle), { recursive: true });
+            (0, fs_1.writeFileSync)(pathToStyle, `
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+`, { encoding: 'utf-8' });
+            return pathToStyle;
+        }
+        catch (makeTmpFileError) {
+            devkit_1.logger.warn((0, devkit_1.stripIndents) `Issue creating a temp file for tailwind styles. Defaulting to no tailwind setup.
+      Temp file path? ${pathToStyle}`);
+            devkit_1.logger.error(makeTmpFileError);
+        }
+    }
+}
+//# sourceMappingURL=component-testing.js.map

package/plugins/component-testing.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"component-testing.js","sourceRoot":"","sources":["../../../../packages/angular/plugins/component-testing.ts"],"names":[],"mappings":"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"}

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

@@ -103,7 +103,6 @@ function executeModuleFederationDevServerBuilder(schema, context) {
             target,
             configuration: context.target.configuration,
             runOptions,
-            executor: context.builder.builderName,
         }, options.verbose).then((obs) => {
             obs.toPromise().catch((err) => {
                 throw new Error(`Remote '${remote}' failed to serve correctly due to the following: \r\n${err.toString()}`);

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

@@ -1 +1 @@
-{"version":3,"file":"module-federation-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/module-federation-dev-server/module-federation-dev-server.impl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"module-federation-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/module-federation-dev-server/module-federation-dev-server.impl.ts"],"names":[],"mappings":"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"}

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ngc/compile-source-files.js

@@ -91,7 +91,7 @@ function compileSourceFiles(graph, tsConfig, moduleResolutionCache, extraOptions
         // Collect source file specific diagnostics
         for (const sourceFile of builder.getSourceFiles()) {
             if (!ignoreForDiagnostics.has(sourceFile)) {
-                allDiagnostics.push(...builder.getSyntacticDiagnostics(sourceFile), ...builder.getSemanticDiagnostics(sourceFile));
+                allDiagnostics.push(...builder.getDeclarationDiagnostics(sourceFile), ...builder.getSyntacticDiagnostics(sourceFile), ...builder.getSemanticDiagnostics(sourceFile));
             }
             if (sourceFile.isDeclarationFile) {
                 continue;

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ngc/compile-source-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"compile-source-files.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-adjustments/ngc/compile-source-files.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"compile-source-files.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-adjustments/ngc/compile-source-files.ts"],"names":[],"mappings":"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"}

package/src/executors/package/ng-packagr-adjustments/ngc/compile-source-files.js

@@ -86,7 +86,7 @@ function compileSourceFiles(graph, tsConfig, moduleResolutionCache, extraOptions
         // Collect source file specific diagnostics
         for (const sourceFile of builder.getSourceFiles()) {
             if (!ignoreForDiagnostics.has(sourceFile)) {
-                allDiagnostics.push(...builder.getSyntacticDiagnostics(sourceFile), ...builder.getSemanticDiagnostics(sourceFile));
+                allDiagnostics.push(...builder.getDeclarationDiagnostics(sourceFile), ...builder.getSyntacticDiagnostics(sourceFile), ...builder.getSemanticDiagnostics(sourceFile));
             }
             if (sourceFile.isDeclarationFile) {
                 continue;

package/src/executors/package/ng-packagr-adjustments/ngc/compile-source-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"compile-source-files.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/ngc/compile-source-files.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"compile-source-files.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/ngc/compile-source-files.ts"],"names":[],"mappings":"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"}

package/src/generators/component-cypress-spec/component-cypress-spec.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentCypressSpecGenerator = void 0;
 const devkit_1 = require("@nrwl/devkit");
-const storybook_1 = require("../utils/storybook");
+const storybook_inputs_1 = require("../utils/storybook-ast/storybook-inputs");
 const get_args_default_value_1 = require("./lib/get-args-default-value");
 const get_component_selector_1 = require("./lib/get-component-selector");
 function componentCypressSpecGenerator(tree, options) {
@@ -18,7 +18,7 @@ function componentCypressSpecGenerator(tree, options) {
         return;
     }
     const fullComponentPath = (0, devkit_1.joinPathFragments)(projectPath, componentPath, `${componentFileName}.ts`);
-    const props = (0, storybook_1.getComponentProps)(tree, fullComponentPath, get_args_default_value_1.getArgsDefaultValue);
+    const props = (0, storybook_inputs_1.getComponentProps)(tree, fullComponentPath, get_args_default_value_1.getArgsDefaultValue);
     const componentSelector = (0, get_component_selector_1.getComponentSelector)(tree, fullComponentPath);
     (0, devkit_1.generateFiles)(tree, templatesDir, destinationDir, {
         projectName,

package/src/generators/component-cypress-spec/component-cypress-spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"component-cypress-spec.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component-cypress-spec/component-cypress-spec.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AACtB,kDAAuD;AACvD,yEAAmE;AACnE,yEAAoE;AAGpE,SAAgB,6BAA6B,CAC3C,IAAU,EACV,OAA6C;IAE7C,MAAM,EACJ,cAAc,EACd,WAAW,EACX,WAAW,EACX,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,aAAa,GACd,GAAG,OAAO,CAAC;IACZ,MAAM,cAAc,GAAG,cAAc,IAAI,GAAG,WAAW,MAAM,CAAC;IAC9D,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC5E,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAC9B,IAAA,0BAAiB,EAAC,IAAI,EAAE,mBAAmB,CAAC,CAC7C,CAAC;IACF,MAAM,2BAA2B,GAAG,IAAA,0BAAiB,EACnD,UAAU,EACV,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,CACrC,CAAC;IAEF,MAAM,YAAY,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC3D,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,2BAA2B,EAC3B,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,aAAa,CAC/B,CAAC;IACF,MAAM,SAAS,GAAG,IAAA,0BAAiB,EACjC,cAAc,EACd,GAAG,iBAAiB,IAAI,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,KAAK,CAC1D,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QAC1B,OAAO;KACR;IAED,MAAM,iBAAiB,GAAG,IAAA,0BAAiB,EACzC,WAAW,EACX,aAAa,EACb,GAAG,iBAAiB,KAAK,CAC1B,CAAC;IACF,MAAM,KAAK,GAAG,IAAA,6BAAiB,EAAC,IAAI,EAAE,iBAAiB,EAAE,4CAAmB,CAAC,CAAC;IAC9E,MAAM,iBAAiB,GAAG,IAAA,6CAAoB,EAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;IAExE,IAAA,sBAAa,EAAC,IAAI,EAAE,YAAY,EAAE,cAAc,EAAE;QAChD,WAAW;QACX,iBAAiB;QACjB,aAAa;QACb,iBAAiB;QACjB,KAAK;QACL,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;KAC5C,CAAC,CAAC;IAEH,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;QACvB,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;KACnB;AACH,CAAC;AAzDD,sEAyDC;AAED,kBAAe,6BAA6B,CAAC"}
+{"version":3,"file":"component-cypress-spec.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component-cypress-spec/component-cypress-spec.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AACtB,8EAA4E;AAC5E,yEAAmE;AACnE,yEAAoE;AAGpE,SAAgB,6BAA6B,CAC3C,IAAU,EACV,OAA6C;IAE7C,MAAM,EACJ,cAAc,EACd,WAAW,EACX,WAAW,EACX,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,aAAa,GACd,GAAG,OAAO,CAAC;IACZ,MAAM,cAAc,GAAG,cAAc,IAAI,GAAG,WAAW,MAAM,CAAC;IAC9D,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC5E,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAC9B,IAAA,0BAAiB,EAAC,IAAI,EAAE,mBAAmB,CAAC,CAC7C,CAAC;IACF,MAAM,2BAA2B,GAAG,IAAA,0BAAiB,EACnD,UAAU,EACV,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,CACrC,CAAC;IAEF,MAAM,YAAY,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC3D,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,2BAA2B,EAC3B,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,aAAa,CAC/B,CAAC;IACF,MAAM,SAAS,GAAG,IAAA,0BAAiB,EACjC,cAAc,EACd,GAAG,iBAAiB,IAAI,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,KAAK,CAC1D,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QAC1B,OAAO;KACR;IAED,MAAM,iBAAiB,GAAG,IAAA,0BAAiB,EACzC,WAAW,EACX,aAAa,EACb,GAAG,iBAAiB,KAAK,CAC1B,CAAC;IACF,MAAM,KAAK,GAAG,IAAA,oCAAiB,EAAC,IAAI,EAAE,iBAAiB,EAAE,4CAAmB,CAAC,CAAC;IAC9E,MAAM,iBAAiB,GAAG,IAAA,6CAAoB,EAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;IAExE,IAAA,sBAAa,EAAC,IAAI,EAAE,YAAY,EAAE,cAAc,EAAE;QAChD,WAAW;QACX,iBAAiB;QACjB,aAAa;QACb,iBAAiB;QACjB,KAAK;QACL,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;KAC5C,CAAC,CAAC;IAEH,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;QACvB,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;KACnB;AACH,CAAC;AAzDD,sEAyDC;AAED,kBAAe,6BAA6B,CAAC"}

package/src/generators/component-story/component-story.js

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentStoryGenerator = void 0;
 const devkit_1 = require("@nrwl/devkit");
-const storybook_1 = require("../utils/storybook");
-const get_args_default_value_1 = require("./lib/get-args-default-value");
+const storybook_inputs_1 = require("../utils/storybook-ast/storybook-inputs");
 function componentStoryGenerator(tree, options) {
     const { componentFileName, componentName, componentPath, projectPath } = options;
     const templatesDir = (0, devkit_1.joinPathFragments)(__dirname, 'files');
@@ -12,7 +11,7 @@ function componentStoryGenerator(tree, options) {
     if (tree.exists(storyFile)) {
         return;
     }
-    const props = (0, storybook_1.getComponentProps)(tree, (0, devkit_1.joinPathFragments)(destinationDir, `${componentFileName}.ts`), get_args_default_value_1.getArgsDefaultValue);
+    const props = (0, storybook_inputs_1.getComponentProps)(tree, (0, devkit_1.joinPathFragments)(destinationDir, `${componentFileName}.ts`));
     (0, devkit_1.generateFiles)(tree, templatesDir, destinationDir, {
         componentFileName: componentFileName,
         componentName: componentName,

package/src/generators/component-story/component-story.js.map

@@ -1 +1 @@
-{"version":3,"file":"component-story.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component-story/component-story.ts"],"names":[],"mappings":";;;AACA,yCAA6E;AAC7E,kDAAuD;AACvD,yEAAmE;AAGnE,SAAgB,uBAAuB,CACrC,IAAU,EACV,OAAuC;IAEvC,MAAM,EAAE,iBAAiB,EAAE,aAAa,EAAE,aAAa,EAAE,WAAW,EAAE,GACpE,OAAO,CAAC;IAEV,MAAM,YAAY,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC3D,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,WAAW,EAAE,aAAa,CAAC,CAAC;IACrE,MAAM,SAAS,GAAG,IAAA,0BAAiB,EACjC,cAAc,EACd,GAAG,iBAAiB,aAAa,CAClC,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QAC1B,OAAO;KACR;IAED,MAAM,KAAK,GAAG,IAAA,6BAAiB,EAC7B,IAAI,EACJ,IAAA,0BAAiB,EAAC,cAAc,EAAE,GAAG,iBAAiB,KAAK,CAAC,EAC5D,4CAAmB,CACpB,CAAC;IAEF,IAAA,sBAAa,EAAC,IAAI,EAAE,YAAY,EAAE,cAAc,EAAE;QAChD,iBAAiB,EAAE,iBAAiB;QACpC,aAAa,EAAE,aAAa;QAC5B,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,YAAY,KAAK,WAAW,CAAC;QACjE,IAAI,EAAE,EAAE;KACT,CAAC,CAAC;IAEH,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;QACvB,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;KACnB;AACH,CAAC;AAlCD,0DAkCC;AAED,kBAAe,uBAAuB,CAAC"}
+{"version":3,"file":"component-story.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component-story/component-story.ts"],"names":[],"mappings":";;;AACA,yCAA6E;AAC7E,8EAA4E;AAG5E,SAAgB,uBAAuB,CACrC,IAAU,EACV,OAAuC;IAEvC,MAAM,EAAE,iBAAiB,EAAE,aAAa,EAAE,aAAa,EAAE,WAAW,EAAE,GACpE,OAAO,CAAC;IAEV,MAAM,YAAY,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC3D,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,WAAW,EAAE,aAAa,CAAC,CAAC;IACrE,MAAM,SAAS,GAAG,IAAA,0BAAiB,EACjC,cAAc,EACd,GAAG,iBAAiB,aAAa,CAClC,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QAC1B,OAAO;KACR;IAED,MAAM,KAAK,GAAG,IAAA,oCAAiB,EAC7B,IAAI,EACJ,IAAA,0BAAiB,EAAC,cAAc,EAAE,GAAG,iBAAiB,KAAK,CAAC,CAC7D,CAAC;IAEF,IAAA,sBAAa,EAAC,IAAI,EAAE,YAAY,EAAE,cAAc,EAAE;QAChD,iBAAiB,EAAE,iBAAiB;QACpC,aAAa,EAAE,aAAa;QAC5B,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,YAAY,KAAK,WAAW,CAAC;QACjE,IAAI,EAAE,EAAE;KACT,CAAC,CAAC;IAEH,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;QACvB,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;KACnB;AACH,CAAC;AAjCD,0DAiCC;AAED,kBAAe,uBAAuB,CAAC"}

package/src/generators/component-story/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxAngularComponentStoryGenerator",
   "type": "object",
   "cli": "nx",

package/src/generators/component-test/compat.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (generatorOptions: import("./schema").ComponentTestSchema) => (tree: any, context: any) => Promise<any>;
+export default _default;

package/src/generators/component-test/compat.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nrwl/devkit");
+const component_test_1 = require("./component-test");
+exports.default = (0, devkit_1.convertNxGenerator)(component_test_1.componentTestGenerator);
+//# sourceMappingURL=compat.js.map

package/src/generators/component-test/compat.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component-test/compat.ts"],"names":[],"mappings":";;AAAA,yCAAkD;AAClD,qDAA0D;AAE1D,kBAAe,IAAA,2BAAkB,EAAC,uCAAsB,CAAC,CAAC"}

package/src/generators/component-test/component-test.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nrwl/devkit';
+import { ComponentTestSchema } from './schema';
+export declare function componentTestGenerator(tree: Tree, options: ComponentTestSchema): void;

package/src/generators/component-test/component-test.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.componentTestGenerator = void 0;
+const cypress_version_1 = require("@nrwl/cypress/src/utils/cypress-version");
+const devkit_1 = require("@nrwl/devkit");
+const storybook_inputs_1 = require("../utils/storybook-ast/storybook-inputs");
+function componentTestGenerator(tree, options) {
+    (0, cypress_version_1.assertMinimumCypressVersion)(10);
+    const { root } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    const componentDirPath = (0, devkit_1.joinPathFragments)(root, options.componentDir);
+    const componentFilePath = (0, devkit_1.joinPathFragments)(componentDirPath, `${options.componentFileName}.ts`);
+    const componentTestFilePath = (0, devkit_1.joinPathFragments)(componentDirPath, `${options.componentFileName}.cy.ts`);
+    if (tree.exists(componentFilePath) && !tree.exists(componentTestFilePath)) {
+        const props = (0, storybook_inputs_1.getComponentProps)(tree, componentFilePath, storybook_inputs_1.getArgsDefaultValue, false);
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), componentDirPath, {
+            componentName: options.componentName,
+            componentFileName: options.componentFileName.startsWith('./')
+                ? options.componentFileName.slice(2)
+                : options.componentFileName,
+            props: props.filter((p) => typeof p.defaultValue !== 'undefined'),
+            tpl: '',
+        });
+    }
+}
+exports.componentTestGenerator = componentTestGenerator;
+//# sourceMappingURL=component-test.js.map

package/src/generators/component-test/component-test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"component-test.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component-test/component-test.ts"],"names":[],"mappings":";;;AAAA,6EAAsF;AACtF,yCAKsB;AACtB,8EAGiD;AAGjD,SAAgB,sBAAsB,CACpC,IAAU,EACV,OAA4B;IAE5B,IAAA,6CAA2B,EAAC,EAAE,CAAC,CAAC;IAChC,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACjE,MAAM,gBAAgB,GAAG,IAAA,0BAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IACvE,MAAM,iBAAiB,GAAG,IAAA,0BAAiB,EACzC,gBAAgB,EAChB,GAAG,OAAO,CAAC,iBAAiB,KAAK,CAClC,CAAC;IACF,MAAM,qBAAqB,GAAG,IAAA,0BAAiB,EAC7C,gBAAgB,EAChB,GAAG,OAAO,CAAC,iBAAiB,QAAQ,CACrC,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,EAAE;QACzE,MAAM,KAAK,GAAG,IAAA,oCAAiB,EAC7B,IAAI,EACJ,iBAAiB,EACjB,sCAAmB,EACnB,KAAK,CACN,CAAC;QACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EACrC,gBAAgB,EAChB;YACE,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,CAAC,UAAU,CAAC,IAAI,CAAC;gBAC3D,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;gBACpC,CAAC,CAAC,OAAO,CAAC,iBAAiB;YAC7B,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,YAAY,KAAK,WAAW,CAAC;YACjE,GAAG,EAAE,EAAE;SACR,CACF,CAAC;KACH;AACH,CAAC;AArCD,wDAqCC"}