@smapiot/pilet-template-angular 1.0.2 → 1.0.4

package/README.md

@@ -24,7 +24,7 @@ npm init pilet -- --source <app-shell> --template angular <other-options>
 The following variables are available when scaffolding. They can be applied via the CLI flags, e.g.,
 
 ```sh
-pilet new <app-shell> --template angular --vars.standalone true --vars.ngVersion 14
+pilet new <app-shell> --template angular --vars.standalone true --vars.ngVersion 16
 ```
 
 For this template we have:

package/lib/index.js

@@ -151,7 +151,7 @@ var require_log = __commonJS({
       logLevel = level;
     }
     exports.setLogLevel = setLogLevel;
-    function log(level, message) {
+    function log2(level, message) {
       if (level === "error") {
         if (logLevel !== "disabled") {
           console.error(`[template] ${message}`);
@@ -170,7 +170,7 @@ var require_log = __commonJS({
         }
       }
     }
-    exports.log = log;
+    exports.log = log2;
   }
 });
 
@@ -1348,6 +1348,7 @@ var require_lib = __commonJS({
     };
     Object.defineProperty(exports, "__esModule", { value: true });
     __exportStar(require_factory(), exports);
+    __exportStar(require_log(), exports);
     __exportStar(require_template(), exports);
     __exportStar(require_types(), exports);
     __exportStar(require_utils2(), exports);
@@ -1425,25 +1426,29 @@ 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"] || "14.0.0";
+  const version = allDependencies["@angular/core"] || "16.0.0";
   if (typeof version === "string") {
     const result = /\d+/.exec(version);
     if (result) {
       return +result[0];
     }
   }
-  return 14;
+  return 16;
+}
+function isKnownVersion(majorNgVersion) {
+  return typeof zoneVersions[majorNgVersion] !== "undefined";
 }
 function getStandalonePackageJson(cliVersion, ngVersion, majorNgVersion) {
   return {
     importmap: {
       imports: {
-        "@angular/common": "@angular/common",
-        "@angular/compiler": "@angular/compiler",
-        "@angular/core": "@angular/core",
-        "@angular/platform-browser": "@angular/platform-browser",
-        "@angular/platform-browser-dynamic": "@angular/platform-browser-dynamic",
-        "@angular/router": "@angular/router"
+        "@angular/common": "",
+        "@angular/compiler": "",
+        "@angular/core": "",
+        "@angular/platform-browser": "",
+        "@angular/platform-browser-dynamic": "",
+        "@angular/router": "",
+        "piral-ng-common": ""
       }
     },
     dependencies: {
@@ -1454,6 +1459,7 @@ function getStandalonePackageJson(cliVersion, ngVersion, majorNgVersion) {
       "@angular/platform-browser-dynamic": ngVersion,
       "@angular/router": ngVersion,
       "piral-ng": cliVersion,
+      "piral-ng-common": ngVersion,
       "core-js": "^3.19.0",
       rxjs: rxjsVersions[majorNgVersion] || "^7.4",
       "zone.js": zoneVersions[majorNgVersion] || "^0.13"
@@ -1496,6 +1502,11 @@ var src_default = (0, import_template_utils.createPiletTemplateFactory)(root, (p
   } else if (args.ngVersion !== detectNgVersion(piralInstance)) {
     args.standalone = true;
   }
+  if (args.ngVersion < 9) {
+    (0, import_template_utils.log)("warn", `Angular version ${args.ngVersion} is not officially supported. It might not work.`);
+  } else if (!isKnownVersion(args.ngVersion)) {
+    (0, import_template_utils.log)("warn", `Angular version ${args.ngVersion} is not known and therefore not yet officially supported. It might not work.`);
+  }
   const ngVersion = `^${args.ngVersion}`;
   const packageJson = args.standalone ? getStandalonePackageJson(details.cliVersion, ngVersion, args.ngVersion) : getStandardPackageJson(details.cliVersion, ngVersion, args.ngVersion);
   return [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smapiot/pilet-template-angular",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "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": "^1.0.2"
+    "@smapiot/template-utils": "^1.0.4"
   },
-  "gitHead": "dd0dffc66c8087a5247e6f710e3cb96c6396aa0f"
+  "gitHead": "766d11d13233d2e7adf584a2c9ba85a11f5691fb"
 }

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'] || '14.0.0';
+  const version = allDependencies['@angular/core'] || '16.0.0';
 
   if (typeof version === 'string') {
     const result = /\d+/.exec(version);
@@ -22,19 +22,24 @@ export function detectNgVersion(piralInstance: { details: any }) {
     }
   }
 
-  return 14;
+  return 16;
+}
+
+export function isKnownVersion(majorNgVersion: number) {
+  return typeof zoneVersions[majorNgVersion] !== 'undefined';
 }
 
 export function getStandalonePackageJson(cliVersion: string, ngVersion: string, majorNgVersion: number) {
   return {
     importmap: {
       imports: {
-        '@angular/common': '@angular/common',
-        '@angular/compiler': '@angular/compiler',
-        '@angular/core': '@angular/core',
-        '@angular/platform-browser': '@angular/platform-browser',
-        '@angular/platform-browser-dynamic': '@angular/platform-browser-dynamic',
-        '@angular/router': '@angular/router',
+        '@angular/common': '',
+        '@angular/compiler': '',
+        '@angular/core': '',
+        '@angular/platform-browser': '',
+        '@angular/platform-browser-dynamic': '',
+        '@angular/router': '',
+        'piral-ng-common': '',
       },
     },
     dependencies: {
@@ -45,6 +50,7 @@ export function getStandalonePackageJson(cliVersion: string, ngVersion: string,
       '@angular/platform-browser-dynamic': ngVersion,
       '@angular/router': ngVersion,
       'piral-ng': cliVersion,
+      'piral-ng-common': ngVersion,
       'core-js': '^3.19.0',
       rxjs: rxjsVersions[majorNgVersion] || '^7.4',
       'zone.js': zoneVersions[majorNgVersion] || '^0.13',

package/src/index.ts

@@ -1,6 +1,6 @@
 import { resolve } from 'path';
-import { createPiletTemplateFactory, getPiralInstance } from '@smapiot/template-utils';
-import { detectMode, detectNgVersion, getStandalonePackageJson, getStandardPackageJson } from './helpers';
+import { createPiletTemplateFactory, getPiralInstance, log } from '@smapiot/template-utils';
+import { detectMode, detectNgVersion, getStandalonePackageJson, getStandardPackageJson, isKnownVersion } from './helpers';
 
 const root = resolve(__dirname, '..');
 
@@ -23,6 +23,12 @@ export default createPiletTemplateFactory<AngularPiletArgs>(root, (projectRoot,
     args.standalone = true;
   }
 
+  if (args.ngVersion < 9) {
+    log('warn', `Angular version ${args.ngVersion} is not officially supported. It might not work.`);
+  } else if (!isKnownVersion(args.ngVersion)) {
+    log('warn', `Angular version ${args.ngVersion} is not known and therefore not yet officially supported. It might not work.`);
+  }
+
   const ngVersion = `^${args.ngVersion}`;
   const packageJson = args.standalone
     ? getStandalonePackageJson(details.cliVersion, ngVersion, args.ngVersion)