@schematics/angular 8.3.2 → 8.3.6

package/module/index.js

@@ -75,16 +75,11 @@ function addRouteDeclarationToNgModule(options, routingModulePath) {
         return host;
     };
 }
-function getRoutingModulePath(host, options) {
-    let path;
-    const modulePath = options.module;
-    const routingModuleName = modulePath.split('.')[0] + '-routing';
-    const { module, ...rest } = options;
-    try {
-        path = find_module_1.findModuleFromOptions(host, { module: routingModuleName, ...rest });
-    }
-    catch (_a) { }
-    return path;
+function getRoutingModulePath(host, modulePath) {
+    const routingModulePath = modulePath.endsWith(find_module_1.ROUTING_MODULE_EXT)
+        ? modulePath
+        : modulePath.replace(find_module_1.MODULE_EXT, find_module_1.ROUTING_MODULE_EXT);
+    return host.exists(routingModulePath) ? core_1.normalize(routingModulePath) : undefined;
 }
 function buildRoute(options, modulePath) {
     const relativeModulePath = buildRelativeModulePath(options, modulePath);
@@ -100,15 +95,15 @@ function default_1(options) {
         if (options.module) {
             options.module = find_module_1.findModuleFromOptions(host, options);
         }
-        const parsedPath = parse_name_1.parseName(options.path, options.name);
-        options.name = parsedPath.name;
-        options.path = parsedPath.path;
         let routingModulePath;
         const isLazyLoadedModuleGen = options.route && options.module;
         if (isLazyLoadedModuleGen) {
             options.routingScope = schema_1.RoutingScope.Child;
-            routingModulePath = getRoutingModulePath(host, options);
+            routingModulePath = getRoutingModulePath(host, options.module);
         }
+        const parsedPath = parse_name_1.parseName(options.path, options.name);
+        options.name = parsedPath.name;
+        options.path = parsedPath.path;
         const templateSource = schematics_1.apply(schematics_1.url('./files'), [
             options.routing || isLazyLoadedModuleGen && !!routingModulePath
                 ? schematics_1.noop()

package/module/schema.d.ts

@@ -31,7 +31,9 @@ export interface Schema {
      */
     project?: string;
     /**
-     * Creates lazy loaded routing module. Requires --module option.
+     * The route path for a lazy-loaded module. When supplied, creates a component in the new
+     * module, and adds the route to that component in the `Routes` array declared in the module
+     * provided in the `--module` option.
      */
     route?: string;
     /**

package/module/schema.json

@@ -41,7 +41,7 @@
     },
     "route": {
       "type": "string",
-      "description": "Creates lazy loaded routing module. Requires --module option."
+      "description": "The route path for a lazy-loaded module. When supplied, creates a component in the new module, and adds the route to that component in the `Routes` array declared in the module provided in the `--module` option."
     },
     "flat": {
       "type": "boolean",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "8.3.2",
+  "version": "8.3.6",
   "description": "Schematics specific to Angular",
   "keywords": [
     "angular",
@@ -14,8 +14,8 @@
   ],
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "8.3.2",
-    "@angular-devkit/schematics": "8.3.2"
+    "@angular-devkit/core": "8.3.6",
+    "@angular-devkit/schematics": "8.3.6"
   },
   "repository": {
     "type": "git",

package/universal/files/root/__tsconfigFileName__.json.template

@@ -5,7 +5,7 @@
     "module": "commonjs"
   },
   "files": [
-    "src/main.server.ts"
+    "src/<%= stripTsExtension(main) %>.ts"
   ],
   "angularCompilerOptions": {
     "entryModule": "./<%= rootInSrc ? '' : 'src/' %><%= appDir %>/<%= stripTsExtension(rootModuleFileName) %>#<%= rootModuleClassName %>"

package/universal/index.js

@@ -27,12 +27,13 @@ function updateConfigFile(options, tsConfigDirectory) {
             if (buildTarget && buildTarget.configurations && buildTarget.configurations.production) {
                 fileReplacements = buildTarget.configurations.production.fileReplacements;
             }
+            const mainPath = options.main;
             clientProject.targets.add({
                 name: 'server',
                 builder: workspace_models_1.Builders.Server,
                 options: {
                     outputPath: `dist/${options.clientProject}-server`,
-                    main: core_1.join(core_1.normalize(clientProject.root), 'src/main.server.ts'),
+                    main: core_1.join(core_1.normalize(clientProject.root), 'src', mainPath.endsWith('.ts') ? mainPath : mainPath + '.ts'),
                     tsConfig: core_1.join(tsConfigDirectory, `${options.tsconfigFileName}.json`),
                 },
                 configurations: {

package/utility/find-module.d.ts

@@ -16,6 +16,8 @@ export interface ModuleOptions {
     moduleExt?: string;
     routingModuleExt?: string;
 }
+export declare const MODULE_EXT = ".module.ts";
+export declare const ROUTING_MODULE_EXT = "-routing.module.ts";
 /**
  * Find the module referred by a set of options passed to the schematics.
  */

package/utility/find-module.js

@@ -8,8 +8,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * found in the LICENSE file at https://angular.io/license
  */
 const core_1 = require("@angular-devkit/core");
-const MODULE_EXT = '.module.ts';
-const ROUTING_MODULE_EXT = '-routing.module.ts';
+exports.MODULE_EXT = '.module.ts';
+exports.ROUTING_MODULE_EXT = '-routing.module.ts';
 /**
  * Find the module referred by a set of options passed to the schematics.
  */
@@ -17,8 +17,8 @@ function findModuleFromOptions(host, options) {
     if (options.hasOwnProperty('skipImport') && options.skipImport) {
         return undefined;
     }
-    const moduleExt = options.moduleExt || MODULE_EXT;
-    const routingModuleExt = options.routingModuleExt || ROUTING_MODULE_EXT;
+    const moduleExt = options.moduleExt || exports.MODULE_EXT;
+    const routingModuleExt = options.routingModuleExt || exports.ROUTING_MODULE_EXT;
     if (!options.module) {
         const pathToCheck = (options.path || '') + '/' + options.name;
         return core_1.normalize(findModule(host, pathToCheck, moduleExt, routingModuleExt));
@@ -57,7 +57,7 @@ exports.findModuleFromOptions = findModuleFromOptions;
 /**
  * Function to find the "closest" module to a generated file's path.
  */
-function findModule(host, generateDir, moduleExt = MODULE_EXT, routingModuleExt = ROUTING_MODULE_EXT) {
+function findModule(host, generateDir, moduleExt = exports.MODULE_EXT, routingModuleExt = exports.ROUTING_MODULE_EXT) {
     let dir = host.getDir('/' + generateDir);
     let foundRoutingModule = false;
     while (dir) {

package/utility/latest-versions.js

@@ -9,16 +9,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.latestVersions = {
     // These versions should be kept up to date with latest Angular peer dependencies.
-    Angular: '~8.2.4',
+    Angular: '~8.2.8',
     RxJs: '~6.4.0',
     ZoneJs: '~0.9.1',
     TypeScript: '~3.5.3',
     TsLib: '^1.10.0',
     // The versions below must be manually updated when making a new devkit release.
-    DevkitBuildAngular: '~0.803.2',
-    DevkitBuildNgPackagr: '~0.803.2',
-    DevkitBuildWebpack: '~0.803.2',
-    AngularPWA: '~0.803.2',
+    DevkitBuildAngular: '~0.803.6',
+    DevkitBuildNgPackagr: '~0.803.6',
+    DevkitBuildWebpack: '~0.803.6',
+    AngularPWA: '~0.803.6',
     tsickle: '^0.37.0',
     ngPackagr: '^5.4.0',
 };