@smapiot/pilet-template-angular 0.15.0-beta.4609 → 0.15.0-beta.4612

package/lib/index.js

@@ -1069,10 +1069,12 @@ var require_utils2 = __commonJS({
       const absPath = path_1.posix.join(targetDir, fileName);
       const path = (0, path_1.isAbsolute)(absPath) ? (0, path_1.relative)(root2, absPath) : absPath;
       (0, log_1.log)("verbose", `Adding "source" to package.json: "${path}"`);
-      return Promise.resolve({
-        content: Buffer.from(`{"source": ${JSON.stringify(path)}}`, "utf8"),
-        path: "package.json"
-      });
+      return {
+        languages: ["ts", "js"],
+        name: "package.json",
+        content: JSON.stringify({ source: path }),
+        target: "<root>/package.json"
+      };
     }
     exports.getPackageJsonWithSource = getPackageJsonWithSource;
     function getPiralInstance2(root2, sourceName) {
@@ -1195,10 +1197,8 @@ var require_factory = __commonJS({
           src,
           mocks
         });
-        const files = yield Promise.all([
-          ...sources.map((source) => (0, template_1.getFileFromTemplate)(sourceDir, source, data)),
-          (0, utils_1.getPackageJsonWithSource)(data.projectRoot, data.src, `index${data.extension}`)
-        ]);
+        const defaultSource = (0, utils_1.getPackageJsonWithSource)(data.projectRoot, data.src, `index${data.extension}`);
+        const files = yield Promise.all([...sources, defaultSource].map((source) => (0, template_1.getFileFromTemplate)(sourceDir, source, data)));
         return (0, merge_1.mergeFiles)(files);
       });
     }
@@ -1302,7 +1302,6 @@ function getStandalonePackageJson(cliVersion, ngVersion) {
     importmap: {
       imports: {
         "@angular/animations": ".",
-        "@angular/cli": ".",
         "@angular/common": ".",
         "@angular/compiler": ".",
         "@angular/core": ".",
@@ -1314,7 +1313,6 @@ function getStandalonePackageJson(cliVersion, ngVersion) {
     },
     dependencies: {
       "@angular/animations": ngVersion,
-      "@angular/cli": ngVersion,
       "@angular/common": ngVersion,
       "@angular/compiler": ngVersion,
       "@angular/core": ngVersion,
@@ -1328,6 +1326,7 @@ function getStandalonePackageJson(cliVersion, ngVersion) {
     },
     devDependencies: {
       "@angular/compiler-cli": ngVersion,
+      "@angular/cli": ngVersion,
       "@ngtools/webpack": ngVersion,
       "copy-webpack-plugin": "^10",
       "html-loader": "^3",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smapiot/pilet-template-angular",
-  "version": "0.15.0-beta.4609",
+  "version": "0.15.0-beta.4612",
   "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.0-beta.4609"
+    "@smapiot/template-utils": "0.15.0-beta.4612"
   },
-  "gitHead": "0a67402816ae1bb52e8313c21497bcd655e73c88"
+  "gitHead": "db607eec793052dc290cad47c373b08848ad8703"
 }

package/src/helpers.ts

@@ -28,7 +28,6 @@ export function getStandalonePackageJson(cliVersion: string, ngVersion: string)
     importmap: {
       imports: {
         '@angular/animations': '.',
-        '@angular/cli': '.',
         '@angular/common': '.',
         '@angular/compiler': '.',
         '@angular/core': '.',
@@ -40,7 +39,6 @@ export function getStandalonePackageJson(cliVersion: string, ngVersion: string)
     },
     dependencies: {
       '@angular/animations': ngVersion,
-      '@angular/cli': ngVersion,
       '@angular/common': ngVersion,
       '@angular/compiler': ngVersion,
       '@angular/core': ngVersion,
@@ -54,6 +52,7 @@ export function getStandalonePackageJson(cliVersion: string, ngVersion: string)
     },
     devDependencies: {
       '@angular/compiler-cli': ngVersion,
+      '@angular/cli': ngVersion,
       '@ngtools/webpack': ngVersion,
       'copy-webpack-plugin': '^10',
       'html-loader': '^3',

package/templates/app.module.ts.ejs

@@ -5,9 +5,9 @@ import { SharedModule } from 'piral-ng/common';
 import { PageComponent } from './page.component';
 
 @NgModule({
-	bootstrap: [PageComponent],
-	declarations: [PageComponent],
-	exports: [PageComponent],
-	imports: [BrowserModule, SharedModule]
+  bootstrap: [PageComponent],
+  declarations: [PageComponent],
+  exports: [PageComponent],
+  imports: [BrowserModule, SharedModule]
 })
 export class AppModule {}

package/templates/index.jsx.ejs

@@ -1,3 +1 @@
-import * as React from 'react';
-
 export function setup(app) {}

package/templates/index.tsx.ejs

@@ -1,5 +1,5 @@
-import * as React from 'react';
 <% if (standalone) { -%>
+import '@angular/compiler';
 import { defineNgModule, fromNg } from 'piral-ng/convert';
 <% } -%>
 import { AppModule } from './app/app.module';
@@ -8,18 +8,18 @@ import type { PiletApi } from '<%- sourceName %>';
 
 export function setup(app: PiletApi) {
 <% if (standalone) { -%>
-	app.defineNgModule(AppModule, {
+  defineNgModule(AppModule, {
     // remove the following if you actually want to enable zone.js
-		ngZone: 'noop',
-	});
+    ngZone: 'noop',
+  });
 
-  app.registerPage('/sample', app.fromNg(PageComponent));
+  app.registerPage('/sample', fromNg(PageComponent));
 <% } else { -%>
-	defineNgModule(AppModule, {
+  app.defineNgModule(AppModule, {
     // remove the following if you actually want to enable zone.js
-		ngZone: 'noop',
-	});
+    ngZone: 'noop',
+  });
 
-  app.registerPage('/sample', fromNg(PageComponent));
+  app.registerPage('/sample', app.fromNg(PageComponent));
 <% } -%>
 }

package/templates/page.component.ts.ejs

@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 
 @Component({
-	styleUrls: ['./page.component.css'],
-	templateUrl: './page.component.html'
+  styleUrls: ['./page.component.css'],
+  templateUrl: './page.component.html'
 })
 export class PageComponent {}