@nrwl/angular 14.8.7 → 14.9.0-beta.1

package/src/generators/component-cypress-spec/lib/get-args-default-value.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-args-default-value.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component-cypress-spec/lib/get-args-default-value.ts"],"names":[],"mappings":";;;AACA,2CAAwC;AAExC,SAAgB,mBAAmB,CACjC,QAA6B;IAE7B,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE;QACzB,OAAO,SAAS,CAAC;KAClB;IACD,QAAQ,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE;QACjC,KAAK,uBAAU,CAAC,aAAa;YAC3B,MAAM,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YACjE,OAAO,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC1C,KAAK,uBAAU,CAAC,cAAc,CAAC;QAC/B,KAAK,uBAAU,CAAC,WAAW,CAAC;QAC5B,KAAK,uBAAU,CAAC,YAAY;YAC1B,OAAO,QAAQ,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;QACxC;YACE,OAAO,SAAS,CAAC;KACpB;AACH,CAAC;AAjBD,kDAiBC"}
+{"version":3,"file":"get-args-default-value.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component-cypress-spec/lib/get-args-default-value.ts"],"names":[],"mappings":";;;AAAA,uFAAmF;AAGnF,IAAI,QAAqC,CAAC;AAE1C,SAAgB,mBAAmB,CACjC,QAA6B;IAE7B,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE;QACzB,OAAO,SAAS,CAAC;KAClB;IACD,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IACD,QAAQ,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE;QACjC,KAAK,QAAQ,CAAC,UAAU,CAAC,aAAa;YACpC,MAAM,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YACjE,OAAO,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC1C,KAAK,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAC;QACxC,KAAK,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC;QACrC,KAAK,QAAQ,CAAC,UAAU,CAAC,YAAY;YACnC,OAAO,QAAQ,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;QACxC;YACE,OAAO,SAAS,CAAC;KACpB;AACH,CAAC;AApBD,kDAoBC"}

package/src/generators/component-cypress-spec/lib/get-component-selector.js

@@ -1,17 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getComponentSelector = void 0;
-const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
-const typescript_2 = require("typescript");
+const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
+const typescript_1 = require("nx/src/utils/typescript");
 const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
+let tsModule;
 function getComponentSelector(tree, path) {
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
     const file = (0, ast_utils_1.getTsSourceFile)(tree, path);
     const componentDecorators = (0, ast_utils_1.getDecoratorMetadata)(file, 'Component', '@angular/core');
     if (componentDecorators.length === 0) {
         throw new Error(`No @Component decorator in ${path}.`);
     }
     const componentDecorator = componentDecorators[0];
-    const selectorNode = ((0, typescript_1.findNodes)(componentDecorator, typescript_2.SyntaxKind.PropertyAssignment).find((node) => node.name.getText() === 'selector'));
+    const selectorNode = ((0, typescript_1.findNodes)(componentDecorator, tsModule.SyntaxKind.PropertyAssignment).find((node) => node.name.getText() === 'selector'));
     if (!selectorNode) {
         throw new Error(`No selector defined for the component in ${path}.`);
     }

package/src/generators/component-cypress-spec/lib/get-component-selector.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-component-selector.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component-cypress-spec/lib/get-component-selector.ts"],"names":[],"mappings":";;;AACA,yEAAqE;AAErE,2CAAwC;AACxC,kEAG4C;AAE5C,SAAgB,oBAAoB,CAAC,IAAU,EAAE,IAAY;IAC3D,MAAM,IAAI,GAAG,IAAA,2BAAe,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAEzC,MAAM,mBAAmB,GAAG,IAAA,gCAAoB,EAC9C,IAAI,EACJ,WAAW,EACX,eAAe,CAChB,CAAC;IACF,IAAI,mBAAmB,CAAC,MAAM,KAAK,CAAC,EAAE;QACpC,MAAM,IAAI,KAAK,CAAC,8BAA8B,IAAI,GAAG,CAAC,CAAC;KACxD;IACD,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;IAClD,MAAM,YAAY,GAAuB,CACvC,IAAA,sBAAS,EAAC,kBAAkB,EAAE,uBAAU,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAC/D,CAAC,IAAwB,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,UAAU,CACjE,CACF,CAAC;IACF,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,4CAA4C,IAAI,GAAG,CAAC,CAAC;KACtE;IAED,OAAO,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACzD,CAAC;AAtBD,oDAsBC"}
+{"version":3,"file":"get-component-selector.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component-cypress-spec/lib/get-component-selector.ts"],"names":[],"mappings":";;;AACA,uFAAmF;AACnF,wDAAoD;AAGpD,kEAG4C;AAE5C,IAAI,QAAqC,CAAC;AAE1C,SAAgB,oBAAoB,CAAC,IAAU,EAAE,IAAY;IAC3D,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IACD,MAAM,IAAI,GAAG,IAAA,2BAAe,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAEzC,MAAM,mBAAmB,GAAG,IAAA,gCAAoB,EAC9C,IAAI,EACJ,WAAW,EACX,eAAe,CAChB,CAAC;IACF,IAAI,mBAAmB,CAAC,MAAM,KAAK,CAAC,EAAE;QACpC,MAAM,IAAI,KAAK,CAAC,8BAA8B,IAAI,GAAG,CAAC,CAAC;KACxD;IACD,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;IAClD,MAAM,YAAY,GAAuB,CACvC,IAAA,sBAAS,EAAC,kBAAkB,EAAE,QAAQ,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,IAAI,CACxE,CAAC,IAAwB,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,UAAU,CACjE,CACF,CAAC;IACF,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,4CAA4C,IAAI,GAAG,CAAC,CAAC;KACtE;IAED,OAAO,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACzD,CAAC;AAzBD,oDAyBC"}

package/src/generators/component-cypress-spec/schema.json

@@ -8,27 +8,36 @@
     "projectName": {
       "type": "string",
       "description": "The name of the project.",
-      "examples": ["ui-samples"]
+      "$default": {
+        "$source": "projectName",
+        "index": 0
+      },
+      "examples": ["ui-samples"],
+      "x-priority": "important"
     },
     "projectPath": {
       "type": "string",
       "description": "Path to the project.",
-      "examples": ["libs/ui-samples"]
+      "examples": ["libs/ui-samples"],
+      "x-priority": "important"
     },
     "componentName": {
       "type": "string",
       "description": "Class name of the component.",
-      "examples": ["AwesomeComponent"]
+      "examples": ["AwesomeComponent"],
+      "x-priority": "important"
     },
     "componentPath": {
       "type": "string",
       "description": "Relative path to the component file from the project root.",
-      "examples": ["awesome"]
+      "examples": ["awesome"],
+      "x-priority": "important"
     },
     "componentFileName": {
       "type": "string",
       "description": "Component file name without the `.ts` extension.",
-      "examples": ["awesome.component"]
+      "examples": ["awesome.component"],
+      "x-priority": "important"
     },
     "cypressProject": {
       "type": "string",
@@ -41,7 +50,8 @@
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",
-      "default": false
+      "default": false,
+      "x-priority": "internal"
     }
   },
   "additionalProperties": false,
@@ -51,5 +61,6 @@
     "componentName",
     "componentPath",
     "componentFileName"
-  ]
+  ],
+  "examplesFile": "../../../docs/component-cypress-spec-examples.md"
 }

package/src/generators/component-story/files/__componentFileName__.stories.ts__tmpl__

@@ -1,22 +1,16 @@
-import { moduleMetadata, Story, Meta } from '@storybook/angular';
+import { Meta } from '@storybook/angular';
 import { <%=componentName%> } from './<%=componentFileName%>';
 
 export default {
   title: '<%=componentName%>',
-  component: <%=componentName%>,
-  decorators: [
-    moduleMetadata({
-      imports: [],
-    })
-  ],
+  component: <%=componentName%>
 } as Meta<<%=componentName%>>;
 
-const Template: Story<<%=componentName%>> = (args: <%=componentName%>) => ({
-  props: args,
-});
-
-
-export const Primary = Template.bind({});
-Primary.args = {<% for (let prop of props) { %>
+export const Primary = {
+  render: (args: <%=componentName%>) => ({
+    props: args,
+  }),
+  args: {<% for (let prop of props) { %>
     <%= prop.name %>:  <%- prop.defaultValue %>,<% } %>
-}
+  },
+};

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

@@ -8,27 +8,32 @@
     "projectPath": {
       "type": "string",
       "description": "Path to the project.",
-      "examples": ["libs/ui-samples"]
+      "examples": ["libs/ui-samples"],
+      "x-priority": "important"
     },
     "componentName": {
       "type": "string",
       "description": "Class name of the component.",
-      "examples": ["AwesomeComponent"]
+      "examples": ["AwesomeComponent"],
+      "x-priority": "important"
     },
     "componentPath": {
       "type": "string",
       "description": "Relative path to the component file from the project root.",
-      "examples": ["awesome"]
+      "examples": ["awesome"],
+      "x-priority": "important"
     },
     "componentFileName": {
       "type": "string",
       "description": "Component file name without the `.ts` extension.",
-      "examples": ["awesome.component"]
+      "examples": ["awesome.component"],
+      "x-priority": "important"
     },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",
-      "default": false
+      "default": false,
+      "x-priority": "internal"
     }
   },
   "additionalProperties": false,

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

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

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

@@ -23,4 +23,5 @@ function componentTestGenerator(tree, options) {
     }
 }
 exports.componentTestGenerator = componentTestGenerator;
+exports.default = componentTestGenerator;
 //# sourceMappingURL=component-test.js.map

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

@@ -1 +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"}
+{"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;AAED,kBAAe,sBAAsB,CAAC"}

package/src/generators/component-test/files/__componentFileName__.cy.ts__tpl__

@@ -1,19 +1,23 @@
-import { MountConfig, mount } from 'cypress/angular';
+import { TestBed } from '@angular/core/testing';
 import { <%= componentName %> } from './<%= componentFileName %>';
 
 describe(<%= componentName %>.name, () => {
-  const config: MountConfig<<%= componentName %>> = {
-    declarations: [],
-    imports: [],
-    providers: []
-  }
+
+  beforeEach(() => {
+    TestBed.overrideComponent(<%= componentName %>, {
+      add: { 
+        imports: [],
+        providers: []
+      }
+    }) 
+  })
 
   it('renders', () => {
-     mount(<%= componentName %>,<% if(props.length > 0) { %> {
-           ...config,
+     cy.mount(<%= componentName %>,<% if(props.length > 0) { %> {
            componentProperties: {<% for (let prop of props) { %>
                <%= prop.name %>:  <%- prop.defaultValue %>,<% } %>
           }
-       }<% } else { %> config<% } %>);
+       }<% } %>);
   })
+
 })

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

@@ -8,33 +8,43 @@
     "project": {
       "type": "string",
       "description": "The name of the project where the component is located.",
+      "$default": {
+        "$source": "projectName",
+        "index": 0
+      },
       "x-dropdown": "projects",
-      "x-prompt": "What project is the component located in?"
+      "x-prompt": "What project is the component located in?",
+      "x-priority": "important"
     },
     "componentName": {
       "type": "string",
       "description": "Class name of the component to create a test for.",
       "examples": ["MyFancyButtonComponent"],
-      "x-prompt": "What is the class name of the component to create a test for?"
+      "x-prompt": "What is the class name of the component to create a test for?",
+      "x-priority": "important"
     },
     "componentDir": {
       "type": "string",
       "description": "Relative path to the folder that contains the component from the project root.",
       "examples": ["src/lib/my-fancy-button"],
-      "x-prompt": "What is the path to the component directory from the project root?"
+      "x-prompt": "What is the path to the component directory from the project root?",
+      "x-priority": "important"
     },
     "componentFileName": {
       "type": "string",
       "description": "File name that contains the component without the `.ts` extension.",
       "examples": ["my-fancy-button.component"],
-      "x-prompt": "What is the file name that contains the component?"
+      "x-prompt": "What is the file name that contains the component?",
+      "x-priority": "important"
     },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",
-      "default": false
+      "default": false,
+      "x-priority": "internal"
     }
   },
   "additionalProperties": false,
-  "required": ["project", "componentName", "componentDir", "componentFileName"]
+  "required": ["project", "componentName", "componentDir", "componentFileName"],
+  "examplesFile": "../../../docs/component-test-examples.md"
 }

package/src/generators/convert-to-with-mf/lib/check-name-matches.js

@@ -1,16 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkOutputNameMatchesProjectName = void 0;
-const tsquery_1 = require("@phenomnomnominal/tsquery");
+const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
 function checkOutputNameMatchesProjectName(ast, projectName) {
+    (0, ensure_typescript_1.ensureTypescript)();
+    const { tsquery } = require('@phenomnomnominal/tsquery');
     const OUTPUT_SELECTOR = 'PropertyAssignment:has(Identifier[name=output]) > ObjectLiteralExpression:has(PropertyAssignment:has(Identifier[name=uniqueName]))';
     const UNIQUENAME_SELECTOR = 'ObjectLiteralExpression > PropertyAssignment:has(Identifier[name=uniqueName]) > StringLiteral';
-    const outputNodes = (0, tsquery_1.tsquery)(ast, OUTPUT_SELECTOR, { visitAllChildren: true });
+    const outputNodes = tsquery(ast, OUTPUT_SELECTOR, { visitAllChildren: true });
     if (outputNodes.length === 0) {
         // If the output isnt set in the config, then we can still set the project name correctly
         return true;
     }
-    const uniqueNameNodes = (0, tsquery_1.tsquery)(outputNodes[0], UNIQUENAME_SELECTOR, {
+    const uniqueNameNodes = tsquery(outputNodes[0], UNIQUENAME_SELECTOR, {
         visitAllChildren: true,
     });
     if (uniqueNameNodes.length === 0) {

package/src/generators/convert-to-with-mf/lib/check-name-matches.js.map

@@ -1 +1 @@
-{"version":3,"file":"check-name-matches.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/convert-to-with-mf/lib/check-name-matches.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AAEpD,SAAgB,iCAAiC,CAC/C,GAAe,EACf,WAAmB;IAEnB,MAAM,eAAe,GACnB,oIAAoI,CAAC;IACvI,MAAM,mBAAmB,GACvB,+FAA+F,CAAC;IAElG,MAAM,WAAW,GAAG,IAAA,iBAAO,EAAC,GAAG,EAAE,eAAe,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9E,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;QAC5B,yFAAyF;QACzF,OAAO,IAAI,CAAC;KACb;IAED,MAAM,eAAe,GAAG,IAAA,iBAAO,EAAC,WAAW,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE;QACnE,gBAAgB,EAAE,IAAI;KACvB,CAAC,CAAC;IACH,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE;QAChC,4FAA4F;QAC5F,OAAO,IAAI,CAAC;KACb;IACD,MAAM,UAAU,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAElE,OAAO,UAAU,KAAK,WAAW,CAAC;AACpC,CAAC;AAzBD,8EAyBC"}
+{"version":3,"file":"check-name-matches.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/convert-to-with-mf/lib/check-name-matches.ts"],"names":[],"mappings":";;;AACA,uFAAmF;AAEnF,SAAgB,iCAAiC,CAC/C,GAAe,EACf,WAAmB;IAEnB,IAAA,oCAAgB,GAAE,CAAC;IACnB,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;IACzD,MAAM,eAAe,GACnB,oIAAoI,CAAC;IACvI,MAAM,mBAAmB,GACvB,+FAA+F,CAAC;IAElG,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,eAAe,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9E,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;QAC5B,yFAAyF;QACzF,OAAO,IAAI,CAAC;KACb;IAED,MAAM,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE;QACnE,gBAAgB,EAAE,IAAI;KACvB,CAAC,CAAC;IACH,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE;QAChC,4FAA4F;QAC5F,OAAO,IAAI,CAAC;KACb;IACD,MAAM,UAAU,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAElE,OAAO,UAAU,KAAK,WAAW,CAAC;AACpC,CAAC;AA3BD,8EA2BC"}

package/src/generators/convert-to-with-mf/lib/check-shared-npm-packages.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkSharedNpmPackagesMatchExpected = void 0;
-const tsquery_1 = require("@phenomnomnominal/tsquery");
+const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
 function checkSharedNpmPackagesMatchExpected(ast) {
+    (0, ensure_typescript_1.ensureTypescript)();
+    const { tsquery } = require('@phenomnomnominal/tsquery');
     const SHARE_HELPER_SELECTOR = 'PropertyAssignment:has(Identifier[name=shared]) > CallExpression:has(Identifier[name=share])';
     const SHARED_PACKAGE_CONFIG_SELECTOR = 'ObjectLiteralExpression > PropertyAssignment > ObjectLiteralExpression';
-    const shareHelperNodes = (0, tsquery_1.tsquery)(ast, SHARE_HELPER_SELECTOR, {
+    const shareHelperNodes = tsquery(ast, SHARE_HELPER_SELECTOR, {
         visitAllChildren: true,
     });
     let sharedPackageConfigNodes;
@@ -13,18 +15,18 @@ function checkSharedNpmPackagesMatchExpected(ast) {
     if (shareHelperNodes.length === 0) {
         // if we arent sharing using share helper, check for standard object sharing syntax
         const SHARED_OBJECT_SELECTOR = 'PropertyAssignment:has(Identifier[name=shared]) > ObjectLiteralExpression';
-        const sharedObjectNodes = (0, tsquery_1.tsquery)(ast, SHARED_OBJECT_SELECTOR, {
+        const sharedObjectNodes = tsquery(ast, SHARED_OBJECT_SELECTOR, {
             visitAllChildren: true,
         });
         if (sharedObjectNodes.length === 0) {
             // nothing is being shared, we're safe to continue
             return true;
         }
-        sharedPackageConfigNodes = (0, tsquery_1.tsquery)(sharedObjectNodes[0], SHARED_PACKAGE_CONFIG_SELECTOR, { visitAllChildren: true });
+        sharedPackageConfigNodes = tsquery(sharedObjectNodes[0], SHARED_PACKAGE_CONFIG_SELECTOR, { visitAllChildren: true });
         settingsToMatch = [`singleton: true`, `strictVersion: true`];
     }
     else {
-        sharedPackageConfigNodes = (0, tsquery_1.tsquery)(shareHelperNodes[0], SHARED_PACKAGE_CONFIG_SELECTOR, { visitAllChildren: true });
+        sharedPackageConfigNodes = tsquery(shareHelperNodes[0], SHARED_PACKAGE_CONFIG_SELECTOR, { visitAllChildren: true });
         settingsToMatch = [
             `singleton: true`,
             `strictVersion: true`,

package/src/generators/convert-to-with-mf/lib/check-shared-npm-packages.js.map

@@ -1 +1 @@
-{"version":3,"file":"check-shared-npm-packages.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/convert-to-with-mf/lib/check-shared-npm-packages.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AAEpD,SAAgB,mCAAmC,CAAC,GAAe;IACjE,MAAM,qBAAqB,GACzB,8FAA8F,CAAC;IACjG,MAAM,8BAA8B,GAClC,wEAAwE,CAAC;IAE3E,MAAM,gBAAgB,GAAG,IAAA,iBAAO,EAAC,GAAG,EAAE,qBAAqB,EAAE;QAC3D,gBAAgB,EAAE,IAAI;KACvB,CAAC,CAAC;IAEH,IAAI,wBAAgC,CAAC;IACrC,IAAI,eAAe,GAAa,EAAE,CAAC;IACnC,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;QACjC,mFAAmF;QACnF,MAAM,sBAAsB,GAC1B,2EAA2E,CAAC;QAC9E,MAAM,iBAAiB,GAAG,IAAA,iBAAO,EAAC,GAAG,EAAE,sBAAsB,EAAE;YAC7D,gBAAgB,EAAE,IAAI;SACvB,CAAC,CAAC;QAEH,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE;YAClC,kDAAkD;YAClD,OAAO,IAAI,CAAC;SACb;QAED,wBAAwB,GAAG,IAAA,iBAAO,EAChC,iBAAiB,CAAC,CAAC,CAAC,EACpB,8BAA8B,EAC9B,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAC3B,CAAC;QAEF,eAAe,GAAG,CAAC,iBAAiB,EAAE,qBAAqB,CAAC,CAAC;KAC9D;SAAM;QACL,wBAAwB,GAAG,IAAA,iBAAO,EAChC,gBAAgB,CAAC,CAAC,CAAC,EACnB,8BAA8B,EAC9B,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAC3B,CAAC;QAEF,eAAe,GAAG;YAChB,iBAAiB;YACjB,qBAAqB;YACrB,yBAAyB;SAC1B,CAAC;KACH;IAED,IAAI,wBAAwB,CAAC,MAAM,KAAK,CAAC,EAAE;QACzC,4EAA4E;QAC5E,OAAO,IAAI,CAAC;KACb;IAED,IAAI,aAAa,GAAG,IAAI,CAAC;IACzB,KAAK,MAAM,UAAU,IAAI,wBAAwB,EAAE;QACjD,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;QACxC,aAAa,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,CAChD,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAC7B,CAAC;QAEF,IAAI,CAAC,aAAa,EAAE;YAClB,MAAM;SACP;KACF;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAhED,kFAgEC"}
+{"version":3,"file":"check-shared-npm-packages.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/convert-to-with-mf/lib/check-shared-npm-packages.ts"],"names":[],"mappings":";;;AACA,uFAAmF;AAEnF,SAAgB,mCAAmC,CAAC,GAAe;IACjE,IAAA,oCAAgB,GAAE,CAAC;IACnB,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;IACzD,MAAM,qBAAqB,GACzB,8FAA8F,CAAC;IACjG,MAAM,8BAA8B,GAClC,wEAAwE,CAAC;IAE3E,MAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,EAAE,qBAAqB,EAAE;QAC3D,gBAAgB,EAAE,IAAI;KACvB,CAAC,CAAC;IAEH,IAAI,wBAAgC,CAAC;IACrC,IAAI,eAAe,GAAa,EAAE,CAAC;IACnC,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;QACjC,mFAAmF;QACnF,MAAM,sBAAsB,GAC1B,2EAA2E,CAAC;QAC9E,MAAM,iBAAiB,GAAG,OAAO,CAAC,GAAG,EAAE,sBAAsB,EAAE;YAC7D,gBAAgB,EAAE,IAAI;SACvB,CAAC,CAAC;QAEH,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE;YAClC,kDAAkD;YAClD,OAAO,IAAI,CAAC;SACb;QAED,wBAAwB,GAAG,OAAO,CAChC,iBAAiB,CAAC,CAAC,CAAC,EACpB,8BAA8B,EAC9B,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAC3B,CAAC;QAEF,eAAe,GAAG,CAAC,iBAAiB,EAAE,qBAAqB,CAAC,CAAC;KAC9D;SAAM;QACL,wBAAwB,GAAG,OAAO,CAChC,gBAAgB,CAAC,CAAC,CAAC,EACnB,8BAA8B,EAC9B,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAC3B,CAAC;QAEF,eAAe,GAAG;YAChB,iBAAiB;YACjB,qBAAqB;YACrB,yBAAyB;SAC1B,CAAC;KACH;IAED,IAAI,wBAAwB,CAAC,MAAM,KAAK,CAAC,EAAE;QACzC,4EAA4E;QAC5E,OAAO,IAAI,CAAC;KACb;IAED,IAAI,aAAa,GAAG,IAAI,CAAC;IACzB,KAAK,MAAM,UAAU,IAAI,wBAAwB,EAAE;QACjD,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;QACxC,aAAa,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,CAChD,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAC7B,CAAC;QAEF,IAAI,CAAC,aAAa,EAAE;YAClB,MAAM;SACP;KACF;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAlED,kFAkEC"}

package/src/generators/convert-to-with-mf/lib/is-host-remote-config.d.ts

@@ -1,5 +1,5 @@
 import type { SourceFile } from 'typescript';
-export declare type IsHostRemoteConfigResult = 'host' | 'remote' | 'both' | false;
+export type IsHostRemoteConfigResult = 'host' | 'remote' | 'both' | false;
 export declare function isHostRemoteConfig(ast: SourceFile): IsHostRemoteConfigResult;
 export declare function getRemotesFromHost(ast: SourceFile): any[];
-export declare function getExposedModulesFromRemote(ast: SourceFile): {};
+export declare function getExposedModulesFromRemote(ast: SourceFile): any;

package/src/generators/convert-to-with-mf/lib/is-host-remote-config.js

@@ -1,20 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExposedModulesFromRemote = exports.getRemotesFromHost = exports.isHostRemoteConfig = void 0;
-const tsquery_1 = require("@phenomnomnominal/tsquery");
+const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
 const REMOTES_EXPRESSION_SELECTOR = 'PropertyAssignment:has(Identifier[name=remotes]) > ObjectLiteralExpression';
 const EXPOSES_EXPRESSION_SELECTOR = 'PropertyAssignment:has(Identifier[name=exposes]) > ObjectLiteralExpression';
 const PROPERTY_SELECTOR = 'ObjectLiteralExpression > PropertyAssignment';
 function isHostRemoteConfig(ast) {
     let isHost = false;
     let isRemote = false;
-    const remotesNodes = (0, tsquery_1.tsquery)(ast, REMOTES_EXPRESSION_SELECTOR, {
+    (0, ensure_typescript_1.ensureTypescript)();
+    const { tsquery } = require('@phenomnomnominal/tsquery');
+    const remotesNodes = tsquery(ast, REMOTES_EXPRESSION_SELECTOR, {
         visitAllChildren: true,
     });
     if (remotesNodes.length > 0) {
         isHost = true;
     }
-    const exposesNodes = (0, tsquery_1.tsquery)(ast, EXPOSES_EXPRESSION_SELECTOR, {
+    const exposesNodes = tsquery(ast, EXPOSES_EXPRESSION_SELECTOR, {
         visitAllChildren: true,
     });
     if (exposesNodes.length > 0) {
@@ -25,13 +27,15 @@ function isHostRemoteConfig(ast) {
 }
 exports.isHostRemoteConfig = isHostRemoteConfig;
 function getRemotesFromHost(ast) {
-    const remotesObjectNodes = (0, tsquery_1.tsquery)(ast, REMOTES_EXPRESSION_SELECTOR, {
+    (0, ensure_typescript_1.ensureTypescript)();
+    const { tsquery } = require('@phenomnomnominal/tsquery');
+    const remotesObjectNodes = tsquery(ast, REMOTES_EXPRESSION_SELECTOR, {
         visitAllChildren: true,
     });
     if (remotesObjectNodes.length === 0) {
         return [];
     }
-    const remotesNodes = (0, tsquery_1.tsquery)(remotesObjectNodes[0], PROPERTY_SELECTOR, {
+    const remotesNodes = tsquery(remotesObjectNodes[0], PROPERTY_SELECTOR, {
         visitAllChildren: true,
     });
     if (remotesNodes.length === 0) {
@@ -51,7 +55,9 @@ function getRemotesFromHost(ast) {
 }
 exports.getRemotesFromHost = getRemotesFromHost;
 function getExposedModulesFromRemote(ast) {
-    const exposesObjectNodes = (0, tsquery_1.tsquery)(ast, EXPOSES_EXPRESSION_SELECTOR, {
+    (0, ensure_typescript_1.ensureTypescript)();
+    const { tsquery } = require('@phenomnomnominal/tsquery');
+    const exposesObjectNodes = tsquery(ast, EXPOSES_EXPRESSION_SELECTOR, {
         visitAllChildren: true,
     });
     if (exposesObjectNodes.length === 0) {

package/src/generators/convert-to-with-mf/lib/is-host-remote-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"is-host-remote-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/convert-to-with-mf/lib/is-host-remote-config.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AAIpD,MAAM,2BAA2B,GAC/B,4EAA4E,CAAC;AAC/E,MAAM,2BAA2B,GAC/B,4EAA4E,CAAC;AAC/E,MAAM,iBAAiB,GAAG,8CAA8C,CAAC;AAEzE,SAAgB,kBAAkB,CAAC,GAAe;IAChD,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,QAAQ,GAAG,KAAK,CAAC;IAErB,MAAM,YAAY,GAAG,IAAA,iBAAO,EAAC,GAAG,EAAE,2BAA2B,EAAE;QAC7D,gBAAgB,EAAE,IAAI;KACvB,CAAC,CAAC;IACH,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;QAC3B,MAAM,GAAG,IAAI,CAAC;KACf;IAED,MAAM,YAAY,GAAG,IAAA,iBAAO,EAAC,GAAG,EAAE,2BAA2B,EAAE;QAC7D,gBAAgB,EAAE,IAAI;KACvB,CAAC,CAAC;IACH,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;QAC3B,QAAQ,GAAG,IAAI,CAAC;KACjB;IAED,IAAI,MAAM,GACR,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC;IAC9E,OAAO,MAAM,CAAC;AAChB,CAAC;AArBD,gDAqBC;AAED,SAAgB,kBAAkB,CAAC,GAAe;IAChD,MAAM,kBAAkB,GAAG,IAAA,iBAAO,EAAC,GAAG,EAAE,2BAA2B,EAAE;QACnE,gBAAgB,EAAE,IAAI;KACvB,CAAC,CAAC;IACH,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE;QACnC,OAAO,EAAE,CAAC;KACX;IAED,MAAM,YAAY,GAAG,IAAA,iBAAO,EAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE;QACrE,gBAAgB,EAAE,IAAI;KACvB,CAAC,CAAC;IAEH,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;QAC7B,OAAO,EAAE,CAAC;KACX;IAED,MAAM,OAAO,GAAG,EAAE,CAAC;IACnB,KAAK,MAAM,UAAU,IAAI,YAAY,EAAE;QACrC,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;QACxC,MAAM,WAAW,GAAG,UAAU;aAC3B,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;QAChD,MAAM,UAAU,GAAG,WAAW,CAAC,KAAK,EAAE,CAAC;QACvC,MAAM,cAAc,GAAG,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QACtE,OAAO,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC;KAC5C;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AA3BD,gDA2BC;AAED,SAAgB,2BAA2B,CAAC,GAAe;IACzD,MAAM,kBAAkB,GAAG,IAAA,iBAAO,EAAC,GAAG,EAAE,2BAA2B,EAAE;QACnE,gBAAgB,EAAE,IAAI;KACvB,CAAC,CAAC;IACH,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE;QACnC,OAAO,EAAE,CAAC;KACX;IAED,OAAO,kBAAkB,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;AACzC,CAAC;AATD,kEASC"}
+{"version":3,"file":"is-host-remote-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/convert-to-with-mf/lib/is-host-remote-config.ts"],"names":[],"mappings":"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"}

package/src/generators/convert-to-with-mf/lib/parse-ast-webpack-config.d.ts

@@ -1,2 +1,2 @@
 import type { Tree } from '@nrwl/devkit';
-export declare function parseASTOfWebpackConfig(tree: Tree, pathToWebpackConfig: string): import("typescript").SourceFile;
+export declare function parseASTOfWebpackConfig(tree: Tree, pathToWebpackConfig: string): any;

package/src/generators/convert-to-with-mf/lib/parse-ast-webpack-config.js

@@ -1,13 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseASTOfWebpackConfig = void 0;
-const tsquery_1 = require("@phenomnomnominal/tsquery");
+const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
 function parseASTOfWebpackConfig(tree, pathToWebpackConfig) {
     if (!tree.exists(pathToWebpackConfig)) {
         throw new Error(`Cannot migrate webpack config at \`${pathToWebpackConfig}\` as it does not exist. Please ensure this file exists and that the path to the file is correct.`);
     }
+    (0, ensure_typescript_1.ensureTypescript)();
+    const { tsquery } = require('@phenomnomnominal/tsquery');
     const source = tree.read(pathToWebpackConfig, 'utf-8');
-    return tsquery_1.tsquery.ast(source);
+    return tsquery.ast(source);
 }
 exports.parseASTOfWebpackConfig = parseASTOfWebpackConfig;
 //# sourceMappingURL=parse-ast-webpack-config.js.map

package/src/generators/convert-to-with-mf/lib/parse-ast-webpack-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse-ast-webpack-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/convert-to-with-mf/lib/parse-ast-webpack-config.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AAEpD,SAAgB,uBAAuB,CACrC,IAAU,EACV,mBAA2B;IAE3B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE;QACrC,MAAM,IAAI,KAAK,CACb,sCAAsC,mBAAmB,mGAAmG,CAC7J,CAAC;KACH;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;IACvD,OAAO,iBAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AAC7B,CAAC;AAZD,0DAYC"}
+{"version":3,"file":"parse-ast-webpack-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/convert-to-with-mf/lib/parse-ast-webpack-config.ts"],"names":[],"mappings":";;;AACA,uFAAmF;AAEnF,SAAgB,uBAAuB,CACrC,IAAU,EACV,mBAA2B;IAE3B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE;QACrC,MAAM,IAAI,KAAK,CACb,sCAAsC,mBAAmB,mGAAmG,CAC7J,CAAC;KACH;IACD,IAAA,oCAAgB,GAAE,CAAC;IACnB,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;IAEzD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;IACvD,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AAC7B,CAAC;AAdD,0DAcC"}

package/src/generators/convert-to-with-mf/schema.json

@@ -6,6 +6,12 @@
   "type": "object",
   "description": "Converts an old micro frontend configuration to use the new withModuleFederation helper. It will run successfully if the following conditions are met: \n - Is either a host or remote application \n - Shared npm package configurations have not been modified \n - Name used to identify the Micro Frontend application matches the project name \n\n{% callout type=\"warning\" title=\"Overrides\" %}This generator will overwrite your webpack config. If you have additional custom configuration in your config file, it will be lost!{% /callout %}.",
   "additionalProperties": false,
+  "examples": [
+    {
+      "command": "nx g @nrwl/angular:convert-to-with-mf --project mf-app",
+      "description": "Convert a Module Federation Project using legacy webpack config to use the `withModuleFederation` helper."
+    }
+  ],
   "properties": {
     "project": {
       "type": "string",
@@ -14,7 +20,8 @@
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What micro frontend project would you like to migrate?"
+      "x-prompt": "What micro frontend project would you like to migrate?",
+      "x-priority": "important"
     }
   }
 }

package/src/generators/convert-tslint-to-eslint/schema.json

@@ -27,7 +27,8 @@
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "Which Angular project would you like to convert from TSLint to ESLint?"
+      "x-prompt": "Which Angular project would you like to convert from TSLint to ESLint?",
+      "x-priority": "important"
     },
     "ignoreExistingTslintConfig": {
       "type": "boolean",
@@ -44,7 +45,8 @@
     "skipFormat": {
       "type": "boolean",
       "description": "Skip formatting files.",
-      "default": false
+      "default": false,
+      "x-priority": "internal"
     }
   },
   "additionalProperties": false,

package/src/generators/cypress-component-configuration/files/cypress/support/commands.ts__tpl__

@@ -0,0 +1,42 @@
+/// <reference types="cypress" />
+import { mount } from 'cypress/angular'
+
+// ***********************************************
+// This example commands.ts shows you how to
+// create various custom commands and overwrite
+// existing commands.
+//
+// For more comprehensive examples of custom
+// commands please read more here:
+// https://on.cypress.io/custom-commands
+// ***********************************************
+
+declare global {
+// eslint-disable-next-line @typescript-eslint/no-namespace
+  namespace Cypress {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    interface Chainable<Subject> {
+      login(email: string, password: string): void;
+      mount: typeof mount;
+    }
+  }
+}
+
+Cypress.Commands.add('mount', mount)
+
+//
+// -- This is a parent command --
+Cypress.Commands.add('login', (email, password) => {
+  console.log('Custom command example: Login', email, password);
+});
+//
+// -- This is a child command --
+// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
+//
+//
+// -- This is a dual command --
+// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
+//
+//
+// -- This will overwrite an existing command --
+// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })

package/src/generators/cypress-component-configuration/schema.json

@@ -9,8 +9,13 @@
     "project": {
       "type": "string",
       "description": "The name of the project to add cypress component testing configuration to",
+      "$default": {
+        "$source": "projectName",
+        "index": 0
+      },
       "x-dropdown": "projects",
-      "x-prompt": "What project should we add Cypress component testing to?"
+      "x-prompt": "What project should we add Cypress component testing to?",
+      "x-priority": "important"
     },
     "generateTests": {
       "type": "boolean",
@@ -21,13 +26,16 @@
     "buildTarget": {
       "type": "string",
       "description": "A build target used to configure Cypress component testing in the format of `project:target[:configuration]`. The build target should be an angular app. If not provided we will try to infer it from your projects usage.",
-      "pattern": "^[^:\\s]+:[^:\\s]+(:\\S+)?$"
+      "pattern": "^[^:\\s]+:[^:\\s]+(:\\S+)?$",
+      "x-priority": "important"
     },
     "skipFormat": {
       "type": "boolean",
       "description": "Skip formatting files",
-      "default": false
+      "default": false,
+      "x-priority": "internal"
     }
   },
-  "required": ["project"]
+  "required": ["project"],
+  "examplesFile": "../../../docs/cypress-component-configuration-examples.md"
 }

package/src/generators/directive/directive.d.ts

@@ -0,0 +1,4 @@
+import type { Tree } from '@nrwl/devkit';
+import type { Schema } from './schema';
+export declare function directiveGenerator(tree: Tree, schema: Schema): Promise<void>;
+export default directiveGenerator;