@nrwl/angular 14.6.0-beta.5 → 14.6.0-beta.8

package/src/utils/nx-devkit/standalone-utils.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addStandaloneRoute = void 0;
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const ts = require("typescript");
+const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
+function addStandaloneRoute(tree, parentPath, route, lazy = true, routesConst, importPath) {
+    if (!tree.exists(parentPath)) {
+        throw new Error(`Path to parent routing declaration (${parentPath}) does not exist. Please ensure path is correct.`);
+    }
+    let parentContents = tree.read(parentPath, 'utf-8');
+    if (!lazy) {
+        let parentSourceFile = ts.createSourceFile(parentPath, parentContents, ts.ScriptTarget.Latest, true);
+        parentSourceFile = (0, ast_utils_1.insertImport)(tree, parentSourceFile, parentPath, routesConst, importPath);
+        parentContents = tree.read(parentPath, 'utf-8');
+    }
+    const ast = tsquery_1.tsquery.ast(parentContents);
+    const IMPORT_PROVIDERS_FROM_ROUTER_MODULE_SELECTOR = 'CallExpression:has(Identifier[name=importProvidersFrom]) CallExpression:has(PropertyAccessExpression:has(Identifier[name=RouterModule])) > ArrayLiteralExpression';
+    const ROUTES_ARRAY_SELECTOR = 'VariableDeclaration:has(ArrayType > TypeReference > Identifier[name=Route]) > ArrayLiteralExpression';
+    const routerModuleNodes = (0, tsquery_1.tsquery)(ast, IMPORT_PROVIDERS_FROM_ROUTER_MODULE_SELECTOR, { visitAllChildren: true });
+    const isImportProvidersFromRouterSetup = routerModuleNodes.length > 0;
+    const routesArrayNodes = (0, tsquery_1.tsquery)(ast, ROUTES_ARRAY_SELECTOR, {
+        visitAllChildren: true,
+    });
+    const isRoutesArray = routesArrayNodes.length > 0;
+    if (!isImportProvidersFromRouterSetup && !isRoutesArray) {
+        throw new Error('Parent routing declaration does not contain a routing configuration. Please ensure the parent contains a routing configuration.');
+    }
+    const nodes = isImportProvidersFromRouterSetup
+        ? routerModuleNodes
+        : routesArrayNodes;
+    const newParentContents = `${parentContents.slice(0, nodes[0].getStart() + 1)}
+    ${route},${parentContents.slice(nodes[0].getStart() + 1, -1)}`;
+    tree.write(parentPath, newParentContents);
+}
+exports.addStandaloneRoute = addStandaloneRoute;
+//# sourceMappingURL=standalone-utils.js.map

package/src/utils/nx-devkit/standalone-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"standalone-utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/nx-devkit/standalone-utils.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AACpD,iCAAiC;AACjC,uEAAuE;AAEvE,SAAgB,kBAAkB,CAChC,IAAU,EACV,UAAkB,EAClB,KAAa,EACb,OAAgB,IAAI,EACpB,WAAoB,EACpB,UAAmB;IAEnB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;QAC5B,MAAM,IAAI,KAAK,CACb,uCAAuC,UAAU,kDAAkD,CACpG,CAAC;KACH;IAED,IAAI,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAEpD,IAAI,CAAC,IAAI,EAAE;QACT,IAAI,gBAAgB,GAAG,EAAE,CAAC,gBAAgB,CACxC,UAAU,EACV,cAAc,EACd,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;QAEF,gBAAgB,GAAG,IAAA,wBAAY,EAC7B,IAAI,EACJ,gBAAgB,EAChB,UAAU,EACV,WAAW,EACX,UAAU,CACX,CAAC;QAEF,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;KACjD;IAED,MAAM,GAAG,GAAG,iBAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAExC,MAAM,4CAA4C,GAChD,mKAAmK,CAAC;IAEtK,MAAM,qBAAqB,GACzB,sGAAsG,CAAC;IAEzG,MAAM,iBAAiB,GAAG,IAAA,iBAAO,EAC/B,GAAG,EACH,4CAA4C,EAC5C,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAC3B,CAAC;IACF,MAAM,gCAAgC,GAAG,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC;IAEtE,MAAM,gBAAgB,GAAG,IAAA,iBAAO,EAAC,GAAG,EAAE,qBAAqB,EAAE;QAC3D,gBAAgB,EAAE,IAAI;KACvB,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC;IAElD,IAAI,CAAC,gCAAgC,IAAI,CAAC,aAAa,EAAE;QACvD,MAAM,IAAI,KAAK,CACb,iIAAiI,CAClI,CAAC;KACH;IAED,MAAM,KAAK,GAAG,gCAAgC;QAC5C,CAAC,CAAC,iBAAiB;QACnB,CAAC,CAAC,gBAAgB,CAAC;IAErB,MAAM,iBAAiB,GAAG,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;MACzE,KAAK,IAAI,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAEjE,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;AAC5C,CAAC;AArED,gDAqEC"}

package/src/utils/test-runners.d.ts

@@ -1,9 +1,9 @@
-export declare const enum UnitTestRunner {
+export declare enum UnitTestRunner {
     Karma = "karma",
     Jest = "jest",
     None = "none"
 }
-export declare const enum E2eTestRunner {
+export declare enum E2eTestRunner {
     /**
      * @deprecated Protractor is no longer maintained. Support for generating
      * E2E tests with it will be removed in v15.

package/src/utils/test-runners.js

@@ -1,3 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.E2eTestRunner = exports.UnitTestRunner = void 0;
+var UnitTestRunner;
+(function (UnitTestRunner) {
+    UnitTestRunner["Karma"] = "karma";
+    UnitTestRunner["Jest"] = "jest";
+    UnitTestRunner["None"] = "none";
+})(UnitTestRunner = exports.UnitTestRunner || (exports.UnitTestRunner = {}));
+var E2eTestRunner;
+(function (E2eTestRunner) {
+    /**
+     * @deprecated Protractor is no longer maintained. Support for generating
+     * E2E tests with it will be removed in v15.
+     */
+    E2eTestRunner["Protractor"] = "protractor";
+    E2eTestRunner["Cypress"] = "cypress";
+    E2eTestRunner["None"] = "none";
+})(E2eTestRunner = exports.E2eTestRunner || (exports.E2eTestRunner = {}));
 //# sourceMappingURL=test-runners.js.map

package/src/utils/test-runners.js.map

@@ -1 +1 @@
-{"version":3,"file":"test-runners.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/test-runners.ts"],"names":[],"mappings":""}
+{"version":3,"file":"test-runners.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/test-runners.ts"],"names":[],"mappings":";;;AAAA,IAAY,cAIX;AAJD,WAAY,cAAc;IACxB,iCAAe,CAAA;IACf,+BAAa,CAAA;IACb,+BAAa,CAAA;AACf,CAAC,EAJW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAIzB;AACD,IAAY,aAQX;AARD,WAAY,aAAa;IACvB;;;OAGG;IACH,0CAAyB,CAAA;IACzB,oCAAmB,CAAA;IACnB,8BAAa,CAAA;AACf,CAAC,EARW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAQxB"}

package/src/utils/versions.d.ts

@@ -15,7 +15,7 @@ export declare const postcssPresetEnvVersion = "~7.5.0";
 export declare const postcssUrlVersion = "~10.1.3";
 export declare const autoprefixerVersion = "^10.4.0";
 export declare const tsNodeVersion = "10.9.1";
-export declare const jestPresetAngularVersion = "~11.1.2";
+export declare const jestPresetAngularVersion = "~12.2.0";
 export declare const protractorVersion = "~7.0.0";
 export declare const karmaVersion = "~6.4.0";
 export declare const karmaChromeLauncherVersion = "~3.1.0";

package/src/utils/versions.js

@@ -18,7 +18,7 @@ exports.postcssPresetEnvVersion = '~7.5.0';
 exports.postcssUrlVersion = '~10.1.3';
 exports.autoprefixerVersion = '^10.4.0';
 exports.tsNodeVersion = '10.9.1';
-exports.jestPresetAngularVersion = '~11.1.2';
+exports.jestPresetAngularVersion = '~12.2.0';
 exports.protractorVersion = '~7.0.0';
 exports.karmaVersion = '~6.4.0';
 exports.karmaChromeLauncherVersion = '~3.1.0';

package/src/generators/setup-mf/lib/add-entry-module.d.ts

@@ -1,3 +0,0 @@
-import type { Tree } from '@nrwl/devkit';
-import type { Schema } from '../schema';
-export declare function addEntryModule(host: Tree, { appName, routing, mfType, prefix }: Schema, appRoot: string): void;

package/src/generators/setup-mf/lib/add-entry-module.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addEntryModule = void 0;
-const devkit_1 = require("@nrwl/devkit");
-function addEntryModule(host, { appName, routing, mfType, prefix }, appRoot) {
-    if (mfType === 'remote') {
-        (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, '../files/entry-module-files'), `${appRoot}/src/app/remote-entry`, {
-            tmpl: '',
-            appName,
-            routing,
-            prefix,
-        });
-        host.write(`${appRoot}/src/app/app.module.ts`, `/* 
-      * This RemoteEntryModule is imported here to allow TS to find the Module during 
-      * compilation, allowing it to be included in the built bundle. This is required 
-      * for the Module Federation Plugin to expose the Module correctly.
-      * */
-      import { RemoteEntryModule } from './remote-entry/entry.module';
-${host.read(`${appRoot}/src/app/app.module.ts`, 'utf-8')}`);
-    }
-}
-exports.addEntryModule = addEntryModule;
-//# sourceMappingURL=add-entry-module.js.map

package/src/generators/setup-mf/lib/add-entry-module.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"add-entry-module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/add-entry-module.ts"],"names":[],"mappings":";;;AACA,yCAAgE;AAGhE,SAAgB,cAAc,CAC5B,IAAU,EACV,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAU,EAC5C,OAAe;IAEf,IAAI,MAAM,KAAK,QAAQ,EAAE;QACvB,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,6BAA6B,CAAC,EAC3D,GAAG,OAAO,uBAAuB,EACjC;YACE,IAAI,EAAE,EAAE;YACR,OAAO;YACP,OAAO;YACP,MAAM;SACP,CACF,CAAC;QAEF,IAAI,CAAC,KAAK,CACR,GAAG,OAAO,wBAAwB,EAClC;;;;;;EAMJ,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,wBAAwB,EAAE,OAAO,CAAC,EAAE,CACrD,CAAC;KACH;AACH,CAAC;AA7BD,wCA6BC"}