@angular-devkit/architect 0.1201.0-next.3 → 0.1201.0

package/node/node-modules-architect-host.js

@@ -6,9 +6,28 @@
  * 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
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkspaceNodeModulesArchitectHost = void 0;
-const path = require("path");
+const path = __importStar(require("path"));
 const v8_1 = require("v8");
 const internal_1 = require("../src/internal");
 function clone(obj) {
@@ -146,10 +165,14 @@ class WorkspaceNodeModulesArchitectHost {
         return metadata;
     }
     async loadBuilder(info) {
-        const builder = (await Promise.resolve().then(() => require(info.import))).default;
+        const builder = (await Promise.resolve().then(() => __importStar(require(info.import)))).default;
         if (builder[internal_1.BuilderSymbol]) {
             return builder;
         }
+        // Default handling code is for old builders that incorrectly export `default` with non-ESM module
+        if (builder === null || builder === void 0 ? void 0 : builder.default[internal_1.BuilderSymbol]) {
+            return builder.default;
+        }
         throw new Error('Builder is not a builder');
     }
 }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@angular-devkit/architect",
-  "version": "0.1201.0-next.3",
+  "version": "0.1201.0",
   "description": "Angular Build Facade",
   "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "dependencies": {
-    "@angular-devkit/core": "12.1.0-next.3",
+    "@angular-devkit/core": "12.1.0",
     "rxjs": "6.6.7"
   },
   "builders": "./builders/builders.json",
@@ -22,7 +22,7 @@
     "url": "https://github.com/angular/angular-cli.git"
   },
   "engines": {
-    "node": "^12.14.1 || ^14.0.0",
+    "node": "^12.14.1 || >=14.0.0",
     "npm": "^6.11.0 || ^7.5.6",
     "yarn": ">= 1.13.0"
   },

package/testing/testing-architect-host.js

@@ -6,6 +6,25 @@
  * 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
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TestingArchitectHost = void 0;
 const src_1 = require("../src");
@@ -29,7 +48,7 @@ class TestingArchitectHost {
         this._builderMap.set(builderName, { builderName, description, optionSchema });
     }
     async addBuilderFromPackage(packageName) {
-        const packageJson = await Promise.resolve().then(() => require(packageName + '/package.json'));
+        const packageJson = await Promise.resolve().then(() => __importStar(require(packageName + '/package.json')));
         if (!('builders' in packageJson)) {
             throw new Error('Invalid package.json, builders key not found.');
         }
@@ -37,7 +56,7 @@ class TestingArchitectHost {
             throw new Error('Invalid package name');
         }
         const builderJsonPath = packageName + '/' + packageJson['builders'];
-        const builderJson = await Promise.resolve().then(() => require(builderJsonPath));
+        const builderJson = await Promise.resolve().then(() => __importStar(require(builderJsonPath)));
         const builders = builderJson['builders'];
         if (!builders) {
             throw new Error('Invalid builders.json, builders key not found.');
@@ -48,8 +67,8 @@ class TestingArchitectHost {
             if (!b.implementation) {
                 continue;
             }
-            const handler = (await Promise.resolve().then(() => require(builderJsonPath + '/../' + b.implementation))).default;
-            const optionsSchema = await Promise.resolve().then(() => require(builderJsonPath + '/../' + b.schema));
+            const handler = (await Promise.resolve().then(() => __importStar(require(builderJsonPath + '/../' + b.implementation)))).default;
+            const optionsSchema = await Promise.resolve().then(() => __importStar(require(builderJsonPath + '/../' + b.schema)));
             this.addBuilder(`${packageJson.name}:${builderName}`, handler, b.description, optionsSchema);
         }
     }