piral-cli-webpack5 0.14.8-beta.3487 → 0.14.8-beta.3504

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/lib/enhancers/pilet-webpack-config-enhancer/helpers.js +18 -15
  2. package/lib/enhancers/pilet-webpack-config-enhancer/helpers.js.map +1 -1
  3. package/package.json +3 -3
  4. package/src/enhancers/pilet-webpack-config-enhancer/helpers.ts +19 -15
package/lib/enhancers/pilet-webpack-config-enhancer/helpers.js CHANGED
@@ -43,12 +43,13 @@ function getExternals(piral) {
43
43
  exports.getExternals = getExternals;
44
44
  function getDependencies(importmap, compilerOptions) {
45
45
  const dependencies = {};
46
- if (typeof compilerOptions.entry === 'object' && compilerOptions.entry) {
46
+ const { entry, externals } = compilerOptions;
47
+ if (typeof entry === 'object' && entry && Array.isArray(externals) && typeof externals[0] === 'object') {
47
48
  for (const dep of importmap) {
48
49
  dependencies[dep.id] = dep.ref;
49
- compilerOptions.externals[dep.name] = dep.id;
50
+ externals[0][dep.name] = dep.id;
50
51
  if (dep.type === 'local') {
51
- compilerOptions.entry[dep.ref.replace(/\.js$/, '')] = dep.entry;
52
+ entry[dep.ref.replace(/\.js$/, '')] = dep.entry;
52
53
  }
53
54
  }
54
55
  }
@@ -74,19 +75,21 @@ function withSetPath(compilerOptions) {
74
75
  exports.withSetPath = withSetPath;
75
76
  function withExternals(compilerOptions, externals) {
76
77
  const current = compilerOptions.externals;
77
- const newExternals = Array.isArray(current)
78
- ? [...current, ...externals]
79
- : typeof current === 'string'
80
- ? [current, ...externals]
81
- : externals;
82
- if (newExternals !== externals || typeof compilerOptions.externals !== 'object' || !compilerOptions.externals) {
83
- compilerOptions.externals = {};
84
- }
85
- for (const external of newExternals) {
86
- if (typeof external === 'string') {
87
- compilerOptions.externals[external] = external;
78
+ const arrayExternals = Array.isArray(current) ? current : [current];
79
+ const objectExternal = externals.reduce((external, dep) => {
80
+ external[dep] = dep;
81
+ return external;
82
+ }, {});
83
+ const newExternals = arrayExternals.filter(external => {
84
+ if (typeof external === 'object' && Object.keys(external).length) {
85
+ for (const dep in external) {
86
+ objectExternal[dep] = external[dep];
87
+ }
88
+ return false;
88
89
  }
89
- }
90
+ return true;
91
+ });
92
+ compilerOptions.externals = [objectExternal, ...newExternals];
90
93
  }
91
94
  exports.withExternals = withExternals;
92
95
  //# sourceMappingURL=helpers.js.map
package/lib/enhancers/pilet-webpack-config-enhancer/helpers.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/enhancers/pilet-webpack-config-enhancer/helpers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/enhancers/pilet-webpack-config-enhancer/helpers.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "piral-cli-webpack5",
3
- "version": "0.14.8-beta.3487",
3
+ "version": "0.14.8-beta.3504",
4
4
  "description": "Provides debug and build capabilities for pilets and Piral instances using Webpack v5.",
5
5
  "keywords": [
6
6
  "piral-cli",
@@ -48,7 +48,7 @@
48
48
  "@types/node": "^13.9.0",
49
49
  "@types/terser-webpack-plugin": "^5.0.0",
50
50
  "@types/yargs": "^15.0.4",
51
- "piral-cli": "0.14.8-beta.3487",
51
+ "piral-cli": "0.14.8-beta.3504",
52
52
  "strip-ansi": "^3.0.0",
53
53
  "typescript": "^4.0.2"
54
54
  },
@@ -77,5 +77,5 @@
77
77
  "webpack": "^5.1.3",
78
78
  "webpack-inject-plugin": "^1.5.5"
79
79
  },
80
- "gitHead": "95872598216edbf8efd99c8b7044094ea209a049"
80
+ "gitHead": "8e89db6eb732293e4abda6bb3c0cbe6fd0335248"
81
81
  }
package/src/enhancers/pilet-webpack-config-enhancer/helpers.ts CHANGED
@@ -42,14 +42,15 @@ export function getExternals(piral: string) {
42
42
 
43
43
  export function getDependencies(importmap: Array<SharedDependency>, compilerOptions: Configuration) {
44
44
  const dependencies = {};
45
+ const { entry, externals } = compilerOptions;
45
46
 
46
- if (typeof compilerOptions.entry === 'object' && compilerOptions.entry) {
47
+ if (typeof entry === 'object' && entry && Array.isArray(externals) && typeof externals[0] === 'object') {
47
48
  for (const dep of importmap) {
48
49
  dependencies[dep.id] = dep.ref;
49
- compilerOptions.externals[dep.name] = dep.id;
50
+ externals[0][dep.name] = dep.id;
50
51
 
51
52
  if (dep.type === 'local') {
52
- compilerOptions.entry[dep.ref.replace(/\.js$/, '')] = dep.entry;
53
+ entry[dep.ref.replace(/\.js$/, '')] = dep.entry;
53
54
  }
54
55
  }
55
56
  }
@@ -77,19 +78,22 @@ export function withSetPath(compilerOptions: Configuration) {
77
78
 
78
79
  export function withExternals(compilerOptions: Configuration, externals: Array<string>) {
79
80
  const current = compilerOptions.externals;
80
- const newExternals = Array.isArray(current)
81
- ? [...(current as Array<string>), ...externals]
82
- : typeof current === 'string'
83
- ? [current, ...externals]
84
- : externals;
81
+ const arrayExternals = Array.isArray(current) ? current : [current];
85
82
 
86
- if (newExternals !== externals || typeof compilerOptions.externals !== 'object' || !compilerOptions.externals) {
87
- compilerOptions.externals = {};
88
- }
83
+ const objectExternal = externals.reduce((external, dep) => {
84
+ external[dep] = dep;
85
+ return external;
86
+ }, {});
89
87
 
90
- for (const external of newExternals) {
91
- if (typeof external === 'string') {
92
- compilerOptions.externals[external] = external;
88
+ const newExternals = arrayExternals.filter(external => {
89
+ if (typeof external === 'object' && Object.keys(external).length) {
90
+ for (const dep in external) {
91
+ objectExternal[dep] = external[dep];
92
+ }
93
+ return false;
93
94
  }
94
- }
95
+ return true;
96
+ });
97
+
98
+ compilerOptions.externals = [objectExternal, ...newExternals];
95
99
  }