@smapiot/pilet-template-angular 0.15.4 → 0.15.6-beta.5446

package/lib/index.js

@@ -1362,6 +1362,53 @@ __export(src_exports, {
 var import_path = require("path");
 var import_template_utils = __toESM(require_lib());
 
+// src/versions.ts
+var tsVersions = {
+  2: "~2.0",
+  4: "~2.1",
+  5: "2.4.2",
+  6: "~2.7",
+  7: "~3.1",
+  8: "~3.4",
+  9: "~3.8",
+  10: "~3.9",
+  11: "~4.0",
+  12: "~4.2",
+  13: "~4.4",
+  14: "~4.7",
+  15: "~4.8"
+};
+var rxjsVersions = {
+  2: "^5.0",
+  4: "^5.0",
+  5: "^5.0",
+  6: "~6.0",
+  7: "^6.3",
+  8: "^6.4",
+  9: "^6.5",
+  10: "^6.5",
+  11: "^6.5",
+  12: "^6.5",
+  13: "^7.4",
+  14: "^7.4",
+  15: "^7.4"
+};
+var zoneVersions = {
+  2: "~0.9",
+  4: "~0.9",
+  5: "~0.9",
+  6: "~0.9",
+  7: "~0.9",
+  8: "~0.9",
+  9: "~0.9",
+  10: "~0.9",
+  11: "~0.9",
+  12: "0.11.4",
+  13: "0.11.4",
+  14: "0.12.0",
+  15: "0.13.0"
+};
+
 // src/helpers.ts
 function detectMode(piralInstance) {
   var _a, _b;
@@ -1384,7 +1431,7 @@ function detectNgVersion(piralInstance) {
   }
   return 14;
 }
-function getStandalonePackageJson(cliVersion, ngVersion) {
+function getStandalonePackageJson(cliVersion, ngVersion, majorNgVersion) {
   return {
     importmap: {
       imports: {
@@ -1405,8 +1452,8 @@ function getStandalonePackageJson(cliVersion, ngVersion) {
       "@angular/router": ngVersion,
       "piral-ng": cliVersion,
       "core-js": "^3.19.0",
-      rxjs: "~7.4",
-      "zone.js": "~0.11"
+      rxjs: rxjsVersions[majorNgVersion] || "^7.4",
+      "zone.js": zoneVersions[majorNgVersion] || "^0.13"
     },
     devDependencies: {
       "@angular/compiler-cli": ngVersion,
@@ -1414,11 +1461,12 @@ function getStandalonePackageJson(cliVersion, ngVersion) {
       "@ngtools/webpack": ngVersion,
       "copy-webpack-plugin": "^10",
       "html-loader": "^3",
-      "to-string-loader": "^1"
+      "to-string-loader": "^1",
+      typescript: tsVersions[majorNgVersion] || "latest"
     }
   };
 }
-function getStandardPackageJson(cliVersion, ngVersion) {
+function getStandardPackageJson(cliVersion, ngVersion, majorNgVersion) {
   return {
     devDependencies: {
       "@angular/compiler-cli": ngVersion,
@@ -1426,7 +1474,8 @@ function getStandardPackageJson(cliVersion, ngVersion) {
       "copy-webpack-plugin": "^10",
       "html-loader": "^3",
       "to-string-loader": "^1",
-      "piral-ng": cliVersion
+      "piral-ng": cliVersion,
+      typescript: tsVersions[majorNgVersion] || "latest"
     }
   };
 }
@@ -1441,9 +1490,11 @@ var src_default = (0, import_template_utils.createPiletTemplateFactory)(root, (p
   }
   if (typeof args.ngVersion !== "number") {
     args.ngVersion = detectNgVersion(piralInstance);
+  } else if (args.ngVersion !== detectNgVersion(piralInstance)) {
+    args.standalone = true;
   }
   const ngVersion = `^${args.ngVersion}`;
-  const packageJson = args.standalone ? getStandalonePackageJson(details.cliVersion, ngVersion) : getStandardPackageJson(details.cliVersion, ngVersion);
+  const packageJson = args.standalone ? getStandalonePackageJson(details.cliVersion, ngVersion, args.ngVersion) : getStandardPackageJson(details.cliVersion, ngVersion, args.ngVersion);
   return [
     {
       languages: ["ts", "js"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smapiot/pilet-template-angular",
-  "version": "0.15.4",
+  "version": "0.15.6-beta.5446",
   "description": "Official scaffolding template for pilets: 'angular'.",
   "keywords": [
     "piral-cli",
@@ -54,7 +54,7 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "devDependencies": {
-    "@smapiot/template-utils": "^0.15.4"
+    "@smapiot/template-utils": "0.15.6-beta.5446"
   },
-  "gitHead": "c7d21e5bd76b9878f610c62e4865186280d70094"
+  "gitHead": "105b1d32dc1c97d649503edfb0b2ffc5236c404e"
 }

package/src/helpers.ts

@@ -1,3 +1,5 @@
+import { rxjsVersions, tsVersions, zoneVersions } from './versions';
+
 export function detectMode(piralInstance: { details: any }) {
   const dependencies = piralInstance?.details?.dependencies || {};
   const devDependencies = piralInstance?.details?.devDependencies || {};
@@ -23,7 +25,7 @@ export function detectNgVersion(piralInstance: { details: any }) {
   return 14;
 }
 
-export function getStandalonePackageJson(cliVersion: string, ngVersion: string) {
+export function getStandalonePackageJson(cliVersion: string, ngVersion: string, majorNgVersion: number) {
   return {
     importmap: {
       imports: {
@@ -44,8 +46,8 @@ export function getStandalonePackageJson(cliVersion: string, ngVersion: string)
       '@angular/router': ngVersion,
       'piral-ng': cliVersion,
       'core-js': '^3.19.0',
-      rxjs: '~7.4',
-      'zone.js': '~0.11',
+      rxjs: rxjsVersions[majorNgVersion] || '^7.4',
+      'zone.js': zoneVersions[majorNgVersion] || '^0.13',
     },
     devDependencies: {
       '@angular/compiler-cli': ngVersion,
@@ -54,11 +56,12 @@ export function getStandalonePackageJson(cliVersion: string, ngVersion: string)
       'copy-webpack-plugin': '^10',
       'html-loader': '^3',
       'to-string-loader': '^1',
+      typescript: tsVersions[majorNgVersion] || 'latest',
     },
   };
 }
 
-export function getStandardPackageJson(cliVersion: string, ngVersion: string) {
+export function getStandardPackageJson(cliVersion: string, ngVersion: string, majorNgVersion: number) {
   return {
     devDependencies: {
       '@angular/compiler-cli': ngVersion,
@@ -67,6 +70,7 @@ export function getStandardPackageJson(cliVersion: string, ngVersion: string) {
       'html-loader': '^3',
       'to-string-loader': '^1',
       'piral-ng': cliVersion,
+      typescript: tsVersions[majorNgVersion] || 'latest',
     },
   };
 }

package/src/index.ts

@@ -19,12 +19,14 @@ export default createPiletTemplateFactory<AngularPiletArgs>(root, (projectRoot,
 
   if (typeof args.ngVersion !== 'number') {
     args.ngVersion = detectNgVersion(piralInstance);
+  } else if (args.ngVersion !== detectNgVersion(piralInstance)) {
+    args.standalone = true;
   }
 
   const ngVersion = `^${args.ngVersion}`;
   const packageJson = args.standalone
-    ? getStandalonePackageJson(details.cliVersion, ngVersion)
-    : getStandardPackageJson(details.cliVersion, ngVersion);
+    ? getStandalonePackageJson(details.cliVersion, ngVersion, args.ngVersion)
+    : getStandardPackageJson(details.cliVersion, ngVersion, args.ngVersion);
 
   return [
     {

package/src/versions.ts

@@ -0,0 +1,50 @@
+// Mapping of Angular to TypeScript versions
+export const tsVersions = {
+  2: '~2.0',
+  4: '~2.1',
+  5: '2.4.2',
+  6: '~2.7',
+  7: '~3.1',
+  8: '~3.4',
+  9: '~3.8',
+  10: '~3.9',
+  11: '~4.0',
+  12: '~4.2',
+  13: '~4.4',
+  14: '~4.7',
+  15: '~4.8',
+};
+
+// Mapping of Angular to RxJs versions
+export const rxjsVersions = {
+  2: '^5.0',
+  4: '^5.0',
+  5: '^5.0',
+  6: '~6.0',
+  7: '^6.3',
+  8: '^6.4',
+  9: '^6.5',
+  10: '^6.5',
+  11: '^6.5',
+  12: '^6.5',
+  13: '^7.4',
+  14: '^7.4',
+  15: '^7.4',
+};
+
+// Mapping of Angular to Zone.js versions
+export const zoneVersions = {
+  2: '~0.9',
+  4: '~0.9',
+  5: '~0.9',
+  6: '~0.9',
+  7: '~0.9',
+  8: '~0.9',
+  9: '~0.9',
+  10: '~0.9',
+  11: '~0.9',
+  12: '0.11.4',
+  13: '0.11.4',
+  14: '0.12.0',
+  15: '0.13.0',
+};