@smapiot/pilet-template-angular 1.0.6 → 1.0.7-beta.6258

package/lib/index.js

@@ -43,6 +43,167 @@ var __toCommonJS = /* @__PURE__ */ ((cache) => {
   };
 })(typeof WeakMap !== "undefined" ? /* @__PURE__ */ new WeakMap() : 0);
 
+// ../../packages/template-utils/lib/log.js
+var require_log = __commonJS({
+  "../../packages/template-utils/lib/log.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.log = exports.setLogLevel = void 0;
+    var logLevel = "warn";
+    function setLogLevel(level) {
+      logLevel = level;
+    }
+    exports.setLogLevel = setLogLevel;
+    function log2(level, message) {
+      if (level === "error") {
+        if (logLevel !== "disabled") {
+          console.error(`[template] ${message}`);
+        }
+      } else if (level === "warn") {
+        if (logLevel !== "error" && logLevel !== "disabled") {
+          console.warn(`[template] ${message}`);
+        }
+      } else if (level === "info") {
+        if (logLevel === "verbose" || logLevel === "info") {
+          console.info(`[template] ${message}`);
+        }
+      } else if (level === "verbose") {
+        if (logLevel === "verbose") {
+          console.log(`[template] ${message}`);
+        }
+      }
+    }
+    exports.log = log2;
+  }
+});
+
+// ../../packages/template-utils/lib/utils.js
+var require_utils = __commonJS({
+  "../../packages/template-utils/lib/utils.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.getLanguageExtension = exports.getPlugins = exports.getPiralInstance = exports.getProjectJson = exports.getPackageJsonWithSource = exports.makeRelative = void 0;
+    var path_1 = require("path");
+    var fs_1 = require("fs");
+    var log_1 = require_log();
+    function makeRelative(path, root2) {
+      const relPath = (0, path_1.isAbsolute)(path) ? (0, path_1.relative)(root2, path) : path;
+      return relPath.split(path_1.sep).join(path_1.posix.sep);
+    }
+    exports.makeRelative = makeRelative;
+    function getPackageJsonWithSource(root2, targetDir, fileName) {
+      const path = makeRelative(path_1.posix.join(targetDir, fileName), root2);
+      (0, log_1.log)("verbose", `Adding "source" to package.json: "${path}"`);
+      return {
+        languages: ["ts", "js"],
+        name: "package.json",
+        content: JSON.stringify({ source: path }),
+        target: "<root>/package.json"
+      };
+    }
+    exports.getPackageJsonWithSource = getPackageJsonWithSource;
+    function getProjectJson(root2) {
+      try {
+        return require(`${root2}/package.json`);
+      } catch (ex) {
+        (0, log_1.log)("error", `Error when reading the "package.json": ${ex}`);
+      }
+      return void 0;
+    }
+    exports.getProjectJson = getProjectJson;
+    function getPiralInstance2(root2, sourceName) {
+      try {
+        const packageJsonPath = require.resolve(`${sourceName}/package.json`, {
+          paths: [root2]
+        });
+        (0, log_1.log)("verbose", `Found package JSON in "${packageJsonPath}"`);
+        const sourcePath = (0, path_1.dirname)(packageJsonPath);
+        const details = require(packageJsonPath);
+        const types = details.types || details.typings;
+        (0, log_1.log)("verbose", `Looking for types in "${types}"`);
+        const typingsPath = types !== void 0 ? (0, path_1.resolve)(sourcePath, types) : void 0;
+        const app = details.app;
+        (0, log_1.log)("verbose", `Looking for types in "${app}"`);
+        const appPath = app !== void 0 ? (0, path_1.resolve)(sourcePath, app) : void 0;
+        return {
+          sourceName,
+          sourcePath,
+          details,
+          appPath,
+          typingsPath
+        };
+      } catch (ex) {
+        (0, log_1.log)("error", `Error when getting Piral instance: ${ex}`);
+      }
+      return void 0;
+    }
+    exports.getPiralInstance = getPiralInstance2;
+    function getPlugins(root2, sourceName) {
+      const plugins = {};
+      (0, log_1.log)("verbose", `Getting the plugins of "${sourceName}/package.json" ...`);
+      const piralInstance = getPiralInstance2(root2, sourceName);
+      const typingsPath = piralInstance === null || piralInstance === void 0 ? void 0 : piralInstance.typingsPath;
+      if (typingsPath) {
+        (0, log_1.log)("verbose", `Reading file in "${typingsPath}"`);
+        const typing = (0, fs_1.readFileSync)(typingsPath, "utf8");
+        const match = /export interface PiletCustomApi extends (.*?) \{/g.exec(typing);
+        if (!match) {
+          (0, log_1.log)("verbose", `No Piral instance plugins have been found`);
+          return [];
+        }
+        const apis = match[1].split(", ");
+        (0, log_1.log)("verbose", `Found Piral instance plugins "${match[1]}"`);
+        for (const api of apis) {
+          const pluginMatch = /^Pilet(.*)Api$/.exec(api);
+          if (pluginMatch) {
+            const name = pluginMatch[1].toLowerCase();
+            plugins[name] = true;
+          } else {
+            (0, log_1.log)("warn", `Could not find plugin for Pilet API "${api}"`);
+          }
+        }
+      }
+      return plugins;
+    }
+    exports.getPlugins = getPlugins;
+    function getLanguageExtension(language, isJsx = true) {
+      switch (language) {
+        case "js":
+          return isJsx ? ".jsx" : ".js";
+        case "ts":
+        default:
+          return isJsx ? ".tsx" : ".ts";
+      }
+    }
+    exports.getLanguageExtension = getLanguageExtension;
+  }
+});
+
+// ../../packages/template-utils/lib/bundler.js
+var require_bundler = __commonJS({
+  "../../packages/template-utils/lib/bundler.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.detectBundler = void 0;
+    var utils_1 = require_utils();
+    function detectBundler(root2) {
+      const projectJson = (0, utils_1.getProjectJson)(root2);
+      const devDependencies = projectJson === null || projectJson === void 0 ? void 0 : projectJson.devDependencies;
+      if (projectJson) {
+        const bundlers = ["esbuild", "webpack5", "webpack", "vite", "parcel2", "parcel", "bun", "rspack", "rollup"];
+        for (const bundler of bundlers) {
+          const dependencyName = `piral-cli-${bundler}`;
+          if (dependencyName in devDependencies) {
+            return bundler;
+          }
+        }
+      }
+      return "xbuild";
+    }
+    exports.detectBundler = detectBundler;
+  }
+});
+
 // ../../packages/template-utils/lib/merge.js
 var require_merge = __commonJS({
   "../../packages/template-utils/lib/merge.js"(exports) {
@@ -140,40 +301,6 @@ var require_io = __commonJS({
   }
 });
 
-// ../../packages/template-utils/lib/log.js
-var require_log = __commonJS({
-  "../../packages/template-utils/lib/log.js"(exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.log = exports.setLogLevel = void 0;
-    var logLevel = "warn";
-    function setLogLevel(level) {
-      logLevel = level;
-    }
-    exports.setLogLevel = setLogLevel;
-    function log2(level, message) {
-      if (level === "error") {
-        if (logLevel !== "disabled") {
-          console.error(`[template] ${message}`);
-        }
-      } else if (level === "warn") {
-        if (logLevel !== "error" && logLevel !== "disabled") {
-          console.warn(`[template] ${message}`);
-        }
-      } else if (level === "info") {
-        if (logLevel === "verbose" || logLevel === "info") {
-          console.info(`[template] ${message}`);
-        }
-      } else if (level === "verbose") {
-        if (logLevel === "verbose") {
-          console.log(`[template] ${message}`);
-        }
-      }
-    }
-    exports.log = log2;
-  }
-});
-
 // ../../packages/template-utils/lib/version.js
 var require_version = __commonJS({
   "../../packages/template-utils/lib/version.js"(exports) {
@@ -364,7 +491,7 @@ var require_parent = __commonJS({
 });
 
 // ../../node_modules/ejs/lib/utils.js
-var require_utils = __commonJS({
+var require_utils2 = __commonJS({
   "../../node_modules/ejs/lib/utils.js"(exports) {
     "use strict";
     var regExpChars = /[|\\{}()[\]^$+*?.]/g;
@@ -486,7 +613,7 @@ var require_ejs = __commonJS({
     "use strict";
     var fs = require("fs");
     var path = require("path");
-    var utils = require_utils();
+    var utils = require_utils2();
     var scopeOptionWarned = false;
     var _VERSION_STRING = require_package().version;
     var _DEFAULT_OPEN_DELIMITER = "<";
@@ -1041,108 +1168,6 @@ var require_ejs = __commonJS({
   }
 });
 
-// ../../packages/template-utils/lib/utils.js
-var require_utils2 = __commonJS({
-  "../../packages/template-utils/lib/utils.js"(exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.getLanguageExtension = exports.getPlugins = exports.getPiralInstance = exports.getProjectJson = exports.getPackageJsonWithSource = exports.makeRelative = void 0;
-    var path_1 = require("path");
-    var fs_1 = require("fs");
-    var log_1 = require_log();
-    function makeRelative(path, root2) {
-      const relPath = (0, path_1.isAbsolute)(path) ? (0, path_1.relative)(root2, path) : path;
-      return relPath.split(path_1.sep).join(path_1.posix.sep);
-    }
-    exports.makeRelative = makeRelative;
-    function getPackageJsonWithSource(root2, targetDir, fileName) {
-      const path = makeRelative(path_1.posix.join(targetDir, fileName), root2);
-      (0, log_1.log)("verbose", `Adding "source" to package.json: "${path}"`);
-      return {
-        languages: ["ts", "js"],
-        name: "package.json",
-        content: JSON.stringify({ source: path }),
-        target: "<root>/package.json"
-      };
-    }
-    exports.getPackageJsonWithSource = getPackageJsonWithSource;
-    function getProjectJson(root2) {
-      try {
-        return require(`${root2}/package.json`);
-      } catch (ex) {
-        (0, log_1.log)("error", `Error when reading the "package.json": ${ex}`);
-      }
-      return void 0;
-    }
-    exports.getProjectJson = getProjectJson;
-    function getPiralInstance2(root2, sourceName) {
-      try {
-        const packageJsonPath = require.resolve(`${sourceName}/package.json`, {
-          paths: [root2]
-        });
-        (0, log_1.log)("verbose", `Found package JSON in "${packageJsonPath}"`);
-        const sourcePath = (0, path_1.dirname)(packageJsonPath);
-        const details = require(packageJsonPath);
-        const types = details.types || details.typings;
-        (0, log_1.log)("verbose", `Looking for types in "${types}"`);
-        const typingsPath = types !== void 0 ? (0, path_1.resolve)(sourcePath, types) : void 0;
-        const app = details.app;
-        (0, log_1.log)("verbose", `Looking for types in "${app}"`);
-        const appPath = app !== void 0 ? (0, path_1.resolve)(sourcePath, app) : void 0;
-        return {
-          sourceName,
-          sourcePath,
-          details,
-          appPath,
-          typingsPath
-        };
-      } catch (ex) {
-        (0, log_1.log)("error", `Error when getting Piral instance: ${ex}`);
-      }
-      return void 0;
-    }
-    exports.getPiralInstance = getPiralInstance2;
-    function getPlugins(root2, sourceName) {
-      const plugins = {};
-      (0, log_1.log)("verbose", `Getting the plugins of "${sourceName}/package.json" ...`);
-      const piralInstance = getPiralInstance2(root2, sourceName);
-      const typingsPath = piralInstance === null || piralInstance === void 0 ? void 0 : piralInstance.typingsPath;
-      if (typingsPath) {
-        (0, log_1.log)("verbose", `Reading file in "${typingsPath}"`);
-        const typing = (0, fs_1.readFileSync)(typingsPath, "utf8");
-        const match = /export interface PiletCustomApi extends (.*?) \{/g.exec(typing);
-        if (!match) {
-          (0, log_1.log)("verbose", `No Piral instance plugins have been found`);
-          return [];
-        }
-        const apis = match[1].split(", ");
-        (0, log_1.log)("verbose", `Found Piral instance plugins "${match[1]}"`);
-        for (const api of apis) {
-          const pluginMatch = /^Pilet(.*)Api$/.exec(api);
-          if (pluginMatch) {
-            const name = pluginMatch[1].toLowerCase();
-            plugins[name] = true;
-          } else {
-            (0, log_1.log)("warn", `Could not find plugin for Pilet API "${api}"`);
-          }
-        }
-      }
-      return plugins;
-    }
-    exports.getPlugins = getPlugins;
-    function getLanguageExtension(language, isJsx = true) {
-      switch (language) {
-        case "js":
-          return isJsx ? ".jsx" : ".js";
-        case "ts":
-        default:
-          return isJsx ? ".tsx" : ".ts";
-      }
-    }
-    exports.getLanguageExtension = getLanguageExtension;
-  }
-});
-
 // ../../packages/template-utils/lib/template.js
 var require_template = __commonJS({
   "../../packages/template-utils/lib/template.js"(exports) {
@@ -1179,7 +1204,7 @@ var require_template = __commonJS({
     var path_1 = require("path");
     var ejs_1 = require_ejs();
     var log_1 = require_log();
-    var utils_1 = require_utils2();
+    var utils_1 = require_utils();
     var findVariable = /<(\w+)>/g;
     function replaceVariables(str, data) {
       let match = findVariable.exec(str);
@@ -1274,7 +1299,7 @@ var require_factory = __commonJS({
     var io_1 = require_io();
     var parent_1 = require_parent();
     var template_1 = require_template();
-    var utils_1 = require_utils2();
+    var utils_1 = require_utils();
     function createPiletTemplateFactory2(templateRoot, getAllSources, defaultArgs = {}) {
       const sourceDir = (0, path_1.resolve)(templateRoot, "templates");
       return (projectRoot, args, details) => __awaiter(this, void 0, void 0, function* () {
@@ -1356,11 +1381,12 @@ var require_lib = __commonJS({
           __createBinding(exports2, m, p);
     };
     Object.defineProperty(exports, "__esModule", { value: true });
+    __exportStar(require_bundler(), exports);
     __exportStar(require_factory(), exports);
     __exportStar(require_log(), exports);
     __exportStar(require_template(), exports);
     __exportStar(require_types(), exports);
-    __exportStar(require_utils2(), exports);
+    __exportStar(require_utils(), exports);
   }
 });
 
@@ -1387,7 +1413,8 @@ var tsVersions = {
   13: "~4.4",
   14: "~4.7",
   15: "~4.8",
-  16: "~4.9"
+  16: "~4.9",
+  17: "~5.2"
 };
 var rxjsVersions = {
   2: "^5.0",
@@ -1403,7 +1430,8 @@ var rxjsVersions = {
   13: "^7.4",
   14: "^7.4",
   15: "^7.4",
-  16: "^7.4"
+  16: "^7.4",
+  17: "^7.4"
 };
 var zoneVersions = {
   2: "~0.9",
@@ -1419,7 +1447,8 @@ var zoneVersions = {
   13: "0.11.4",
   14: "0.12.0",
   15: "0.13.0",
-  16: "0.13.0"
+  16: "0.13.0",
+  17: "0.14.0"
 };
 
 // src/helpers.ts
@@ -1435,14 +1464,14 @@ function detectNgVersion(piralInstance) {
   const dependencies = ((_a = piralInstance == null ? void 0 : piralInstance.details) == null ? void 0 : _a.dependencies) || {};
   const devDependencies = ((_b = piralInstance == null ? void 0 : piralInstance.details) == null ? void 0 : _b.devDependencies) || {};
   const allDependencies = __spreadValues(__spreadValues({}, devDependencies), dependencies);
-  const version = allDependencies["@angular/core"] || "16.0.0";
+  const version = allDependencies["@angular/core"] || "17.0.0";
   if (typeof version === "string") {
     const result = /\d+/.exec(version);
     if (result) {
       return +result[0];
     }
   }
-  return 16;
+  return 17;
 }
 function isKnownVersion(majorNgVersion) {
   return typeof zoneVersions[majorNgVersion] !== "undefined";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smapiot/pilet-template-angular",
-  "version": "1.0.6",
+  "version": "1.0.7-beta.6258",
   "description": "Official scaffolding template for pilets: 'angular'.",
   "keywords": [
     "piral-cli",
@@ -24,7 +24,7 @@
     },
     "ngVersion": {
       "description": "Defines the (major) version of Angular to use in case of a standalone pilet.",
-      "default": 16,
+      "default": 17,
       "type": "number"
     }
   },
@@ -54,7 +54,7 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "devDependencies": {
-    "@smapiot/template-utils": "^1.0.6"
+    "@smapiot/template-utils": "1.0.7-beta.6258"
   },
-  "gitHead": "c6054aeb4c9a82a079bc3cb71d3076c264d7cde2"
+  "gitHead": "0af617390450f6cd8daf2fa32c7cbcccdc3cb994"
 }

package/src/helpers.ts

@@ -11,7 +11,7 @@ export function detectNgVersion(piralInstance: { details: any }) {
   const dependencies = piralInstance?.details?.dependencies || {};
   const devDependencies = piralInstance?.details?.devDependencies || {};
   const allDependencies = { ...devDependencies, ...dependencies };
-  const version = allDependencies['@angular/core'] || '16.0.0';
+  const version = allDependencies['@angular/core'] || '17.0.0';
 
   if (typeof version === 'string') {
     const result = /\d+/.exec(version);
@@ -22,7 +22,7 @@ export function detectNgVersion(piralInstance: { details: any }) {
     }
   }
 
-  return 16;
+  return 17;
 }
 
 export function isKnownVersion(majorNgVersion: number) {

package/src/versions.ts

@@ -14,6 +14,7 @@ export const tsVersions = {
   14: '~4.7',
   15: '~4.8',
   16: '~4.9',
+  17: '~5.2',
 };
 
 // Mapping of Angular to RxJs versions
@@ -32,6 +33,7 @@ export const rxjsVersions = {
   14: '^7.4',
   15: '^7.4',
   16: '^7.4',
+  17: '^7.4',
 };
 
 // Mapping of Angular to Zone.js versions
@@ -50,4 +52,5 @@ export const zoneVersions = {
   14: '0.12.0',
   15: '0.13.0',
   16: '0.13.0',
+  17: '0.14.0',
 };