@schematics/angular 12.2.0-next.0 → 12.2.0

package/application/files/src/test.ts.template

@@ -17,8 +17,10 @@ declare const require: {
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
+  platformBrowserDynamicTesting(),
+  { teardown: { destroyAfterEach: true }},
 );
+
 // Then we find all the tests.
 const context = require.context('./', true, /\.spec\.ts$/);
 // And load the modules.

package/application/index.js

@@ -34,7 +34,7 @@ function addDependenciesToPackageJson(options) {
             {
                 type: dependencies_1.NodeDependencyType.Dev,
                 name: 'typescript',
-                version: latest_versions_1.latestVersions.TypeScript,
+                version: latest_versions_1.latestVersions['typescript'],
             },
         ].forEach((dependency) => dependencies_1.addPackageJsonDependency(host, dependency));
         if (!options.skipInstall) {

package/application/other-files/app.component.html.template

@@ -96,6 +96,7 @@
   }
 
   .card {
+    all: unset;
     border-radius: 4px;
     border: 1px solid #eee;
     background-color: #fafafa;
@@ -249,7 +250,6 @@
     background-image: linear-gradient(-180deg,#fafbfc,#eff3f6 90%);
     margin-left: 4px;
     font-weight: 600;
-    font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol;
   }
 
   .github-star-badge:hover {
@@ -272,10 +272,8 @@
     width: 1920px;
   }
 
-
   /* Responsive Styles */
   @media screen and (max-width: 767px) {
-
     .card-container > *:not(.circle-link) ,
     .terminal {
       width: 100%;
@@ -359,31 +357,24 @@
   <div class="card-container">
     <a class="card" target="_blank" rel="noopener" href="https://angular.io/tutorial">
       <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M5 13.18v4L12 21l7-3.82v-4L12 17l-7-3.82zM12 3L1 9l11 6 9-4.91V17h2V9L12 3z"/></svg>
-
       <span>Learn Angular</span>
-
       <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/></svg>    </a>
 
     <a class="card" target="_blank" rel="noopener" href="https://angular.io/cli">
       <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M9.4 16.6L4.8 12l4.6-4.6L8 6l-6 6 6 6 1.4-1.4zm5.2 0l4.6-4.6-4.6-4.6L16 6l6 6-6 6-1.4-1.4z"/></svg>
-
       <span>CLI Documentation</span>
-
       <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/></svg>
     </a>
 
     <a class="card" target="_blank" rel="noopener" href="https://blog.angular.io/">
       <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M13.5.67s.74 2.65.74 4.8c0 2.06-1.35 3.73-3.41 3.73-2.07 0-3.63-1.67-3.63-3.73l.03-.36C5.21 7.51 4 10.62 4 14c0 4.42 3.58 8 8 8s8-3.58 8-8C20 8.61 17.41 3.8 13.5.67zM11.71 19c-1.78 0-3.22-1.4-3.22-3.14 0-1.62 1.05-2.76 2.81-3.12 1.77-.36 3.6-1.21 4.62-2.58.39 1.29.59 2.65.59 4.04 0 2.65-2.15 4.8-4.8 4.8z"/></svg>
-
       <span>Angular Blog</span>
-
       <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/></svg>
     </a>
 
     <a class="card" target="_blank" rel="noopener" href="https://angular.io/devtools/">
       <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><g><rect fill="none" height="24" width="24"/></g><g><g><path d="M14.73,13.31C15.52,12.24,16,10.93,16,9.5C16,5.91,13.09,3,9.5,3S3,5.91,3,9.5C3,13.09,5.91,16,9.5,16 c1.43,0,2.74-0.48,3.81-1.27L19.59,21L21,19.59L14.73,13.31z M9.5,14C7.01,14,5,11.99,5,9.5S7.01,5,9.5,5S14,7.01,14,9.5 S11.99,14,9.5,14z"/><polygon points="10.29,8.44 9.5,6 8.71,8.44 6.25,8.44 8.26,10.03 7.49,12.5 9.5,10.97 11.51,12.5 10.74,10.03 12.75,8.44"/></g></g></svg>
       <span>Angular DevTools</span>
-
       <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/></svg>
     </a>
 
@@ -396,41 +387,35 @@
   <input type="hidden" #selection>
 
   <div class="card-container">
-    <div class="card card-small" (click)="selection.value = 'component'" tabindex="0">
-        <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
-
+    <button class="card card-small" (click)="selection.value = 'component'" tabindex="0">
+      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
       <span>New Component</span>
-    </div>
-
-    <div class="card card-small" (click)="selection.value = 'material'" tabindex="0">
-        <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
+    </button>
 
+    <button class="card card-small" (click)="selection.value = 'material'" tabindex="0">
+      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
       <span>Angular Material</span>
-    </div>
-
-    <div class="card card-small" (click)="selection.value = 'pwa'" tabindex="0">
-        <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
+    </button>
 
+    <button class="card card-small" (click)="selection.value = 'pwa'" tabindex="0">
+      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
       <span>Add PWA Support</span>
-    </div>
+    </button>
 
-    <div class="card card-small" (click)="selection.value = 'dependency'" tabindex="0">
+    <button class="card card-small" (click)="selection.value = 'dependency'" tabindex="0">
       <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
-
       <span>Add Dependency</span>
-    </div>
+    </button>
 
-    <div class="card card-small" (click)="selection.value = 'test'" tabindex="0">
+    <button class="card card-small" (click)="selection.value = 'test'" tabindex="0">
       <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
-
       <span>Run and Watch Tests</span>
-    </div>
+    </button>
 
-    <div class="card card-small" (click)="selection.value = 'build'" tabindex="0">
+    <button class="card card-small" (click)="selection.value = 'build'" tabindex="0">
       <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
-
       <span>Build for Production</span>
-    </div>
+    </button>
   </div>
 
   <!-- Terminal -->

package/application/other-files/app.component.spec.ts.template

@@ -29,7 +29,7 @@ describe('AppComponent', () => {
   it('should render title', () => {
     const fixture = TestBed.createComponent(AppComponent);
     fixture.detectChanges();
-    const compiled = fixture.nativeElement;
-    expect(compiled.querySelector('.content span').textContent).toContain('<%= name %> app is running!');
+    const compiled = fixture.nativeElement as HTMLElement;
+    expect(compiled.querySelector('.content span')?.textContent).toContain('<%= name %> app is running!');
   });
 });

package/class/index.js

@@ -7,32 +7,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@angular-devkit/core");
-const schematics_1 = require("@angular-devkit/schematics");
-const lint_fix_1 = require("../utility/lint-fix");
-const parse_name_1 = require("../utility/parse-name");
-const workspace_1 = require("../utility/workspace");
+const generate_from_files_1 = require("../utility/generate-from-files");
 function default_1(options) {
-    return async (host) => {
-        if (options.path === undefined) {
-            options.path = await workspace_1.createDefaultPath(host, options.project);
-        }
-        options.type = options.type ? `.${options.type}` : '';
-        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.skipTests ? schematics_1.filter((path) => !path.endsWith('.spec.ts.template')) : schematics_1.noop(),
-            schematics_1.applyTemplates({
-                ...core_1.strings,
-                ...options,
-            }),
-            schematics_1.move(parsedPath.path),
-        ]);
-        return schematics_1.chain([
-            schematics_1.mergeWith(templateSource),
-            options.lintFix ? lint_fix_1.applyLintFix(options.path) : schematics_1.noop(),
-        ]);
-    };
+    options.type = options.type ? `.${options.type}` : '';
+    return generate_from_files_1.generateFromFiles(options);
 }
 exports.default = default_1;

package/enum/index.js

@@ -7,31 +7,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@angular-devkit/core");
-const schematics_1 = require("@angular-devkit/schematics");
-const lint_fix_1 = require("../utility/lint-fix");
-const parse_name_1 = require("../utility/parse-name");
-const workspace_1 = require("../utility/workspace");
+const generate_from_files_1 = require("../utility/generate-from-files");
 function default_1(options) {
-    return async (host) => {
-        if (options.path === undefined) {
-            options.path = await workspace_1.createDefaultPath(host, options.project);
-        }
-        const parsedPath = parse_name_1.parseName(options.path, options.name);
-        options.name = parsedPath.name;
-        options.path = parsedPath.path;
-        options.type = options.type ? `.${options.type}` : '';
-        const templateSource = schematics_1.apply(schematics_1.url('./files'), [
-            schematics_1.applyTemplates({
-                ...core_1.strings,
-                ...options,
-            }),
-            schematics_1.move(parsedPath.path),
-        ]);
-        return schematics_1.chain([
-            schematics_1.mergeWith(templateSource),
-            options.lintFix ? lint_fix_1.applyLintFix(options.path) : schematics_1.noop(),
-        ]);
-    };
+    options.type = options.type ? `.${options.type}` : '';
+    return generate_from_files_1.generateFromFiles(options);
 }
 exports.default = default_1;

package/guard/index.js

@@ -7,53 +7,32 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
-const lint_fix_1 = require("../utility/lint-fix");
-const parse_name_1 = require("../utility/parse-name");
-const workspace_1 = require("../utility/workspace");
+const generate_from_files_1 = require("../utility/generate-from-files");
 const schema_1 = require("./schema");
 function default_1(options) {
-    return async (host) => {
-        if (options.path === undefined) {
-            options.path = await workspace_1.createDefaultPath(host, options.project);
-        }
-        if (!options.implements) {
-            throw new schematics_1.SchematicsException('Option "implements" is required.');
-        }
-        const implementations = options.implements
-            .map((implement) => (implement === 'CanDeactivate' ? 'CanDeactivate<unknown>' : implement))
-            .join(', ');
-        const commonRouterNameImports = ['ActivatedRouteSnapshot', 'RouterStateSnapshot'];
-        const routerNamedImports = [...options.implements, 'UrlTree'];
-        if (options.implements.includes(schema_1.Implement.CanLoad)) {
-            routerNamedImports.push('Route', 'UrlSegment');
-            if (options.implements.length > 1) {
-                routerNamedImports.push(...commonRouterNameImports);
-            }
-        }
-        else {
+    if (!options.implements) {
+        throw new schematics_1.SchematicsException('Option "implements" is required.');
+    }
+    const implementations = options.implements
+        .map((implement) => (implement === 'CanDeactivate' ? 'CanDeactivate<unknown>' : implement))
+        .join(', ');
+    const commonRouterNameImports = ['ActivatedRouteSnapshot', 'RouterStateSnapshot'];
+    const routerNamedImports = [...options.implements, 'UrlTree'];
+    if (options.implements.includes(schema_1.Implement.CanLoad)) {
+        routerNamedImports.push('Route', 'UrlSegment');
+        if (options.implements.length > 1) {
             routerNamedImports.push(...commonRouterNameImports);
         }
-        routerNamedImports.sort();
-        const implementationImports = routerNamedImports.join(', ');
-        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.skipTests ? schematics_1.filter((path) => !path.endsWith('.spec.ts.template')) : schematics_1.noop(),
-            schematics_1.applyTemplates({
-                implementations,
-                implementationImports,
-                ...core_1.strings,
-                ...options,
-            }),
-            schematics_1.move(parsedPath.path + (options.flat ? '' : '/' + core_1.strings.dasherize(options.name))),
-        ]);
-        return schematics_1.chain([
-            schematics_1.mergeWith(templateSource),
-            options.lintFix ? lint_fix_1.applyLintFix(options.path) : schematics_1.noop(),
-        ]);
-    };
+    }
+    else {
+        routerNamedImports.push(...commonRouterNameImports);
+    }
+    routerNamedImports.sort();
+    const implementationImports = routerNamedImports.join(', ');
+    return generate_from_files_1.generateFromFiles(options, {
+        implementations,
+        implementationImports,
+    });
 }
 exports.default = default_1;

package/interceptor/index.js

@@ -7,32 +7,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@angular-devkit/core");
-const schematics_1 = require("@angular-devkit/schematics");
-const lint_fix_1 = require("../utility/lint-fix");
-const parse_name_1 = require("../utility/parse-name");
-const workspace_1 = require("../utility/workspace");
+const generate_from_files_1 = require("../utility/generate-from-files");
 function default_1(options) {
-    return async (host) => {
-        if (options.path === undefined) {
-            options.path = await workspace_1.createDefaultPath(host, options.project);
-        }
-        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.skipTests ? schematics_1.filter((path) => !path.endsWith('.spec.ts.template')) : schematics_1.noop(),
-            schematics_1.applyTemplates({
-                ...core_1.strings,
-                'if-flat': (s) => (options.flat ? '' : s),
-                ...options,
-            }),
-            schematics_1.move(parsedPath.path),
-        ]);
-        return schematics_1.chain([
-            schematics_1.mergeWith(templateSource),
-            options.lintFix ? lint_fix_1.applyLintFix(options.path) : schematics_1.noop(),
-        ]);
-    };
+    // This schematic uses an older method to implement the flat option
+    const flat = options.flat;
+    options.flat = true;
+    return generate_from_files_1.generateFromFiles(options, {
+        'if-flat': (s) => (flat ? '' : s),
+    });
 }
 exports.default = default_1;

package/interface/index.js

@@ -7,32 +7,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@angular-devkit/core");
-const schematics_1 = require("@angular-devkit/schematics");
-const lint_fix_1 = require("../utility/lint-fix");
-const parse_name_1 = require("../utility/parse-name");
-const workspace_1 = require("../utility/workspace");
+const generate_from_files_1 = require("../utility/generate-from-files");
 function default_1(options) {
-    return async (host) => {
-        if (options.path === undefined) {
-            options.path = await workspace_1.createDefaultPath(host, options.project);
-        }
-        const parsedPath = parse_name_1.parseName(options.path, options.name);
-        options.name = parsedPath.name;
-        options.path = parsedPath.path;
-        options.prefix = options.prefix ? options.prefix : '';
-        options.type = options.type ? `.${options.type}` : '';
-        const templateSource = schematics_1.apply(schematics_1.url('./files'), [
-            schematics_1.applyTemplates({
-                ...core_1.strings,
-                ...options,
-            }),
-            schematics_1.move(parsedPath.path),
-        ]);
-        return schematics_1.chain([
-            schematics_1.mergeWith(templateSource),
-            options.lintFix ? lint_fix_1.applyLintFix(options.path) : schematics_1.noop(),
-        ]);
-    };
+    options.type = options.type ? `.${options.type}` : '';
+    return generate_from_files_1.generateFromFiles(options);
 }
 exports.default = default_1;

package/library/files/src/test.ts.template

@@ -18,8 +18,10 @@ declare const require: {
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
+  platformBrowserDynamicTesting(),
+  { teardown: { destroyAfterEach: true }},
 );
+
 // Then we find all the tests.
 const context = require.context('./', true, /\.spec\.ts$/);
 // And load the modules.

package/library/index.js

@@ -45,17 +45,17 @@ function addDependenciesToPackageJson() {
             {
                 type: dependencies_1.NodeDependencyType.Dev,
                 name: 'ng-packagr',
-                version: latest_versions_1.latestVersions.ngPackagr,
+                version: latest_versions_1.latestVersions['ng-packagr'],
             },
             {
                 type: dependencies_1.NodeDependencyType.Default,
                 name: 'tslib',
-                version: latest_versions_1.latestVersions.TsLib,
+                version: latest_versions_1.latestVersions['tslib'],
             },
             {
                 type: dependencies_1.NodeDependencyType.Dev,
                 name: 'typescript',
-                version: latest_versions_1.latestVersions.TypeScript,
+                version: latest_versions_1.latestVersions['typescript'],
             },
         ].forEach((dependency) => dependencies_1.addPackageJsonDependency(host, dependency));
         return host;
@@ -133,8 +133,8 @@ function default_1(options) {
                 distRoot,
                 relativePathToWorkspaceRoot: paths_1.relativePathToWorkspaceRoot(projectRoot),
                 prefix,
-                angularLatestVersion: latest_versions_1.latestVersions.Angular.replace('~', '').replace('^', ''),
-                tsLibLatestVersion: latest_versions_1.latestVersions.TsLib.replace('~', '').replace('^', ''),
+                angularLatestVersion: latest_versions_1.latestVersions.Angular.replace(/\~|\^/, ''),
+                tsLibLatestVersion: latest_versions_1.latestVersions['tslib'].replace(/\~|\^/, ''),
                 folderName,
             }),
             schematics_1.move(projectRoot),

package/migrations/update-10/update-dependencies.js

@@ -21,7 +21,7 @@ function default_1() {
             'karma-jasmine': '~4.0.0',
             'karma-jasmine-html-reporter': '^1.5.0',
             'protractor': '~7.0.0',
-            'ng-packagr': latest_versions_1.latestVersions.ngPackagr,
+            'ng-packagr': latest_versions_1.latestVersions['ng-packagr'],
             'tslib': '^2.0.0',
         };
         let hasChanges = false;

package/migrations/update-9/add-tslib.js

@@ -18,7 +18,7 @@ function addTsLib() {
         }
         dependencies_1.addPackageJsonDependency(host, {
             name: 'tslib',
-            version: latest_versions_1.latestVersions.TsLib,
+            version: latest_versions_1.latestVersions['tslib'],
             type: dependencies_1.NodeDependencyType.Default,
             overwrite: true,
         });

package/package.json

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

package/resolver/index.js

@@ -7,27 +7,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@angular-devkit/core");
-const schematics_1 = require("@angular-devkit/schematics");
-const parse_name_1 = require("../utility/parse-name");
-const workspace_1 = require("../utility/workspace");
+const generate_from_files_1 = require("../utility/generate-from-files");
 function default_1(options) {
-    return async (host) => {
-        if (options.path === undefined) {
-            options.path = await workspace_1.createDefaultPath(host, options.project);
-        }
-        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.skipTests ? schematics_1.filter((path) => !path.endsWith('.spec.ts.template')) : schematics_1.noop(),
-            schematics_1.applyTemplates({
-                ...core_1.strings,
-                ...options,
-            }),
-            schematics_1.move(parsedPath.path + (options.flat ? '' : '/' + core_1.strings.dasherize(options.name))),
-        ]);
-        return schematics_1.chain([schematics_1.mergeWith(templateSource)]);
-    };
+    return generate_from_files_1.generateFromFiles(options);
 }
 exports.default = default_1;

package/service/index.js

@@ -7,32 +7,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@angular-devkit/core");
-const schematics_1 = require("@angular-devkit/schematics");
-const lint_fix_1 = require("../utility/lint-fix");
-const parse_name_1 = require("../utility/parse-name");
-const workspace_1 = require("../utility/workspace");
+const generate_from_files_1 = require("../utility/generate-from-files");
 function default_1(options) {
-    return async (host) => {
-        if (options.path === undefined) {
-            options.path = await workspace_1.createDefaultPath(host, options.project);
-        }
-        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.skipTests ? schematics_1.filter((path) => !path.endsWith('.spec.ts.template')) : schematics_1.noop(),
-            schematics_1.applyTemplates({
-                ...core_1.strings,
-                'if-flat': (s) => (options.flat ? '' : s),
-                ...options,
-            }),
-            schematics_1.move(parsedPath.path),
-        ]);
-        return schematics_1.chain([
-            schematics_1.mergeWith(templateSource),
-            options.lintFix ? lint_fix_1.applyLintFix(options.path) : schematics_1.noop(),
-        ]);
-    };
+    // This schematic uses an older method to implement the flat option
+    const flat = options.flat;
+    options.flat = true;
+    return generate_from_files_1.generateFromFiles(options, {
+        'if-flat': (s) => (flat ? '' : s),
+    });
 }
 exports.default = default_1;

package/utility/generate-from-files.d.ts

@@ -0,0 +1,18 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Rule } from '@angular-devkit/schematics';
+export interface GenerateFromFilesOptions {
+    flat?: boolean;
+    lintFix?: boolean;
+    name: string;
+    path?: string;
+    prefix?: string;
+    project?: string;
+    skipTests?: boolean;
+}
+export declare function generateFromFiles(options: GenerateFromFilesOptions, extraTemplateValues?: Record<string, string | ((v: string) => string)>): Rule;

package/utility/generate-from-files.js

@@ -0,0 +1,40 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateFromFiles = void 0;
+const core_1 = require("@angular-devkit/core");
+const schematics_1 = require("@angular-devkit/schematics");
+const lint_fix_1 = require("./lint-fix");
+const parse_name_1 = require("./parse-name");
+const workspace_1 = require("./workspace");
+function generateFromFiles(options, extraTemplateValues = {}) {
+    return async (host) => {
+        var _a, _b, _c;
+        (_a = options.path) !== null && _a !== void 0 ? _a : (options.path = await workspace_1.createDefaultPath(host, options.project));
+        (_b = options.prefix) !== null && _b !== void 0 ? _b : (options.prefix = '');
+        (_c = options.flat) !== null && _c !== void 0 ? _c : (options.flat = true);
+        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.skipTests ? schematics_1.filter((path) => !path.endsWith('.spec.ts.template')) : schematics_1.noop(),
+            schematics_1.applyTemplates({
+                ...core_1.strings,
+                ...options,
+                ...extraTemplateValues,
+            }),
+            schematics_1.move(parsedPath.path + (options.flat ? '' : '/' + core_1.strings.dasherize(options.name))),
+        ]);
+        return schematics_1.chain([
+            schematics_1.mergeWith(templateSource),
+            options.lintFix ? lint_fix_1.applyLintFix(options.path) : schematics_1.noop(),
+        ]);
+    };
+}
+exports.generateFromFiles = generateFromFiles;

package/utility/latest-versions/package.json

@@ -0,0 +1,20 @@
+{
+  "description": "Package versions used by schematics in @schematics/angular.",
+  "comment": "This file is needed so that depedencies are synced by Renovate.",
+  "private": true,
+  "dependencies": {
+    "@types/jasmine": "~3.8.0",
+    "@types/node": "^12.11.1",
+    "jasmine-core": "~3.8.0",
+    "karma-chrome-launcher": "~3.1.0",
+    "karma-coverage": "~2.0.3",
+    "karma-jasmine-html-reporter": "~1.7.0",
+    "karma-jasmine": "~4.0.0",
+    "karma": "~6.3.0",
+    "ng-packagr": "^12.1.1",
+    "rxjs": "~6.6.0",
+    "tslib": "^2.3.0",
+    "typescript": "~4.3.5",
+    "zone.js": "~0.11.4"
+  }
+}

package/utility/latest-versions.d.ts

@@ -5,12 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-export declare const latestVersions: {
+export declare const latestVersions: Record<string, string> & {
     Angular: string;
-    RxJs: string;
-    ZoneJs: string;
-    TypeScript: string;
-    TsLib: string;
     DevkitBuildAngular: string;
-    ngPackagr: string;
 };

package/utility/latest-versions.js

@@ -8,16 +8,23 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.latestVersions = void 0;
+/** Retrieve the minor version for the provided version string. */
+function getAngularEarliestMinorVersion(version) {
+    const versionMatching = version.match(/^(\d+)\.(\d+)\.\d+(-\w+)?/);
+    if (versionMatching === null) {
+        throw Error('Unable to determine the minor version for the provided version');
+    }
+    const [_, major, minor, prerelease = ''] = versionMatching;
+    return `~${major}.${minor}.0${prerelease}`;
+}
 exports.latestVersions = {
-    // These versions should be kept up to date with latest Angular peer dependencies.
-    Angular: '~12.2.0-next.0',
-    RxJs: '~6.6.0',
-    ZoneJs: '~0.11.4',
-    TypeScript: '~4.3.2',
-    TsLib: '^2.2.0',
+    // We could have used TypeScripts' `resolveJsonModule` to make the `latestVersion` object typesafe,
+    // but ts_library doesn't support JSON inputs.
+    ...require('./latest-versions/package.json')['dependencies'],
+    // As Angular CLI works with same minor versions of Angular Framework, a tilde match for the current
+    Angular: getAngularEarliestMinorVersion(require('../package.json')['version']),
     // Since @angular-devkit/build-angular and @schematics/angular are always
     // published together from the same monorepo, and they are both
     // non-experimental, they will always have the same version.
     DevkitBuildAngular: '~' + require('../package.json')['version'],
-    ngPackagr: '^12.1.0-next.0',
 };

package/workspace/files/package.json.template

@@ -18,21 +18,21 @@
     "@angular/platform-browser": "<%= latestVersions.Angular %>",
     "@angular/platform-browser-dynamic": "<%= latestVersions.Angular %>",
     "@angular/router": "<%= latestVersions.Angular %>",
-    "rxjs": "<%= latestVersions.RxJs %>",
-    "tslib": "<%= latestVersions.TsLib %>",
-    "zone.js": "<%= latestVersions.ZoneJs %>"
+    "rxjs": "<%= latestVersions['rxjs'] %>",
+    "tslib": "<%= latestVersions['tslib'] %>",
+    "zone.js": "<%= latestVersions['zone.js'] %>"
   },
   "devDependencies": {
     "@angular/cli": "<%= '~' + version %>",
     "@angular/compiler-cli": "<%= latestVersions.Angular %>",<% if (!minimal) { %>
-    "@types/jasmine": "~3.6.0",<% } %>
-    "@types/node": "^12.11.1",<% if (!minimal) { %>
-    "jasmine-core": "~3.7.0",
-    "karma": "~6.3.0",
-    "karma-chrome-launcher": "~3.1.0",
-    "karma-coverage": "~2.0.3",
-    "karma-jasmine": "~4.0.0",
-    "karma-jasmine-html-reporter": "^1.5.0",<% } %>
-    "typescript": "<%= latestVersions.TypeScript %>"
+    "@types/jasmine": "<%= latestVersions['@types/jasmine'] %>",<% } %>
+    "@types/node": "<%= latestVersions['@types/node'] %>",<% if (!minimal) { %>
+    "jasmine-core": "<%= latestVersions['jasmine-core'] %>",
+    "karma": "<%= latestVersions['karma'] %>",
+    "karma-chrome-launcher": "<%= latestVersions['karma-chrome-launcher'] %>",
+    "karma-coverage": "<%= latestVersions['karma-coverage'] %>",
+    "karma-jasmine": "<%= latestVersions['karma-jasmine'] %>",
+    "karma-jasmine-html-reporter": "<%= latestVersions['karma-jasmine-html-reporter'] %>",<% } %>
+    "typescript": "<%= latestVersions['typescript'] %>"
   }
 }