@smapiot/pilet-template-angular 1.0.16-beta.8201 → 1.0.17

package/lib/index.js

@@ -1430,7 +1430,7 @@ var require_types = __commonJS({
 var require_lib = __commonJS({
   "../../packages/template-utils/lib/index.js"(exports2) {
     "use strict";
-    var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
+    var __createBinding = exports2 && exports2.__createBinding || (Object.create ? (function(o, m, k, k2) {
       if (k2 === void 0) k2 = k;
       var desc = Object.getOwnPropertyDescriptor(m, k);
       if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
@@ -1439,10 +1439,10 @@ var require_lib = __commonJS({
         } };
       }
       Object.defineProperty(o, k2, desc);
-    } : function(o, m, k, k2) {
+    }) : (function(o, m, k, k2) {
       if (k2 === void 0) k2 = k;
       o[k2] = m[k];
-    });
+    }));
     var __exportStar = exports2 && exports2.__exportStar || function(m, exports3) {
       for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports3, p)) __createBinding(exports3, m, p);
     };
@@ -1484,7 +1484,8 @@ var tsVersions = {
   17: "~5.2",
   18: "~5.5",
   19: "~5.7",
-  20: "~5.8"
+  20: "~5.8",
+  21: "~5.9"
 };
 var rxjsVersions = {
   2: "^5.0",
@@ -1504,7 +1505,8 @@ var rxjsVersions = {
   17: "^7.4",
   18: "^7.4",
   19: "^7.4",
-  20: "^7.4"
+  20: "^7.4",
+  21: "^7.4"
 };
 var zoneVersions = {
   2: "~0.9",
@@ -1524,7 +1526,8 @@ var zoneVersions = {
   17: "~0.14",
   18: "~0.14",
   19: "~0.15",
-  20: "~0.15"
+  20: "~0.15",
+  21: false
 };
 
 // src/helpers.ts
@@ -1538,7 +1541,7 @@ function detectNgVersion(piralInstance) {
   const dependencies = piralInstance?.details?.dependencies || {};
   const devDependencies = piralInstance?.details?.devDependencies || {};
   const allDependencies = { ...devDependencies, ...dependencies };
-  const version = allDependencies["@angular/core"] || "18.0.0";
+  const version = allDependencies["@angular/core"] || "20.0.0";
   if (typeof version === "string") {
     const result = /\d+/.exec(version);
     if (result) {
@@ -1551,6 +1554,8 @@ function isKnownVersion(majorNgVersion) {
   return typeof zoneVersions[majorNgVersion] !== "undefined";
 }
 function getStandalonePackageJson(cliVersion, ngVersion, majorNgVersion) {
+  const zoneVersion = zoneVersions[majorNgVersion];
+  const extraDeps = typeof zoneVersion === "string" ? { "zone.js": zoneVersion } : {};
   return {
     importmap: {
       imports: {
@@ -1574,7 +1579,7 @@ function getStandalonePackageJson(cliVersion, ngVersion, majorNgVersion) {
       "piral-ng-common": ngVersion,
       "core-js": "^3",
       rxjs: rxjsVersions[majorNgVersion] || "^7.4",
-      "zone.js": zoneVersions[majorNgVersion] || "^0.14"
+      ...extraDeps
     },
     devDependencies: {
       "@angular/compiler-cli": ngVersion,
@@ -1589,6 +1594,7 @@ function getStandalonePackageJson(cliVersion, ngVersion, majorNgVersion) {
 }
 function getStandardPackageJson(cliVersion, ngVersion, majorNgVersion) {
   return {
+    dependencies: {},
     devDependencies: {
       "@angular/compiler-cli": ngVersion,
       "@angular/cli": ngVersion,
@@ -1631,6 +1637,7 @@ var index_default = (0, import_template_utils.createPiletTemplateFactory)(root,
   }
   const ngVersion = `^${args.ngVersion}`;
   const packageJson = args.standalone ? getStandalonePackageJson(details.cliVersion, ngVersion, args.ngVersion) : getStandardPackageJson(details.cliVersion, ngVersion, args.ngVersion);
+  args.withZone = "zone.js" in packageJson.dependencies;
   const templates = [
     {
       languages: ["ts", "js"],
@@ -1685,13 +1692,11 @@ var index_default = (0, import_template_utils.createPiletTemplateFactory)(root,
     }
   ];
   if (args.ngStandalone) {
-    templates.push(
-      {
-        languages: ["ts"],
-        name: "index.standalone.tsx",
-        target: "<src>/index.tsx"
-      }
-    );
+    templates.push({
+      languages: ["ts"],
+      name: "index.standalone.tsx",
+      target: "<src>/index.tsx"
+    });
   } else {
     templates.push(
       {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smapiot/pilet-template-angular",
-  "version": "1.0.16-beta.8201",
+  "version": "1.0.17",
   "description": "Official scaffolding template for pilets: 'angular'.",
   "keywords": [
     "piral-cli",
@@ -29,7 +29,7 @@
     },
     "ngVersion": {
       "description": "Defines the (major) version of Angular to use in case of a standalone pilet.",
-      "default": 18,
+      "default": 20,
       "type": "number"
     }
   },
@@ -59,7 +59,7 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "devDependencies": {
-    "@smapiot/template-utils": "1.0.16-beta.8201"
+    "@smapiot/template-utils": "^1.0.17"
   },
-  "gitHead": "78432f37de2afe7424f33ab54d76c2222fb3872c"
+  "gitHead": "eb7210cf002ada02748dde32b715bc88cc85276c"
 }

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'] || '18.0.0';
+  const version = allDependencies['@angular/core'] || '20.0.0';
 
   if (typeof version === 'string') {
     const result = /\d+/.exec(version);
@@ -30,6 +30,9 @@ export function isKnownVersion(majorNgVersion: number) {
 }
 
 export function getStandalonePackageJson(cliVersion: string, ngVersion: string, majorNgVersion: number) {
+  const zoneVersion = zoneVersions[majorNgVersion];
+  const extraDeps = typeof zoneVersion === 'string' ? { 'zone.js': zoneVersion } : {};
+
   return {
     importmap: {
       imports: {
@@ -53,7 +56,7 @@ export function getStandalonePackageJson(cliVersion: string, ngVersion: string,
       'piral-ng-common': ngVersion,
       'core-js': '^3',
       rxjs: rxjsVersions[majorNgVersion] || '^7.4',
-      'zone.js': zoneVersions[majorNgVersion] || '^0.14',
+      ...extraDeps,
     },
     devDependencies: {
       '@angular/compiler-cli': ngVersion,
@@ -69,6 +72,7 @@ export function getStandalonePackageJson(cliVersion: string, ngVersion: string,
 
 export function getStandardPackageJson(cliVersion: string, ngVersion: string, majorNgVersion: number) {
   return {
+    dependencies: {},
     devDependencies: {
       '@angular/compiler-cli': ngVersion,
       '@angular/cli': ngVersion,

package/src/index.ts

@@ -14,6 +14,7 @@ interface AngularPiletArgs {
   standalone: boolean;
   ngVersion: number;
   ngStandalone: boolean;
+  withZone?: boolean;
 }
 
 export default createPiletTemplateFactory<AngularPiletArgs>(root, (projectRoot, args, details) => {
@@ -52,6 +53,8 @@ export default createPiletTemplateFactory<AngularPiletArgs>(root, (projectRoot,
     ? getStandalonePackageJson(details.cliVersion, ngVersion, args.ngVersion)
     : getStandardPackageJson(details.cliVersion, ngVersion, args.ngVersion);
 
+  args.withZone = 'zone.js' in packageJson.dependencies;
+
   const templates: Array<PiletTemplateSource> = [
     {
       languages: ['ts', 'js'],
@@ -107,13 +110,11 @@ export default createPiletTemplateFactory<AngularPiletArgs>(root, (projectRoot,
   ];
 
   if (args.ngStandalone) {
-    templates.push(
-      {
-        languages: ['ts'],
-        name: 'index.standalone.tsx',
-        target: '<src>/index.tsx',
-      },
-    );
+    templates.push({
+      languages: ['ts'],
+      name: 'index.standalone.tsx',
+      target: '<src>/index.tsx',
+    });
   } else {
     templates.push(
       {

package/src/versions.ts

@@ -20,6 +20,7 @@ export const tsVersions = {
   18: '~5.5',
   19: '~5.7',
   20: '~5.8',
+  21: '~5.9',
 };
 
 // Mapping of Angular to RxJs versions
@@ -42,6 +43,7 @@ export const rxjsVersions = {
   18: '^7.4',
   19: '^7.4',
   20: '^7.4',
+  21: '^7.4',
 };
 
 // Mapping of Angular to Zone.js versions
@@ -64,4 +66,5 @@ export const zoneVersions = {
   18: '~0.14',
   19: '~0.15',
   20: '~0.15',
+  21: false,
 };

package/templates/index.standalone.tsx.ejs

@@ -1,5 +1,7 @@
 import 'core-js/proposals/reflect-metadata';
+<% if (withZone) { -%>
 import 'zone.js';
+<% } -%>
 import { createConverter } from 'piral-ng/standalone';
 import { provideRouter } from '@angular/router';
 import type { ApplicationConfig } from '@angular/core';