piral-core 0.14.0-unstable.3105 → 0.14.0

package/dependencies.codegen

@@ -1,9 +1,35 @@
-module.exports = function() {
+function getIdentifiers(packageName) {
+  const packageJson = `${packageName}/package.json`;
+
+  try {
+    const details = require(packageJson);
+
+    if (details.version) {
+      return [packageName, `${packageName}@${details.version}`];
+    }
+  } catch {}
+
+  return [packageName];
+}
+
+module.exports = function () {
   const appName = process.env.BUILD_PCKG_NAME || '';
-  const externals = (process.env.SHARED_DEPENDENCIES || '').split(',');
-  const deps = [`deps['${appName}']={}`, ...externals.map(name => `deps['${name}']=require('${name}')`)];
-  const code = deps.join(';');
+  const externals = (process.env.SHARED_DEPENDENCIES || '').split(',').filter(Boolean);
+  const assignments = [];
+
+  if (appName) {
+    assignments.push(`deps['${appName}']={}`);
+  }
+
+  for (const name of externals) {
+    const identifiers = getIdentifiers(name);
+
+    for (const id of identifiers) {
+      assignments.push(`deps[${JSON.stringify(id)}]=require(${JSON.stringify(name)})`);
+    }
+  }
+
   return `module.exports = function(deps){
-    ${code}
+    ${assignments.join(';')}
   }`;
 };

package/esm/modules/dependencies.js

@@ -1,24 +1,32 @@
 import { isfunc } from 'piral-base';
+import { __assign } from 'tslib';
 /**
  * The global dependencies, which represent the dependencies
  * shared from the app shell itself.
  */
-export const globalDependencies = {
-    react: require('react'),
-    'react-dom': require('react-dom'),
-    'react-router': require('react-router'),
-    'react-router-dom': require('react-router-dom'),
-    history: require('history'),
-    tslib: require('tslib'),
-    'path-to-regexp': require('path-to-regexp'),
-    '@libre/atom': require('@libre/atom'),
-    '@dbeining/react-atom': require('@dbeining/react-atom'),
-};
+export const globalDependencies = {};
 if (process.env.SHARED_DEPENDENCIES) {
     const fillDependencies = require('../../dependencies.codegen');
     if (isfunc(fillDependencies)) {
         fillDependencies(globalDependencies);
     }
+    else {
+        // fall back to the default list if the codegen is invalid / not supported
+        __assign(globalDependencies, {
+            react: require('react'),
+            'react-dom': require('react-dom'),
+            'react-router': require('react-router'),
+            'react-router-dom': require('react-router-dom'),
+            history: require('history'),
+            tslib: require('tslib'),
+            'path-to-regexp': require('path-to-regexp'),
+            '@libre/atom': require('@libre/atom'),
+            '@dbeining/react-atom': require('@dbeining/react-atom'),
+        });
+    }
+}
+else {
+    // App shell is built with something else than the Piral CLI - just don't fill ...
 }
 /**
  * The default dependency selector, which just returns the provided

package/esm/modules/dependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../src/modules/dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwC,MAAM,EAAE,MAAM,YAAY,CAAC;AAE1E;;;GAGG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAA0B;IACvD,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC;IACvB,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC;IACjC,cAAc,EAAE,OAAO,CAAC,cAAc,CAAC;IACvC,kBAAkB,EAAE,OAAO,CAAC,kBAAkB,CAAC;IAC/C,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC;IAC3B,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC;IACvB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB,CAAC;IAC3C,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC;IACrC,sBAAsB,EAAE,OAAO,CAAC,sBAAsB,CAAC;CACxD,CAAC;AAEF,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE;IACnC,MAAM,gBAAgB,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;IAE/D,IAAI,MAAM,CAAC,gBAAgB,CAAC,EAAE;QAC5B,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;KACtC;CACF;AAED;;;GAGG;AACH,MAAM,UAAU,yBAAyB,CAAC,YAAmC;IAC3E,OAAO,YAAY,CAAC;AACtB,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,sBAAsB;IACpC,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AAC7B,CAAC"}
+{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../src/modules/dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwC,MAAM,EAAE,MAAM,YAAY,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEjC;;;GAGG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAA0B,EAAE,CAAC;AAE5D,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE;IACnC,MAAM,gBAAgB,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;IAE/D,IAAI,MAAM,CAAC,gBAAgB,CAAC,EAAE;QAC5B,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;KACtC;SAAM;QACL,0EAA0E;QAC1E,QAAQ,CAAC,kBAAkB,EAAE;YAC3B,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC;YACvB,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC;YACjC,cAAc,EAAE,OAAO,CAAC,cAAc,CAAC;YACvC,kBAAkB,EAAE,OAAO,CAAC,kBAAkB,CAAC;YAC/C,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC;YAC3B,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC;YACvB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB,CAAC;YAC3C,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC;YACrC,sBAAsB,EAAE,OAAO,CAAC,sBAAsB,CAAC;SACxD,CAAC,CAAC;KACJ;CACF;KAAM;IACL,kFAAkF;CACnF;AAED;;;GAGG;AACH,MAAM,UAAU,yBAAyB,CAAC,YAAmC;IAC3E,OAAO,YAAY,CAAC;AACtB,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,sBAAsB;IACpC,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AAC7B,CAAC"}

package/lib/modules/dependencies.js

@@ -2,26 +2,34 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultModuleRequester = exports.defaultDependencySelector = exports.globalDependencies = void 0;
 const piral_base_1 = require("piral-base");
+const tslib_1 = require("tslib");
 /**
  * The global dependencies, which represent the dependencies
  * shared from the app shell itself.
  */
-exports.globalDependencies = {
-    react: require('react'),
-    'react-dom': require('react-dom'),
-    'react-router': require('react-router'),
-    'react-router-dom': require('react-router-dom'),
-    history: require('history'),
-    tslib: require('tslib'),
-    'path-to-regexp': require('path-to-regexp'),
-    '@libre/atom': require('@libre/atom'),
-    '@dbeining/react-atom': require('@dbeining/react-atom'),
-};
+exports.globalDependencies = {};
 if (process.env.SHARED_DEPENDENCIES) {
     const fillDependencies = require('../../dependencies.codegen');
     if ((0, piral_base_1.isfunc)(fillDependencies)) {
         fillDependencies(exports.globalDependencies);
     }
+    else {
+        // fall back to the default list if the codegen is invalid / not supported
+        (0, tslib_1.__assign)(exports.globalDependencies, {
+            react: require('react'),
+            'react-dom': require('react-dom'),
+            'react-router': require('react-router'),
+            'react-router-dom': require('react-router-dom'),
+            history: require('history'),
+            tslib: require('tslib'),
+            'path-to-regexp': require('path-to-regexp'),
+            '@libre/atom': require('@libre/atom'),
+            '@dbeining/react-atom': require('@dbeining/react-atom'),
+        });
+    }
+}
+else {
+    // App shell is built with something else than the Piral CLI - just don't fill ...
 }
 /**
  * The default dependency selector, which just returns the provided

package/lib/modules/dependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../src/modules/dependencies.ts"],"names":[],"mappings":";;;AAAA,2CAA0E;AAE1E;;;GAGG;AACU,QAAA,kBAAkB,GAA0B;IACvD,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC;IACvB,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC;IACjC,cAAc,EAAE,OAAO,CAAC,cAAc,CAAC;IACvC,kBAAkB,EAAE,OAAO,CAAC,kBAAkB,CAAC;IAC/C,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC;IAC3B,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC;IACvB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB,CAAC;IAC3C,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC;IACrC,sBAAsB,EAAE,OAAO,CAAC,sBAAsB,CAAC;CACxD,CAAC;AAEF,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE;IACnC,MAAM,gBAAgB,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;IAE/D,IAAI,IAAA,mBAAM,EAAC,gBAAgB,CAAC,EAAE;QAC5B,gBAAgB,CAAC,0BAAkB,CAAC,CAAC;KACtC;CACF;AAED;;;GAGG;AACH,SAAgB,yBAAyB,CAAC,YAAmC;IAC3E,OAAO,YAAY,CAAC;AACtB,CAAC;AAFD,8DAEC;AAED;;;;;;;;;;GAUG;AACH,SAAgB,sBAAsB;IACpC,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AAC7B,CAAC;AAFD,wDAEC"}
+{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../src/modules/dependencies.ts"],"names":[],"mappings":";;;AAAA,2CAA0E;AAC1E,iCAAiC;AAEjC;;;GAGG;AACU,QAAA,kBAAkB,GAA0B,EAAE,CAAC;AAE5D,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE;IACnC,MAAM,gBAAgB,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;IAE/D,IAAI,IAAA,mBAAM,EAAC,gBAAgB,CAAC,EAAE;QAC5B,gBAAgB,CAAC,0BAAkB,CAAC,CAAC;KACtC;SAAM;QACL,0EAA0E;QAC1E,IAAA,gBAAQ,EAAC,0BAAkB,EAAE;YAC3B,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC;YACvB,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC;YACjC,cAAc,EAAE,OAAO,CAAC,cAAc,CAAC;YACvC,kBAAkB,EAAE,OAAO,CAAC,kBAAkB,CAAC;YAC/C,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC;YAC3B,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC;YACvB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB,CAAC;YAC3C,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC;YACrC,sBAAsB,EAAE,OAAO,CAAC,sBAAsB,CAAC;SACxD,CAAC,CAAC;KACJ;CACF;KAAM;IACL,kFAAkF;CACnF;AAED;;;GAGG;AACH,SAAgB,yBAAyB,CAAC,YAAmC;IAC3E,OAAO,YAAY,CAAC;AACtB,CAAC;AAFD,8DAEC;AAED;;;;;;;;;;GAUG;AACH,SAAgB,sBAAsB;IACpC,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AAC7B,CAAC;AAFD,wDAEC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "piral-core",
-  "version": "0.14.0-unstable.3105",
+  "version": "0.14.0",
   "description": "The core library for creating a Piral instance.",
   "keywords": [
     "portal",
@@ -62,10 +62,21 @@
     "react-router": ">=5.0.0",
     "react-router-dom": ">=5.0.0"
   },
+  "sharedDependencies": [
+    "react",
+    "react-dom",
+    "react-router",
+    "react-router-dom",
+    "history",
+    "tslib",
+    "path-to-regexp",
+    "@libre/atom",
+    "@dbeining/react-atom"
+  ],
   "dependencies": {
     "@dbeining/react-atom": "^4.0.0",
-    "piral-base": "^0.14.0-unstable.3105",
-    "piral-debug-utils": "^0.14.0-unstable.3105"
+    "piral-base": "^0.14.0",
+    "piral-debug-utils": "^0.14.0"
   },
-  "gitHead": "f0732b5a8decdddc5abd7c50a05af59dbcb03912"
+  "gitHead": "42d3691018d6fa49c2dd18a0b65e4f89961216b0"
 }

package/src/modules/dependencies.test.ts

@@ -1,12 +1,10 @@
 import { globalDependencies, defaultDependencySelector, defaultModuleRequester } from './dependencies';
 
 describe('Dependencies Module', () => {
-  it('globalDependencies should contain global dependencies', () => {
-    expect(globalDependencies).toHaveProperty('react');
-    expect(globalDependencies).toHaveProperty('history');
-    expect(globalDependencies).not.toHaveProperty('foo');
+  it('globalDependencies should not contain any dependencies', () => {
+    expect(globalDependencies).toEqual({});
   });
-  
+
   it('defaultDependencySelector should return given dependencies', () => {
     const deps = defaultDependencySelector({
       foo: 'bar',
@@ -14,7 +12,7 @@ describe('Dependencies Module', () => {
     expect(deps).toHaveProperty('foo');
     expect(deps).not.toHaveProperty('bar');
   });
-  
+
   it('defaultModuleRequester should return given dependencies', async () => {
     const mods = await defaultModuleRequester();
     expect(mods).toEqual([]);

package/src/modules/dependencies.ts

@@ -1,27 +1,33 @@
 import { PiletMetadata, AvailableDependencies, isfunc } from 'piral-base';
+import { __assign } from 'tslib';
 
 /**
  * The global dependencies, which represent the dependencies
  * shared from the app shell itself.
  */
-export const globalDependencies: AvailableDependencies = {
-  react: require('react'),
-  'react-dom': require('react-dom'),
-  'react-router': require('react-router'),
-  'react-router-dom': require('react-router-dom'),
-  history: require('history'),
-  tslib: require('tslib'),
-  'path-to-regexp': require('path-to-regexp'),
-  '@libre/atom': require('@libre/atom'),
-  '@dbeining/react-atom': require('@dbeining/react-atom'),
-};
+export const globalDependencies: AvailableDependencies = {};
 
 if (process.env.SHARED_DEPENDENCIES) {
   const fillDependencies = require('../../dependencies.codegen');
 
   if (isfunc(fillDependencies)) {
     fillDependencies(globalDependencies);
+  } else {
+    // fall back to the default list if the codegen is invalid / not supported
+    __assign(globalDependencies, {
+      react: require('react'),
+      'react-dom': require('react-dom'),
+      'react-router': require('react-router'),
+      'react-router-dom': require('react-router-dom'),
+      history: require('history'),
+      tslib: require('tslib'),
+      'path-to-regexp': require('path-to-regexp'),
+      '@libre/atom': require('@libre/atom'),
+      '@dbeining/react-atom': require('@dbeining/react-atom'),
+    });
   }
+} else {
+  // App shell is built with something else than the Piral CLI - just don't fill ...
 }
 
 /**