piral-ng 1.5.6-beta.7106 → 1.5.6-beta.7114

package/compiler-dynamic.js

@@ -0,0 +1,70 @@
+import info from '@angular/compiler/package.json';
+
+if (typeof window.ngVersions === 'undefined') {
+  window.ngVersions = {};
+}
+
+const defaultVersion = 'default';
+const existing = Object.getOwnPropertyDescriptor(window, 'ng');
+
+function setUrl(url, version) {
+  if (version) {
+    window.ngVersions[url] = version;
+    return version;
+  }
+
+  return defaultVersion;
+}
+
+setUrl(new URL('.', __system_context__.meta.url).href, info.version);
+
+if (existing?.get === undefined) {
+  const ngs = {
+    [defaultVersion]: existing?.value,
+  };
+
+  function getUrl() {
+    const { stack } = new Error();
+    const lines = stack?.split('\n') || [];
+
+    if (lines[0] === 'Error') {
+      // V8
+      const line = lines[3] || '';
+      return /\((.*):\d+:\d+\)$/.exec(line)?.[1] || '';
+    } else {
+      // SpiderMonkey and JavaScriptCore
+      const line = lines[2] || '';
+      return /@(.*):\d+:\d+$/.exec(line)?.[1] || '';
+    }
+  }
+
+  function getNgVersion(url) {
+    const version = window.ngVersions[url];
+
+    if (!version) {
+      try {
+        const baseUrl = new URL('.', url);
+        const baseVersion = window.ngVersions[baseUrl.href];
+        return setUrl(url, baseVersion);
+      } catch {
+        return defaultVersion;
+      }
+    }
+    
+    return version;
+  }
+
+  Object.defineProperty(window, 'ng', {
+    configurable: true,
+    get() {
+      const url = getUrl();
+      const version = getNgVersion(url);
+      return ngs[version];
+    },
+    set(value) {
+      const url = getUrl();
+      const version = getNgVersion(url);
+      ngs[version] = value;
+    },
+  });
+}

package/extend-webpack.js

@@ -101,18 +101,30 @@ module.exports =
     );
 
     if (jitMode) {
-      // The job of this plugin is to make angular-core depend on angular-compiler - this way
-      // angular-compiler does not need to be loaded separately and angular-compiler is present
-      // *before* angular-core
-      // this is only required in jit mode - as otherwise everything should be pre-compiled
+      // The job of this plugin is 
+      // (1)
+      // to make @angular/core depend on @angular/compiler - this way @angular/compiler
+      // does not need to be loaded separately and @angular/compiler is present *before*
+      // @angular/core; this is only required in jit mode - as otherwise everything should
+      // be pre-compiled.
+      // (2)
+      // to introduce a dynamic version of the window.ng global, which supports running
+      // with multiple versions of Angular.
       config.plugins.push({
         apply(compiler) {
           const { entry } = compiler.options;
-          const core = entry['angular-core'];
+          const coreEntry = entry['angular-core'];
 
-          if (typeof core !== 'undefined') {
+          if (typeof coreEntry !== 'undefined') {
             const compilerDependency = resolve(__dirname, 'core-dynamic.js');
-            core.import = [compilerDependency, ...core.import];
+            coreEntry.import = [compilerDependency, ...coreEntry.import];
+          }
+
+          const compilerEntry = entry['angular-compiler'];
+
+          if (typeof compilerEntry !== 'undefined') {
+            const compilerDependency = resolve(__dirname, 'compiler-dynamic.js');
+            compilerEntry.import = [compilerDependency, ...compilerEntry.import];
           }
         },
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "piral-ng",
-  "version": "1.5.6-beta.7106",
+  "version": "1.5.6-beta.7114",
   "description": "Plugin for integrating Angular components in Piral.",
   "keywords": [
     "piral",
@@ -27,6 +27,9 @@
     "./common": {
       "import": "./common.js"
     },
+    "./compiler-dynamic": {
+      "import": "./compiler-dynamic.js"
+    },
     "./convert": {
       "import": "./convert.js"
     },
@@ -58,6 +61,7 @@
     "src",
     "common.d.ts",
     "common.js",
+    "compiler-dynamic.js",
     "convert.d.ts",
     "convert.js",
     "core-dynamic.js",
@@ -90,9 +94,9 @@
     "@angular/platform-browser": "^16.0.0",
     "@angular/platform-browser-dynamic": "^16.0.0",
     "@angular/router": "^16.0.0",
-    "piral-core": "1.5.6-beta.7106",
+    "piral-core": "1.5.6-beta.7114",
     "piral-ng-common": "^16.0.0",
     "rxjs": "^7.3.0"
   },
-  "gitHead": "c99ace4f4c58047929772a75aca3ba2dfe66c88f"
+  "gitHead": "aa8dcfe0f2f197ced33f525ee86bbf041f5e280f"
 }