@schematics/angular 14.1.0-next.2 → 14.1.0-rc.3

package/app-shell/schema.json

@@ -5,7 +5,6 @@
   "type": "object",
   "description": "Generates an application shell for running a server-side version of an app.",
   "additionalProperties": false,
-  "long-description": "./app-shell-long.md",
   "properties": {
     "project": {
       "type": "string",

package/e2e/schema.json

@@ -5,7 +5,6 @@
   "type": "object",
   "additionalProperties": false,
   "description": "Generates a new, generic end-to-end test definition for the given or default project.",
-  "long-description": "e2e-long.md",
   "properties": {
     "rootSelector": {
       "description": "The HTML selector for the root component of the test app.",

package/library/schema.json

@@ -4,7 +4,6 @@
   "title": "Library Options Schema",
   "type": "object",
   "description": "Creates a new, generic library project in the current workspace.",
-  "long-description": "./library-long.md",
   "additionalProperties": false,
   "properties": {
     "name": {

package/module/files/__name@dasherize@if-flat__/__name@dasherize__.module.ts.template

@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';<% if (commonModule) { %>
 import { CommonModule } from '@angular/common';<% } %><% if (lazyRouteWithoutRouteModule) { %>
 import { Routes, RouterModule } from '@angular/router';<% } %>
-<% if (routing || lazyRouteWithRouteModule) { %>
+<% if ((!lazyRoute && routing) || lazyRouteWithRouteModule) { %>
 import { <%= classify(name) %>RoutingModule } from './<%= dasherize(name) %>-routing.module';<% } %>
 <% if (lazyRouteWithoutRouteModule) { %>
 const routes: Routes = [
@@ -11,7 +11,7 @@ const routes: Routes = [
 @NgModule({
   declarations: [],
   imports: [<% if (commonModule) { %>
-    CommonModule<% } %><% if (routing || lazyRouteWithRouteModule) { %>,
+    CommonModule<% } %><% if ((!lazyRoute && routing) || lazyRouteWithRouteModule) { %>,
     <%= classify(name) %>RoutingModule<% } %><% if (lazyRouteWithoutRouteModule) { %>,
     RouterModule.forChild(routes)<% } %>
   ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "14.1.0-next.2",
+  "version": "14.1.0-rc.3",
   "description": "Schematics specific to Angular",
   "homepage": "https://github.com/angular/angular-cli",
   "keywords": [
@@ -23,8 +23,8 @@
   },
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "14.1.0-next.2",
-    "@angular-devkit/schematics": "14.1.0-next.2",
+    "@angular-devkit/core": "14.1.0-rc.3",
+    "@angular-devkit/schematics": "14.1.0-rc.3",
     "jsonc-parser": "3.0.0"
   },
   "repository": {

package/universal/files/root/tsconfig.server.json.template

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

package/universal/index.js

@@ -45,6 +45,7 @@ const workspace_1 = require("../utility/workspace");
 const workspace_models_1 = require("../utility/workspace-models");
 function updateConfigFile(options, tsConfigDirectory) {
     return (0, workspace_1.updateWorkspace)((workspace) => {
+        var _a;
         const clientProject = workspace.projects.get(options.project);
         if (clientProject) {
             // In case the browser builder hashes the assets
@@ -79,6 +80,7 @@ function updateConfigFile(options, tsConfigDirectory) {
                 }
             }
             const mainPath = options.main;
+            const sourceRoot = (_a = clientProject.sourceRoot) !== null && _a !== void 0 ? _a : (0, core_1.join)((0, core_1.normalize)(clientProject.root), 'src');
             const serverTsConfig = (0, core_1.join)(tsConfigDirectory, 'tsconfig.server.json');
             clientProject.targets.add({
                 name: 'server',
@@ -86,7 +88,7 @@ function updateConfigFile(options, tsConfigDirectory) {
                 defaultConfiguration: 'production',
                 options: {
                     outputPath: `dist/${options.project}/server`,
-                    main: (0, core_1.join)((0, core_1.normalize)(clientProject.root), 'src', mainPath.endsWith('.ts') ? mainPath : mainPath + '.ts'),
+                    main: (0, core_1.join)((0, core_1.normalize)(sourceRoot), mainPath.endsWith('.ts') ? mainPath : mainPath + '.ts'),
                     tsConfig: serverTsConfig,
                     ...((buildTarget === null || buildTarget === void 0 ? void 0 : buildTarget.options) ? getServerOptions(buildTarget === null || buildTarget === void 0 ? void 0 : buildTarget.options) : {}),
                 },
@@ -135,12 +137,12 @@ function wrapBootstrapCall(mainFile) {
         const afterText = `\n${triviaWidth > 2 ? ' '.repeat(triviaWidth - 1) : ''}};\n` +
             `
 
-if (document.readyState === 'complete') {
-  bootstrap();
-} else {
-  document.addEventListener('DOMContentLoaded', bootstrap);
-}
-`;
+ if (document.readyState === 'complete') {
+   bootstrap();
+ } else {
+   document.addEventListener('DOMContentLoaded', bootstrap);
+ }
+ `;
         // in some cases we need to cater for a trailing semicolon such as;
         // bootstrap().catch(err => console.log(err));
         const lastToken = bootstrapCall.parent.getLastToken();
@@ -215,12 +217,6 @@ function default_1(options) {
         }
         const clientBuildOptions = (clientBuildTarget.options ||
             {});
-        const clientTsConfig = (0, core_1.normalize)(clientBuildOptions.tsConfig);
-        const tsConfigExtends = (0, core_1.basename)(clientTsConfig);
-        // this is needed because prior to version 8, tsconfig might have been in 'src'
-        // and we don't want to break the 'ng add @nguniversal/express-engine schematics'
-        const rootInSrc = clientProject.root === '' && clientTsConfig.includes('src/');
-        const tsConfigDirectory = (0, core_1.join)((0, core_1.normalize)(clientProject.root), rootInSrc ? 'src' : '');
         if (!options.skipInstall) {
             context.addTask(new tasks_1.NodePackageInstallTask());
         }
@@ -233,6 +229,9 @@ function default_1(options) {
             }),
             (0, schematics_1.move)((0, core_1.join)((0, core_1.normalize)(clientProject.root), 'src')),
         ]);
+        const clientTsConfig = (0, core_1.normalize)(clientBuildOptions.tsConfig);
+        const tsConfigExtends = (0, core_1.basename)(clientTsConfig);
+        const tsConfigDirectory = (0, core_1.dirname)(clientTsConfig);
         const rootSource = (0, schematics_1.apply)((0, schematics_1.url)('./files/root'), [
             (0, schematics_1.applyTemplates)({
                 ...schematics_1.strings,
@@ -240,7 +239,6 @@ function default_1(options) {
                 stripTsExtension: (s) => s.replace(/\.ts$/, ''),
                 tsConfigExtends,
                 relativePathToWorkspaceRoot: (0, paths_1.relativePathToWorkspaceRoot)(tsConfigDirectory),
-                rootInSrc,
             }),
             (0, schematics_1.move)(tsConfigDirectory),
         ]);

package/universal/schema.d.ts

@@ -4,6 +4,7 @@
 export interface Schema {
     /**
      * The name of the application folder.
+     * @deprecated This option has no effect.
      */
     appDir?: string;
     /**

package/universal/schema.json

@@ -29,7 +29,8 @@
       "type": "string",
       "format": "path",
       "description": "The name of the application folder.",
-      "default": "app"
+      "default": "app",
+      "x-deprecated": "This option has no effect."
     },
     "rootModuleFileName": {
       "type": "string",

package/utility/dependency.js

@@ -94,15 +94,18 @@ function addDependency(name, specifier, options = {}) {
             // Section is not present. The dependency can be added to a new object literal for the section.
             manifest[type] = { [name]: specifier };
         }
-        else if (dependencySection[name] === specifier) {
-            // Already present with same specifier
-            return;
-        }
-        else if (dependencySection[name]) {
-            // Already present but different specifier
-            throw new Error(`Package dependency "${name}" already exists with a different specifier.`);
-        }
         else {
+            const existingSpecifier = dependencySection[name];
+            if (existingSpecifier === specifier) {
+                // Already present with same specifier
+                return;
+            }
+            if (existingSpecifier) {
+                // Already present but different specifier
+                // This warning may become an error in the future
+                context.logger.warn(`Package dependency "${name}" already exists with a different specifier. ` +
+                    `"${existingSpecifier}" will be replaced with "${specifier}".`);
+            }
             // Add new dependency in alphabetical order
             const entries = Object.entries(dependencySection);
             entries.push([name, specifier]);

package/utility/latest-versions/package.json

@@ -5,13 +5,13 @@
   "dependencies": {
     "@types/jasmine": "~4.0.0",
     "@types/node": "^14.15.0",
-    "jasmine-core": "~4.1.0",
+    "jasmine-core": "~4.2.0",
     "jasmine-spec-reporter": "~7.0.0",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage": "~2.2.0",
     "karma-jasmine-html-reporter": "~2.0.0",
-    "karma-jasmine": "~5.0.0",
-    "karma": "~6.3.0",
+    "karma-jasmine": "~5.1.0",
+    "karma": "~6.4.0",
     "ng-packagr": "^14.0.0-next.8",
     "protractor": "~7.0.0",
     "rxjs": "~7.5.0",

package/app-shell/app-shell-long.md

@@ -1,47 +0,0 @@
-An app shell lets Universal render a portion of your application via a route at build time.
-This gives users a meaningful first paint of your application that appears quickly
-because the browser can simply render the HTML without the need to initialize any JavaScript.
-
-Use this command with a routing app that is accompanied by a Universal server-side app.
-
-To create an app shell, use the following command.
-
-<code-example format="." language="bash">
- ng generate app-shell my-app
-</code-example>
-
-- `my-app` is the name of your client application
-- `server-app` is the name of the Universal (server) application
-
-The command adds two new architect build targets to your `angular.json` configuration file (along with a few other changes).
-
-<code-example  format="." language="none" linenums="false">
-"server": {
-  "builder": "@angular-devkit/build-angular:server",
-  "options": {
-    "outputPath": "dist/my-app-server",
-    "main": "src/main.server.ts",
-    "tsConfig": "src/tsconfig.server.json"
-  }
-},
-"app-shell": {
-  "builder": "@angular-devkit/build-angular:app-shell",
-  "options": {
-    "browserTarget": "my-app:build",
-    "serverTarget": "my-app:server",
-    "route": "shell"
-  }
-}
-</code-example>
-
-To verify the that the app has been built with the default shell content:
-
-1. Run the app-shell target.
-
-   <code-example format="." language="bash">
-       ng run my-app:app-shell
-    </code-example>
-
-1. Open `dist/app-shell/index.html` in your browser.
-
-The default text "app-shell works!" verifies that the app-shell route was rendered as part of the output.

package/e2e/e2e-long.md

@@ -1,2 +0,0 @@
-The e2e tests are created in a separate application in the `projects` folder of the workspace,
-next to the project being tested.

package/library/files/.browserslistrc.template

@@ -1,16 +0,0 @@
-# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
-# For additional information regarding the format and rule options, please see:
-# https://github.com/browserslist/browserslist#queries
-
-# For the full list of supported browsers by the Angular framework, please see:
-# https://angular.io/guide/browser-support
-
-# You can see what browsers were selected by your queries by running:
-#   npx browserslist
-
-last 1 Chrome version
-last 1 Firefox version
-last 2 Edge major versions
-last 2 Safari major versions
-last 2 iOS major versions
-Firefox ESR

package/library/library-long.md

@@ -1,5 +0,0 @@
-A library is a type of project that does not run independently.
-The library skeleton created by this command is placed by default in the `/projects` folder, and has `type` of "library".
-
-You can build a new library using the `ng build` command, run unit tests for it using the `ng test` command,
-and lint it using the `ng lint` command.