@schematics/angular 14.0.1 → 14.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "14.0.1",
+  "version": "14.0.4",
   "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.0.1",
-    "@angular-devkit/schematics": "14.0.1",
+    "@angular-devkit/core": "14.0.4",
+    "@angular-devkit/schematics": "14.0.4",
     "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/workspace/files/__dot__vscode/launch.json.template

@@ -8,13 +8,13 @@
       "request": "launch",
       "preLaunchTask": "npm: start",
       "url": "http://localhost:4200/"
-    },
+    }<% if (!minimal) { %>,
     {
       "name": "ng test",
       "type": "chrome",
       "request": "launch",
       "preLaunchTask": "npm: test",
       "url": "http://localhost:9876/debug.html"
-    }
+    }<% } %>
   ]
 }

package/workspace/files/__dot__vscode/tasks.json.template

@@ -19,7 +19,7 @@
           }
         }
       }
-    },
+    }<% if (!minimal) { %>,
     {
       "type": "npm",
       "script": "test",
@@ -37,6 +37,6 @@
           }
         }
       }
-    }
+    }<% } %>
   ]
 }