@angular/cli 13.3.3 → 13.3.6

package/models/schematic-command.js

@@ -36,6 +36,7 @@ const schematics_1 = require("@angular-devkit/schematics");
 const tools_1 = require("@angular-devkit/schematics/tools");
 const inquirer = __importStar(require("inquirer"));
 const systemPath = __importStar(require("path"));
+const path_1 = require("path");
 const color_1 = require("../utilities/color");
 const config_1 = require("../utilities/config");
 const json_schema_1 = require("../utilities/json-schema");
@@ -303,19 +304,23 @@ class SchematicCommand extends command_1.Command {
         return (this._workflow = workflow);
     }
     async getDefaultSchematicCollection() {
+        // Resolve relative collections from the location of `angular.json`
+        const resolveRelativeCollection = (collectionName) => collectionName.charAt(0) === '.'
+            ? (0, path_1.resolve)(this.context.root, collectionName)
+            : collectionName;
         let workspace = await (0, config_1.getWorkspace)('local');
         if (workspace) {
             const project = (0, config_1.getProjectByCwd)(workspace);
             if (project && workspace.getProjectCli(project)) {
                 const value = workspace.getProjectCli(project)['defaultCollection'];
                 if (typeof value == 'string') {
-                    return value;
+                    return resolveRelativeCollection(value);
                 }
             }
             if (workspace.getCli()) {
                 const value = workspace.getCli()['defaultCollection'];
                 if (typeof value == 'string') {
-                    return value;
+                    return resolveRelativeCollection(value);
                 }
             }
         }
@@ -323,7 +328,7 @@ class SchematicCommand extends command_1.Command {
         if (workspace && workspace.getCli()) {
             const value = workspace.getCli()['defaultCollection'];
             if (typeof value == 'string') {
-                return value;
+                return resolveRelativeCollection(value);
             }
         }
         return this.defaultCollectionName;

package/models/schematic-engine-host.js

@@ -151,7 +151,9 @@ function wrap(schematicFile, schematicDirectory, moduleCache, exportName) {
     const schematicCode = (0, fs_1.readFileSync)(schematicFile, 'utf8');
     // `module` is required due to @angular/localize ng-add being in UMD format
     const headerCode = '(function() {\nvar exports = {};\nvar module = { exports };\n';
-    const footerCode = exportName ? `\nreturn exports['${exportName}'];});` : '\nreturn exports;});';
+    const footerCode = exportName
+        ? `\nreturn module.exports['${exportName}'];});`
+        : '\nreturn module.exports;});';
     const script = new vm_1.Script(headerCode + schematicCode + footerCode, {
         filename: schematicFile,
         lineOffset: 3,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "13.3.3",
+  "version": "13.3.6",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -28,10 +28,10 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.1303.3",
-    "@angular-devkit/core": "13.3.3",
-    "@angular-devkit/schematics": "13.3.3",
-    "@schematics/angular": "13.3.3",
+    "@angular-devkit/architect": "0.1303.6",
+    "@angular-devkit/core": "13.3.6",
+    "@angular-devkit/schematics": "13.3.6",
+    "@schematics/angular": "13.3.6",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.1",
     "debug": "4.3.3",
@@ -51,12 +51,12 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "13.3.3",
-      "@angular-devkit/architect": "0.1303.3",
-      "@angular-devkit/build-angular": "13.3.3",
-      "@angular-devkit/build-webpack": "0.1303.3",
-      "@angular-devkit/core": "13.3.3",
-      "@angular-devkit/schematics": "13.3.3"
+      "@angular/cli": "13.3.6",
+      "@angular-devkit/architect": "0.1303.6",
+      "@angular-devkit/build-angular": "13.3.6",
+      "@angular-devkit/build-webpack": "0.1303.6",
+      "@angular-devkit/core": "13.3.6",
+      "@angular-devkit/schematics": "13.3.6"
     }
   },
   "engines": {