@nrwl/angular 13.3.0-beta.8 → 13.3.0-rc.1

package/src/generators/scam/lib/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam/lib/index.ts"],"names":[],"mappings":""}

package/src/generators/scam/scam.compat.d.ts

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

package/src/generators/scam/scam.compat.js

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

package/src/generators/scam/scam.compat.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scam.compat.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/scam/scam.compat.ts"],"names":[],"mappings":";;AAAA,iCAAmC;AACnC,yCAAkD;AAElD,kBAAe,IAAA,2BAAkB,EAAC,cAAa,CAAC,CAAC"}

package/src/generators/scam/scam.d.ts

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

package/src/generators/scam/scam.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.scamGenerator = void 0;
+const tslib_1 = require("tslib");
+const ngcli_adapter_1 = require("@nrwl/devkit/ngcli-adapter");
+const devkit_1 = require("@nrwl/devkit");
+const create_module_1 = require("./lib/create-module");
+function scamGenerator(tree, schema) {
+    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        const { inlineScam } = schema, options = (0, tslib_1.__rest)(schema, ["inlineScam"]);
+        const angularComponentSchematic = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'component');
+        yield angularComponentSchematic(tree, Object.assign(Object.assign({}, options), { skipImport: true, export: false }));
+        (0, create_module_1.createScam)(tree, schema);
+        yield (0, devkit_1.formatFiles)(tree);
+    });
+}
+exports.scamGenerator = scamGenerator;
+exports.default = scamGenerator;
+//# sourceMappingURL=scam.js.map

package/src/generators/scam/scam.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scam.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/scam/scam.ts"],"names":[],"mappings":";;;;AAEA,8DAAwE;AACxE,yCAA2C;AAC3C,uDAAiD;AAEjD,SAAsB,aAAa,CAAC,IAAU,EAAE,MAAc;;QAC5D,MAAM,EAAE,UAAU,KAAiB,MAAM,EAAlB,OAAO,uBAAK,MAAM,EAAnC,cAA0B,CAAS,CAAC;QAC1C,MAAM,yBAAyB,GAAG,IAAA,0CAA0B,EAC1D,qBAAqB,EACrB,WAAW,CACZ,CAAC;QACF,MAAM,yBAAyB,CAAC,IAAI,kCAC/B,OAAO,KACV,UAAU,EAAE,IAAI,EAChB,MAAM,EAAE,KAAK,IACb,CAAC;QAEH,IAAA,0BAAU,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAEzB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAfD,sCAeC;AAED,kBAAe,aAAa,CAAC"}

package/src/generators/scam/schema.d.ts

@@ -0,0 +1,18 @@
+export interface Schema {
+  name: string;
+  path?: string;
+  project?: string;
+  displayBlock?: boolean;
+  inlineStyle?: boolean;
+  inlineTemplate?: boolean;
+  viewEncapsulation?: 'Emulated' | 'None' | 'ShadowDom';
+  changeDetection?: 'Default' | 'OnPush';
+  style?: 'css' | 'scss' | 'sass' | 'less' | 'none';
+  skipTests?: boolean;
+  inlineScam?: boolean;
+  type?: string;
+  flat?: boolean;
+  prefix?: string;
+  selector?: string;
+  skipSelector?: boolean;
+}

package/src/generators/scam/schema.json

@@ -0,0 +1,115 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "SCAMGenerator",
+  "cli": "nx",
+  "title": "SCAM Generator Options Schema",
+  "type": "object",
+  "description": "Creates a new, generic component definition in the given or default project.",
+  "additionalProperties": false,
+  "properties": {
+    "path": {
+      "type": "string",
+      "format": "path",
+      "description": "The path at which to create the component file, relative to the current workspace. Default is a folder with the same name as the component in the project root.",
+      "visible": false
+    },
+    "project": {
+      "type": "string",
+      "description": "The name of the project.",
+      "$default": {
+        "$source": "projectName"
+      }
+    },
+    "name": {
+      "type": "string",
+      "description": "The name of the component.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "What name would you like to use for the component?"
+    },
+    "displayBlock": {
+      "description": "Specifies if the style will contain `:host { display: block; }`.",
+      "type": "boolean",
+      "default": false,
+      "alias": "b"
+    },
+    "inlineStyle": {
+      "description": "Include styles inline in the component.ts file. Only CSS styles can be included inline. By default, an external styles file is created and referenced in the component.ts file.",
+      "type": "boolean",
+      "default": false,
+      "alias": "s"
+    },
+    "inlineTemplate": {
+      "description": "Include template inline in the component.ts file. By default, an external template file is created and referenced in the component.ts file.",
+      "type": "boolean",
+      "default": false,
+      "alias": "t"
+    },
+    "viewEncapsulation": {
+      "description": "The view encapsulation strategy to use in the new component.",
+      "enum": ["Emulated", "None", "ShadowDom"],
+      "type": "string",
+      "alias": "v"
+    },
+    "changeDetection": {
+      "description": "The change detection strategy to use in the new component.",
+      "enum": ["Default", "OnPush"],
+      "type": "string",
+      "default": "Default",
+      "alias": "c"
+    },
+    "style": {
+      "description": "The file extension or preprocessor to use for style files, or 'none' to skip generating the style file.",
+      "type": "string",
+      "default": "css",
+      "enum": ["css", "scss", "sass", "less", "none"]
+    },
+    "skipTests": {
+      "type": "boolean",
+      "description": "Do not create \"spec.ts\" test files for the new component.",
+      "default": false
+    },
+    "inlineScam": {
+      "type": "boolean",
+      "description": "Create the NgModule in the same file as the Component.",
+      "default": true
+    },
+    "flat": {
+      "type": "boolean",
+      "description": "Create the new files at the top level of the current project.",
+      "default": false
+    },
+    "selector": {
+      "type": "string",
+      "format": "html-selector",
+      "description": "The HTML selector to use for this component."
+    },
+    "skipSelector": {
+      "type": "boolean",
+      "default": false,
+      "description": "Specifies if the component should have a selector or not."
+    },
+    "type": {
+      "type": "string",
+      "description": "Adds a developer-defined type to the filename, in the format \"name.type.ts\".",
+      "default": "Component"
+    },
+    "prefix": {
+      "type": "string",
+      "description": "The prefix to apply to the generated component selector.",
+      "alias": "p",
+      "oneOf": [
+        {
+          "maxLength": 0
+        },
+        {
+          "minLength": 1,
+          "format": "html-selector"
+        }
+      ]
+    }
+  },
+  "required": ["name"]
+}

package/src/generators/setup-mfe/files/webpack/webpack.config.js__tmpl__

@@ -29,6 +29,9 @@ module.exports = {
     runtimeChunk: false,
     minimize: false,
   },
+  experiments: {
+    outputModule: true
+  },
   resolve: {
     alias: {
       ...sharedMappings.getAliases(),
@@ -42,12 +45,15 @@ module.exports = {
         './Module': '<%= sourceRoot %>/src/app/remote-entry/entry.module.ts',
       },<% } %><% if(type === 'host') { %>
       remotes: {
-      <% remotes.forEach(function(remote) { %>"<%= remote.remoteName %>": "<%= remote.remoteName %>@http://localhost:<%= remote.port %>/remoteEntry.js",<% }); %>
+      <% remotes.forEach(function(remote) { %>"<%= remote.remoteName %>": "http://localhost:<%= remote.port %>/remoteEntry.js",<% }); %>
       },<% } %>
       shared: {<% sharedLibraries.forEach(function (lib) { %>
         "<%= lib %>": { singleton: true, strictVersion: true },<% }); %>
         ...sharedMappings.getDescriptors(),
       },
+      library: { 
+        type: 'module' 
+      },
     }),
     sharedMappings.getPlugin(),
   ],

package/src/generators/setup-mfe/lib/add-remote-to-host.js

@@ -18,7 +18,7 @@ function addRemoteToHost(host, options) {
         const mfRemotesNode = (0, tsquery_1.tsquery)(webpackAst, 'Identifier[name=remotes] ~ ObjectLiteralExpression', { visitAllChildren: true })[0];
         const endOfPropertiesPos = mfRemotesNode.properties.end;
         const updatedConfig = `${hostWebpackConfig.slice(0, endOfPropertiesPos)}
-    \t\t"${options.appName}": '${options.appName}@http://localhost:${(_b = options.port) !== null && _b !== void 0 ? _b : 4200}/remoteEntry.js',${hostWebpackConfig.slice(endOfPropertiesPos)}`;
+    \t\t"${options.appName}": 'http://localhost:${(_b = options.port) !== null && _b !== void 0 ? _b : 4200}/remoteEntry.js',${hostWebpackConfig.slice(endOfPropertiesPos)}`;
         host.write(hostWebpackPath, updatedConfig);
         const declarationFilePath = (0, devkit_1.joinPathFragments)(hostProject.sourceRoot, 'decl.d.ts');
         const declarationFileContent = (host.exists(declarationFilePath)

package/src/generators/setup-mfe/lib/add-remote-to-host.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-remote-to-host.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/add-remote-to-host.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"add-remote-to-host.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/add-remote-to-host.ts"],"names":[],"mappings":";;;AAGA,yCAA2E;AAC3E,uDAAoD;AAEpD,kEAA8D;AAE9D,iCAAiC;AAEjC,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAe;;IACzD,IAAI,OAAO,CAAC,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE;QAChD,MAAM,WAAW,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACjE,MAAM,eAAe,GACnB,MAAA,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,mBAAmB,0CAAE,IAAI,CAAC;QAEjE,IAAI,CAAC,eAAe,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;YACrD,MAAM,IAAI,KAAK,CACb,kCAAkC,OAAO,CAAC,IAAI,gGAAgG,CAC/I,CAAC;SACH;QAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;QAC9D,MAAM,UAAU,GAAG,iBAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAClD,MAAM,aAAa,GAAG,IAAA,iBAAO,EAC3B,UAAU,EACV,oDAAoD,EACpD,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAC3B,CAAC,CAAC,CAA4B,CAAC;QAEhC,MAAM,kBAAkB,GAAG,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC;QAExD,MAAM,aAAa,GAAG,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC,EAAE,kBAAkB,CAAC;WAChE,OAAO,CAAC,OAAO,wBACpB,MAAA,OAAO,CAAC,IAAI,mCAAI,IAClB,oBAAoB,iBAAiB,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE,CAAC;QAElE,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;QAE3C,MAAM,mBAAmB,GAAG,IAAA,0BAAiB,EAC3C,WAAW,CAAC,UAAU,EACtB,WAAW,CACZ,CAAC;QAEF,MAAM,sBAAsB,GAC1B,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC;YAC/B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC;YACzC,CAAC,CAAC,EAAE,CAAC,GAAG,qBAAqB,OAAO,CAAC,OAAO,WAAW,CAAC;QAC5D,IAAI,CAAC,KAAK,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,CAAC;QAExD,iCAAiC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KAClD;AACH,CAAC;AA1CD,0CA0CC;AAED,wEAAwE;AACxE,SAAS,iCAAiC,CAAC,IAAU,EAAE,OAAe;IACpE,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACnE,MAAM,mBAAmB,GAAG,GAAG,aAAa,CAAC,UAAU,oBAAoB,CAAC;IAC5E,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE;QACrC,OAAO;KACR;IAED,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;IAC9D,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,uBAAuB,CAAC,EAAE;QACpD,OAAO;KACR;IAED,IAAI,UAAU,GAAG,EAAE,CAAC,gBAAgB,CAClC,mBAAmB,EACnB,aAAa,EACb,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IAEF,UAAU,GAAG,IAAA,oBAAQ,EACnB,IAAI,EACJ,mBAAmB,EACnB,UAAU,EACV;kBACc,OAAO,CAAC,OAAO;uCACM,OAAO,CAAC,OAAO;OAC/C,CACJ,CAAC;AACJ,CAAC"}

package/src/generators/setup-mfe/lib/setup-serve-target.js

@@ -3,9 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupServeTarget = void 0;
 const devkit_1 = require("@nrwl/devkit");
 function setupServeTarget(host, options) {
-    var _a;
+    var _a, _b;
     const appConfig = (0, devkit_1.readProjectConfiguration)(host, options.appName);
-    appConfig.targets['serve'] = Object.assign(Object.assign({}, appConfig.targets['serve']), { executor: '@nrwl/angular:webpack-server', options: Object.assign(Object.assign({}, appConfig.targets['serve'].options), { port: (_a = options.port) !== null && _a !== void 0 ? _a : undefined }) });
+    appConfig.targets['serve'] = Object.assign(Object.assign({}, appConfig.targets['serve']), { executor: '@nrwl/angular:webpack-server', options: Object.assign(Object.assign({}, appConfig.targets['serve'].options), { port: (_a = options.port) !== null && _a !== void 0 ? _a : undefined, publicHost: options.host
+                ? undefined
+                : `http://localhost:${(_b = options.port) !== null && _b !== void 0 ? _b : 4200}` }) });
     if (options.mfeType === 'host') {
         const remoteServeCommands = options.remotes
             ? options.remotes.map((r) => `nx serve ${r}`)

package/src/generators/setup-mfe/lib/setup-serve-target.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup-serve-target.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/setup-serve-target.ts"],"names":[],"mappings":";;;AAGA,yCAGsB;AAEtB,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAe;;IAC1D,MAAM,SAAS,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAElE,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,mCACrB,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,KAC7B,QAAQ,EAAE,8BAA8B,EACxC,OAAO,kCACF,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,KACrC,IAAI,EAAE,MAAA,OAAO,CAAC,IAAI,mCAAI,SAAS,MAElC,CAAC;IAEF,IAAI,OAAO,CAAC,OAAO,KAAK,MAAM,EAAE;QAC9B,MAAM,mBAAmB,GAAG,OAAO,CAAC,OAAO;YACzC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC;YAC7C,CAAC,CAAC,SAAS,CAAC;QACd,MAAM,QAAQ,GAAG,mBAAmB;YAClC,CAAC,CAAC,CAAC,GAAG,mBAAmB,EAAE,YAAY,OAAO,CAAC,OAAO,EAAE,CAAC;YACzD,CAAC,CAAC,CAAC,YAAY,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QAEpC,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG;YAC/B,QAAQ,EAAE,8BAA8B;YACxC,OAAO,EAAE;gBACP,QAAQ;aACT;SACF,CAAC;KACH;IACD,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAE7D,IAAI,OAAO,CAAC,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE;QAChD,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAEnE,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,mCAC7B,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,KACrC,OAAO,kCACF,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,KAC7C,QAAQ,EAAE;oBACR,YAAY,OAAO,CAAC,OAAO,EAAE;oBAC7B,GAAG,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,QAAQ;iBACvD,MAEJ,CAAC;QAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;KAC/D;AACH,CAAC;AA7CD,4CA6CC"}
+{"version":3,"file":"setup-serve-target.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/setup-serve-target.ts"],"names":[],"mappings":";;;AAGA,yCAGsB;AAEtB,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAe;;IAC1D,MAAM,SAAS,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAElE,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,mCACrB,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,KAC7B,QAAQ,EAAE,8BAA8B,EACxC,OAAO,kCACF,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,KACrC,IAAI,EAAE,MAAA,OAAO,CAAC,IAAI,mCAAI,SAAS,EAC/B,UAAU,EAAE,OAAO,CAAC,IAAI;gBACtB,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,oBAAoB,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAI,EAAE,MAEjD,CAAC;IAEF,IAAI,OAAO,CAAC,OAAO,KAAK,MAAM,EAAE;QAC9B,MAAM,mBAAmB,GAAG,OAAO,CAAC,OAAO;YACzC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC;YAC7C,CAAC,CAAC,SAAS,CAAC;QACd,MAAM,QAAQ,GAAG,mBAAmB;YAClC,CAAC,CAAC,CAAC,GAAG,mBAAmB,EAAE,YAAY,OAAO,CAAC,OAAO,EAAE,CAAC;YACzD,CAAC,CAAC,CAAC,YAAY,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QAEpC,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG;YAC/B,QAAQ,EAAE,8BAA8B;YACxC,OAAO,EAAE;gBACP,QAAQ;aACT;SACF,CAAC;KACH;IACD,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAE7D,IAAI,OAAO,CAAC,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE;QAChD,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAEnE,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,mCAC7B,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,KACrC,OAAO,kCACF,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,KAC7C,QAAQ,EAAE;oBACR,YAAY,OAAO,CAAC,OAAO,EAAE;oBAC7B,GAAG,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,QAAQ;iBACvD,MAEJ,CAAC;QAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;KAC/D;AACH,CAAC;AAhDD,4CAgDC"}

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

@@ -2,8 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.storybookConfigurationGenerator = void 0;
 const tslib_1 = require("tslib");
-const devkit_1 = require("@nrwl/devkit");
-const versions_1 = require("../../utils/versions");
 const assert_compatible_storybook_version_1 = require("./lib/assert-compatible-storybook-version");
 const generate_stories_1 = require("./lib/generate-stories");
 const generate_storybook_configuration_1 = require("./lib/generate-storybook-configuration");
@@ -12,19 +10,11 @@ function storybookConfigurationGenerator(tree, options) {
     return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
         (0, assert_compatible_storybook_version_1.assertCompatibleStorybookVersion)();
         (0, validate_options_1.validateOptions)(options);
-        // TODO(coly010/juristr): remove when @nrwl/storybook has been updated
-        const angularStorybookInstallTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-            '@storybook/angular': versions_1.storybookVersion,
-            '@storybook/manager-webpack5': versions_1.storybookVersion,
-            '@storybook/builder-webpack5': versions_1.storybookVersion,
-            '@storybook/addon-essentials': versions_1.storybookVersion,
-        });
         const storybookGeneratorInstallTask = yield (0, generate_storybook_configuration_1.generateStorybookConfiguration)(tree, options);
         if (options.generateStories) {
             (0, generate_stories_1.generateStories)(tree, options);
         }
         return () => {
-            angularStorybookInstallTask();
             storybookGeneratorInstallTask();
         };
     });

package/src/generators/storybook-configuration/storybook-configuration.js.map

@@ -1 +1 @@
-{"version":3,"file":"storybook-configuration.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/storybook-configuration/storybook-configuration.ts"],"names":[],"mappings":";;;;AACA,yCAA4D;AAC5D,mDAAwD;AACxD,mGAA6F;AAC7F,6DAAyD;AACzD,6FAAwF;AACxF,6DAAyD;AAGzD,SAAsB,+BAA+B,CACnD,IAAU,EACV,OAAsC;;QAEtC,IAAA,sEAAgC,GAAE,CAAC;QACnC,IAAA,kCAAe,EAAC,OAAO,CAAC,CAAC;QAEzB,sEAAsE;QACtE,MAAM,2BAA2B,GAAG,IAAA,qCAA4B,EAC9D,IAAI,EACJ,EAAE,EACF;YACE,oBAAoB,EAAE,2BAAgB;YACtC,6BAA6B,EAAE,2BAAgB;YAC/C,6BAA6B,EAAE,2BAAgB;YAC/C,6BAA6B,EAAE,2BAAgB;SAChD,CACF,CAAC;QACF,MAAM,6BAA6B,GAAG,MAAM,IAAA,iEAA8B,EACxE,IAAI,EACJ,OAAO,CACR,CAAC;QAEF,IAAI,OAAO,CAAC,eAAe,EAAE;YAC3B,IAAA,kCAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAChC;QAED,OAAO,GAAG,EAAE;YACV,2BAA2B,EAAE,CAAC;YAC9B,6BAA6B,EAAE,CAAC;QAClC,CAAC,CAAC;IACJ,CAAC;CAAA;AA/BD,0EA+BC;AAED,kBAAe,+BAA+B,CAAC"}
+{"version":3,"file":"storybook-configuration.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/storybook-configuration/storybook-configuration.ts"],"names":[],"mappings":";;;;AACA,mGAA6F;AAC7F,6DAAyD;AACzD,6FAAwF;AACxF,6DAAyD;AAGzD,SAAsB,+BAA+B,CACnD,IAAU,EACV,OAAsC;;QAEtC,IAAA,sEAAgC,GAAE,CAAC;QACnC,IAAA,kCAAe,EAAC,OAAO,CAAC,CAAC;QAEzB,MAAM,6BAA6B,GAAG,MAAM,IAAA,iEAA8B,EACxE,IAAI,EACJ,OAAO,CACR,CAAC;QAEF,IAAI,OAAO,CAAC,eAAe,EAAE;YAC3B,IAAA,kCAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAChC;QAED,OAAO,GAAG,EAAE;YACV,6BAA6B,EAAE,CAAC;QAClC,CAAC,CAAC;IACJ,CAAC;CAAA;AAnBD,0EAmBC;AAED,kBAAe,+BAA+B,CAAC"}

package/src/migrations/update-13-2-0/update-testing-imports.js

@@ -4,6 +4,9 @@ const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const typescript_1 = require("typescript");
 const path_1 = require("path");
+const workspace_1 = require("@nrwl/workspace");
+const semver_1 = require("semver");
+const versions_1 = require("../../utils/versions");
 function default_1(tree) {
     return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
         const identifiers = ['hot', 'cold', 'getTestScheduler', 'time'];
@@ -16,8 +19,18 @@ function default_1(tree) {
             shouldAddJasmineMarbles = shouldAddJasmineMarbles || updated;
         });
         if (shouldAddJasmineMarbles) {
+            let rxjsVersion;
+            try {
+                rxjsVersion = (0, workspace_1.checkAndCleanWithSemver)('rxjs', (0, devkit_1.readJson)(tree, 'package.json').dependencies['rxjs']);
+            }
+            catch (_a) {
+                rxjsVersion = (0, workspace_1.checkAndCleanWithSemver)('rxjs', versions_1.rxjsVersion);
+            }
+            const jasmineMarblesVersion = (0, semver_1.gte)(rxjsVersion, '7.0.0')
+                ? '~0.9.1'
+                : '~0.8.3';
             (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-                'jasmine-marbles': '~0.8.3',
+                'jasmine-marbles': jasmineMarblesVersion,
             });
         }
         yield (0, devkit_1.formatFiles)(tree);

package/src/migrations/update-13-2-0/update-testing-imports.js.map

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

package/src/migrations/update-13-3-0/update-mfe-webpack-config.d.ts

@@ -0,0 +1,6 @@
+import type { Tree } from '@nrwl/devkit';
+export default function (tree: Tree): Promise<void>;
+export declare function addExperimentsObject(webpackConfig: string): string;
+export declare function addLibraryModuleType(webpackConfig: string): string;
+export declare function removeRemoteName(webpackConfig: string): string;
+export declare function addPublicHost(tree: Tree, projects: string[]): void;

package/src/migrations/update-13-3-0/update-mfe-webpack-config.js

@@ -0,0 +1,120 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addPublicHost = exports.removeRemoteName = exports.addLibraryModuleType = exports.addExperimentsObject = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const executor_options_utils_1 = require("@nrwl/workspace/src/utilities/executor-options-utils");
+function default_1(tree) {
+    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        const NRWL_WEBPACK_BROWSER_BUILDER = '@nrwl/angular:webpack-browser';
+        const CUSTOM_WEBPACK_OPTION = 'customWebpackConfig';
+        const projects = [];
+        (0, executor_options_utils_1.forEachExecutorOptions)(tree, NRWL_WEBPACK_BROWSER_BUILDER, (opts, projectName) => {
+            var _a;
+            // Update the webpack config
+            const webpackPath = (_a = opts[CUSTOM_WEBPACK_OPTION]) === null || _a === void 0 ? void 0 : _a.path;
+            if (!tree.exists(webpackPath)) {
+                devkit_1.logger.warn(`Webpack config file for project: ${projectName} does not exist. Skipping project.`);
+                return;
+            }
+            const webpackConfig = tree.read(webpackPath, 'utf-8');
+            const ast = tsquery_1.tsquery.ast(webpackConfig);
+            const moduleFederationWebpackConfig = (0, tsquery_1.tsquery)(ast, 'Identifier[name=ModuleFederationPlugin]', {
+                visitAllChildren: true,
+            });
+            if (!moduleFederationWebpackConfig ||
+                moduleFederationWebpackConfig.length === 0) {
+                return;
+            }
+            projects.push(projectName);
+            let updatedWebpackFile = addExperimentsObject(webpackConfig);
+            updatedWebpackFile = addLibraryModuleType(updatedWebpackFile);
+            updatedWebpackFile = removeRemoteName(updatedWebpackFile);
+            tree.write(webpackPath, updatedWebpackFile);
+        });
+        addPublicHost(tree, projects);
+        yield (0, devkit_1.formatFiles)(tree);
+    });
+}
+exports.default = default_1;
+function addExperimentsObject(webpackConfig) {
+    const WEBPACK_EXPERIMENTS_QUERY = 'PropertyAssignment > Identifier[name=experiments] ~ ObjectLiteralExpression';
+    const ast = tsquery_1.tsquery.ast(webpackConfig);
+    const webpackExperimentsNode = (0, tsquery_1.tsquery)(ast, WEBPACK_EXPERIMENTS_QUERY, {
+        visitAllChildren: true,
+    });
+    if (webpackExperimentsNode && webpackExperimentsNode.length > 0) {
+        if (webpackExperimentsNode[0].getText().includes('outputModule')) {
+            return webpackConfig;
+        }
+        return `${webpackConfig.slice(0, webpackExperimentsNode[0].getStart() + 1)}\noutputModule: true,${webpackConfig.slice(webpackExperimentsNode[0].getStart() + 1)}`;
+    }
+    const WEBPACK_EXPORT = 'module.exports = {';
+    const openingBracePos = webpackConfig.indexOf(WEBPACK_EXPORT) + WEBPACK_EXPORT.length;
+    return `${webpackConfig.slice(0, openingBracePos)}
+  experiments: {
+    outputModule: true  
+  },${webpackConfig.slice(openingBracePos)}`;
+}
+exports.addExperimentsObject = addExperimentsObject;
+function addLibraryModuleType(webpackConfig) {
+    const LIBRARY_NODE_QUERY = 'PropertyAssignment > Identifier[name=library] ~ ObjectLiteralExpression';
+    const ast = tsquery_1.tsquery.ast(webpackConfig);
+    const libraryModuleNode = (0, tsquery_1.tsquery)(ast, LIBRARY_NODE_QUERY);
+    if (libraryModuleNode && libraryModuleNode.length > 0) {
+        return webpackConfig;
+    }
+    const MODULE_FEDERATION_PLUGIN_INSTANTIATION = 'new ModuleFederationPlugin({';
+    const openingBracePos = webpackConfig.indexOf(MODULE_FEDERATION_PLUGIN_INSTANTIATION) +
+        +MODULE_FEDERATION_PLUGIN_INSTANTIATION.length;
+    return `${webpackConfig.slice(0, openingBracePos)}
+  library: {
+      type: 'module'
+  },${webpackConfig.slice(openingBracePos)}`;
+}
+exports.addLibraryModuleType = addLibraryModuleType;
+function removeRemoteName(webpackConfig) {
+    const REMOTES_QUERY = 'Identifier[name=remotes] ~ ObjectLiteralExpression';
+    const ast = tsquery_1.tsquery.ast(webpackConfig);
+    const remotesObjectNode = (0, tsquery_1.tsquery)(ast, REMOTES_QUERY, {
+        visitAllChildren: true,
+    })[0];
+    if (!remotesObjectNode) {
+        return webpackConfig;
+    }
+    const remoteProps = (0, tsquery_1.tsquery)(remotesObjectNode, 'PropertyAssignment', {
+        visitAllChildren: true,
+    });
+    const updatedRemoteProps = [];
+    for (const prop of remoteProps) {
+        const stringValue = (0, tsquery_1.tsquery)(prop, 'StringLiteral', {
+            visitAllChildren: true,
+        })[0];
+        if (!stringValue.getText().match(/\w*@*http/)) {
+            continue;
+        }
+        const identifier = (0, tsquery_1.tsquery)(prop, 'Identifier', {
+            visitAllChildren: true,
+        })[0];
+        const updatedRemoteStringValue = stringValue
+            .getText()
+            .slice(stringValue.getText().indexOf('@') + 1, -1);
+        updatedRemoteProps.push(`${identifier.getText()}: '${updatedRemoteStringValue}'`);
+    }
+    const updatedRemotesObject = `{
+    ${updatedRemoteProps.join(',\n')}
+  }`;
+    return `${webpackConfig.slice(0, remotesObjectNode.getStart())}${updatedRemotesObject}${webpackConfig.slice(remotesObjectNode.getEnd())}`;
+}
+exports.removeRemoteName = removeRemoteName;
+function addPublicHost(tree, projects) {
+    var _a, _b;
+    for (const projectName of projects) {
+        const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+        const updatedProject = Object.assign(Object.assign({}, project), { targets: Object.assign(Object.assign({}, project.targets), { serve: Object.assign(Object.assign({}, project.targets.serve), { options: Object.assign(Object.assign({}, project.targets.serve.options), { publicHost: `http://localhost:${(_b = (_a = project.targets.serve.options) === null || _a === void 0 ? void 0 : _a.port) !== null && _b !== void 0 ? _b : 4200}` }) }) }) });
+        (0, devkit_1.updateProjectConfiguration)(tree, projectName, updatedProject);
+    }
+}
+exports.addPublicHost = addPublicHost;
+//# sourceMappingURL=update-mfe-webpack-config.js.map

package/src/migrations/update-13-3-0/update-mfe-webpack-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-mfe-webpack-config.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-13-3-0/update-mfe-webpack-config.ts"],"names":[],"mappings":"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"}

package/src/runtime/nx/data-persistence.d.ts

@@ -3,6 +3,7 @@ import { ActivatedRouteSnapshot } from '@angular/router';
 import { Actions } from '@ngrx/effects';
 import { Action, Store, ActionCreator } from '@ngrx/store';
 import { Observable } from 'rxjs';
+import * as i0 from "@angular/core";
 /**
  * See {@link DataPersistence.pessimisticUpdate} for more information.
  */
@@ -241,4 +242,6 @@ export declare class DataPersistence<T> {
      * ```
      */
     navigation(component: Type<any>, opts: HandleNavigationOpts<T>): Observable<any>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<DataPersistence<any>, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<DataPersistence<any>>;
 }

package/src/runtime/nx/nx.module.d.ts

@@ -1,4 +1,5 @@
 import { ModuleWithProviders } from '@angular/core';
+import * as i0 from "@angular/core";
 /**
  * @whatItDoes Provides services for enterprise Angular applications.
  *
@@ -6,4 +7,7 @@ import { ModuleWithProviders } from '@angular/core';
  */
 export declare class NxModule {
     static forRoot(): ModuleWithProviders<NxModule>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<NxModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<NxModule, never, never, never>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<NxModule>;
 }

package/src/utils/versions.d.ts

@@ -6,5 +6,4 @@ export declare const ngrxVersion = "~13.0.0";
 export declare const rxjsVersion = "~7.4.0";
 export declare const jestPresetAngularVersion = "11.0.0";
 export declare const angularEslintVersion = "~13.0.1";
-export declare const storybookVersion = "~6.4.0-rc.3";
 export declare const angularArchitectsModuleFederationPluginVersion = "^13.0.1";

package/src/utils/versions.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.angularArchitectsModuleFederationPluginVersion = exports.storybookVersion = exports.angularEslintVersion = exports.jestPresetAngularVersion = exports.rxjsVersion = exports.ngrxVersion = exports.angularJsVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
-exports.nxVersion = '13.3.0-beta.8';
+exports.angularArchitectsModuleFederationPluginVersion = exports.angularEslintVersion = exports.jestPresetAngularVersion = exports.rxjsVersion = exports.ngrxVersion = exports.angularJsVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
+exports.nxVersion = '13.3.0-rc.1';
 exports.angularVersion = '^13.0.0';
 exports.angularDevkitVersion = '~13.0.0';
 exports.angularJsVersion = '1.7.9';
@@ -9,6 +9,5 @@ exports.ngrxVersion = '~13.0.0';
 exports.rxjsVersion = '~7.4.0';
 exports.jestPresetAngularVersion = '11.0.0';
 exports.angularEslintVersion = '~13.0.1';
-exports.storybookVersion = '~6.4.0-rc.3';
 exports.angularArchitectsModuleFederationPluginVersion = '^13.0.1';
 //# sourceMappingURL=versions.js.map

package/src/utils/versions.js.map

@@ -1 +1 @@
-{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,GAAG,CAAC;AAChB,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAC3B,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,wBAAwB,GAAG,QAAQ,CAAC;AACpC,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,gBAAgB,GAAG,aAAa,CAAC;AACjC,QAAA,8CAA8C,GAAG,SAAS,CAAC"}
+{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,GAAG,CAAC;AAChB,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAC3B,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,wBAAwB,GAAG,QAAQ,CAAC;AACpC,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,8CAA8C,GAAG,SAAS,CAAC"}