piral-ng 1.9.1-beta.8340 → 1.9.1-beta.8341

package/README.md

@@ -246,74 +246,7 @@ export class AngularPage { /* ... */ }
 
 where you may need to tell your bundler how to treat these HTML files (i.e., transform these references to strings directly in the bundle).
 
-As an alternative, consider using Webpack with the `@ngtools/webpack` library. This allows you have a *webpack.config.js* like:
-
-```js
-const { AngularWebpackPlugin } = require('@ngtools/webpack');
-const CopyPlugin = require("copy-webpack-plugin");
-const { resolve } = require("path");
-
-module.exports = (config) => {
-  config.module.rules.filter(m => m.test.toString() === /\.css$/i.toString()).forEach(m => {
-    m.exclude = /\.component.css$/i;
-  });
-
-  config.module.rules.filter(m => m.test.toString() === /\.s[ac]ss$/i.toString()).forEach(m => {
-    m.exclude = /\.component.s[ac]ss$/i;
-  });
-
-  const cssLoaderNoModule = {
-    loader: require.resolve('css-loader'),
-    options: {
-      esModule: false,
-    },
-  };
-
-  const htmlLoaderNoModule = {
-    loader: require.resolve('html-loader'),
-    options: {
-      esModule: false,
-    },
-  };
-
-  const ruleIndex = config.module.rules.findIndex(m => m.test.toString() === /\.tsx?$/i.toString());
-
-  config.module.rules.splice(ruleIndex, 1,
-    {
-      test: /\.[jt]sx?$/,
-      loader: '@ngtools/webpack',
-    },
-    {
-      test: /\.component.html$/i,
-      use: ["to-string-loader", htmlLoaderNoModule],
-    },
-    {
-      test: /\.component.css$/i,
-      use: ["to-string-loader", cssLoaderNoModule],
-    },
-    {
-      test: /\.component.s[ac]ss$/i,
-      use: ["to-string-loader", cssLoaderNoModule, "sass-loader"],
-    });
-
-  config.plugins.push(
-    new AngularWebpackPlugin({
-      tsconfig: 'tsconfig.json',
-      jitMode: true,
-    }),
-    new CopyPlugin({
-      patterns: [
-        { from: resolve(__dirname, "src/assets") },
-      ],
-    }),
-  )
-
-
-  return config;
-};
-```
-
-**Note**: You must install these dependencies (also things like `copy-webpack-plugin`) yourself. `piral-ng` does not come with any dependencies for development.
+The standard bundler configuration can be done with `piral-ng/extend-webpack`. More information can be seen in the [Converting an Angular Application to a Pilet](#converting-an-angular-application-to-a-pilet) section.
 :::
 
 ::: summary: Legacy Use

package/lib/utils.d.ts

@@ -8,7 +8,8 @@ export interface NgAnnotation {
     declarations: Array<any>;
     entryComponents: Array<any>;
     bootstrap: any;
-    selector: string;
+    selector?: string;
+    selectors?: Array<Array<string>>;
 }
 export declare function getId(): string;
 export declare function getNgVersion(): string;

package/lib/utils.js

@@ -15,7 +15,7 @@ export function getAnnotations(component) {
         annotations = Reflect.getOwnMetadata('annotations', component);
     }
     if (!annotations && typeof component.ɵcmp !== 'undefined') {
-        annotations = [{}];
+        annotations = [component.ɵcmp];
     }
     if (!annotations && typeof component.ɵmod !== 'undefined') {
         annotations = [component.ɵmod];
@@ -24,7 +24,13 @@ export function getAnnotations(component) {
 }
 export function hasSelector(component, selector) {
     const [annotation] = getAnnotations(component);
-    return annotation && annotation.selector === selector;
+    if (annotation.selector === selector) {
+        return true;
+    }
+    if (!Array.isArray(annotation.selectors)) {
+        return false;
+    }
+    return annotation.selectors.some((sels) => sels.includes(selector));
 }
 export function findComponents(exports) {
     const components = [];

package/lib/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAkB,MAAM,eAAe,CAAC;AAcxD,MAAM,UAAU,KAAK;IACnB,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,YAAY;IAC1B,OAAO,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,aAAa;IAC3B,MAAM,KAAK,GAAG,YAAY,EAAE,CAAC;IAC7B,OAAO,GAAG,KAAK,MAAM,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,SAAc;IAC3C,IAAI,WAAW,GAAG,SAAS,EAAE,eAAe,CAAC;IAE7C,IAAI,CAAC,WAAW,IAAI,OAAO,OAAO,KAAK,WAAW,IAAI,gBAAgB,IAAI,OAAO,EAAE,CAAC;QAClF,WAAW,GAAI,OAAe,CAAC,cAAc,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;IAC1E,CAAC;IAED,IAAI,CAAC,WAAW,IAAI,OAAO,SAAS,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QAC1D,WAAW,GAAG,CAAC,EAAE,CAAC,CAAC;IACrB,CAAC;IAED,IAAI,CAAC,WAAW,IAAI,OAAO,SAAS,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QAC1D,WAAW,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAED,OAAO,WAAW,IAAI,EAAE,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,SAAc,EAAE,QAAgB;IAC1D,MAAM,CAAC,UAAU,CAAC,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC;IAC/C,OAAO,UAAU,IAAI,UAAU,CAAC,QAAQ,KAAK,QAAQ,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,OAAmB;IAChD,MAAM,UAAU,GAAG,EAAE,CAAC;IAEtB,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAC3B,KAAK,MAAM,EAAE,IAAI,OAAO,EAAE,CAAC;YACzB,MAAM,CAAC,UAAU,CAAC,GAAG,cAAc,CAAC,EAAE,CAAC,CAAC;YAExC,IAAI,UAAU,EAAE,CAAC;gBACf,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;oBACvB,UAAU,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;gBACzD,CAAC;qBAAM,IAAI,CAAC,UAAU,CAAC,OAAO,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC;oBACxD,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACtB,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAkB,MAAM,eAAe,CAAC;AAexD,MAAM,UAAU,KAAK;IACnB,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,YAAY;IAC1B,OAAO,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,aAAa;IAC3B,MAAM,KAAK,GAAG,YAAY,EAAE,CAAC;IAC7B,OAAO,GAAG,KAAK,MAAM,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,SAAc;IAC3C,IAAI,WAAW,GAAG,SAAS,EAAE,eAAe,CAAC;IAE7C,IAAI,CAAC,WAAW,IAAI,OAAO,OAAO,KAAK,WAAW,IAAI,gBAAgB,IAAI,OAAO,EAAE,CAAC;QAClF,WAAW,GAAI,OAAe,CAAC,cAAc,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;IAC1E,CAAC;IAED,IAAI,CAAC,WAAW,IAAI,OAAO,SAAS,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QAC1D,WAAW,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAED,IAAI,CAAC,WAAW,IAAI,OAAO,SAAS,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QAC1D,WAAW,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAED,OAAO,WAAW,IAAI,EAAE,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,SAAc,EAAE,QAAgB;IAC1D,MAAM,CAAC,UAAU,CAAC,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC;IAE/C,IAAI,UAAU,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QACzC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;AACtE,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,OAAmB;IAChD,MAAM,UAAU,GAAG,EAAE,CAAC;IAEtB,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAC3B,KAAK,MAAM,EAAE,IAAI,OAAO,EAAE,CAAC;YACzB,MAAM,CAAC,UAAU,CAAC,GAAG,cAAc,CAAC,EAAE,CAAC,CAAC;YAExC,IAAI,UAAU,EAAE,CAAC;gBACf,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;oBACvB,UAAU,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;gBACzD,CAAC;qBAAM,IAAI,CAAC,UAAU,CAAC,OAAO,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC;oBACxD,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACtB,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "piral-ng",
-  "version": "1.9.1-beta.8340",
+  "version": "1.9.1-beta.8341",
   "description": "Plugin for integrating Angular components in Piral.",
   "keywords": [
     "piral",
@@ -71,9 +71,9 @@
     "@angular/platform-browser": "^16.0.0",
     "@angular/platform-browser-dynamic": "^16.0.0",
     "@angular/router": "^16.0.0",
-    "piral-core": "1.9.1-beta.8340",
+    "piral-core": "1.9.1-beta.8341",
     "piral-ng-common": "^16.0.0",
     "rxjs": "^7.3.0"
   },
-  "gitHead": "9e9ea4fc6a433b385fa5eddf84c115a91b14b23b"
+  "gitHead": "b92cc75db5a1d4bc256f379ca1db28b3734a68cb"
 }

package/src/utils.ts

@@ -9,7 +9,8 @@ export interface NgAnnotation {
   declarations: Array<any>;
   entryComponents: Array<any>;
   bootstrap: any;
-  selector: string;
+  selector?: string;
+  selectors?: Array<Array<string>>;
 }
 
 export function getId() {
@@ -33,7 +34,7 @@ export function getAnnotations(component: any): Array<NgAnnotation> {
   }
 
   if (!annotations && typeof component.ɵcmp !== 'undefined') {
-    annotations = [{}];
+    annotations = [component.ɵcmp];
   }
 
   if (!annotations && typeof component.ɵmod !== 'undefined') {
@@ -45,7 +46,16 @@ export function getAnnotations(component: any): Array<NgAnnotation> {
 
 export function hasSelector(component: any, selector: string) {
   const [annotation] = getAnnotations(component);
-  return annotation && annotation.selector === selector;
+
+  if (annotation.selector === selector) {
+    return true;
+  }
+
+  if (!Array.isArray(annotation.selectors)) {
+    return false;
+  }
+
+  return annotation.selectors.some((sels) => sels.includes(selector));
 }
 
 export function findComponents(exports: Array<any>): Array<any> {