@smapiot/pilet-template-angular 1.0.1 → 1.0.3

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);
@@ -1376,7 +1377,8 @@ var tsVersions = {
   12: "~4.2",
   13: "~4.4",
   14: "~4.7",
-  15: "~4.8"
+  15: "~4.8",
+  16: "~4.9"
 };
 var rxjsVersions = {
   2: "^5.0",
@@ -1391,7 +1393,8 @@ var rxjsVersions = {
   12: "^6.5",
   13: "^7.4",
   14: "^7.4",
-  15: "^7.4"
+  15: "^7.4",
+  16: "^7.4"
 };
 var zoneVersions = {
   2: "~0.9",
@@ -1406,7 +1409,8 @@ var zoneVersions = {
   12: "0.11.4",
   13: "0.11.4",
   14: "0.12.0",
-  15: "0.13.0"
+  15: "0.13.0",
+  16: "0.13.0"
 };
 
 // src/helpers.ts
@@ -1431,16 +1435,20 @@ function detectNgVersion(piralInstance) {
   }
   return 14;
 }
+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: {
@@ -1451,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"
@@ -1493,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.1",
+  "version": "1.0.3",
   "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": 14,
+      "default": 16,
       "type": "number"
     }
   },
@@ -54,7 +54,7 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "devDependencies": {
-    "@smapiot/template-utils": "^1.0.1"
+    "@smapiot/template-utils": "^1.0.3"
   },
-  "gitHead": "5036b6d27e51183457c1088195b40f2d8a38fb65"
+  "gitHead": "6fd3837caf7f3a9192fe768827ba673170bb6c6e"
 }

package/src/helpers.ts

@@ -25,16 +25,21 @@ export function detectNgVersion(piralInstance: { details: any }) {
   return 14;
 }
 
+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)

package/src/versions.ts

@@ -13,6 +13,7 @@ export const tsVersions = {
   13: '~4.4',
   14: '~4.7',
   15: '~4.8',
+  16: '~4.9',
 };
 
 // Mapping of Angular to RxJs versions
@@ -30,6 +31,7 @@ export const rxjsVersions = {
   13: '^7.4',
   14: '^7.4',
   15: '^7.4',
+  16: '^7.4',
 };
 
 // Mapping of Angular to Zone.js versions
@@ -47,4 +49,5 @@ export const zoneVersions = {
   13: '0.11.4',
   14: '0.12.0',
   15: '0.13.0',
+  16: '0.13.0',
 };

package/templates/app.module.ts.ejs

@@ -1,15 +1,24 @@
 import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
+import { RouterModule, Routes } from '@angular/router';
 import { BrowserModule } from '@angular/platform-browser';
 import { SharedModule } from 'piral-ng/common';
 
 import { PageComponent } from './page.component';
 import { MenuComponent } from './menu.component';
 
+export const routes: Routes = [
+  {
+    path: '',
+    children: [
+      { path: 'sample', component: PageComponent },
+    ],
+  },
+];
+
 @NgModule({
   bootstrap: [],
   declarations: [PageComponent, MenuComponent],
   exports: [PageComponent, MenuComponent],
-  imports: [BrowserModule, SharedModule, RouterModule.forRoot([])],
+  imports: [BrowserModule, SharedModule, RouterModule.forRoot(routes)],
 })
 export class AppModule {}