piral-cli-webpack5 1.9.0-beta.8209 → 1.9.0-beta.8233

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 (12) hide show
  1. package/README.md +2 -0
  2. package/lib/helpers.d.ts +1 -1
  3. package/lib/helpers.js +10 -3
  4. package/lib/helpers.js.map +1 -1
  5. package/lib/webpack/pilet.js +1 -1
  6. package/lib/webpack/pilet.js.map +1 -1
  7. package/lib/webpack/piral.js +1 -1
  8. package/lib/webpack/piral.js.map +1 -1
  9. package/package.json +3 -3
  10. package/src/helpers.ts +11 -4
  11. package/src/webpack/pilet.ts +1 -1
  12. package/src/webpack/piral.ts +1 -1
package/README.md CHANGED
@@ -64,6 +64,8 @@ module.exports = function(config) {
64
64
  };
65
65
  ```
66
66
 
67
+ Your function may be async or return a Promise as needed.
68
+
67
69
  Otherwise, you can also use the `extend-config` helper module to get the job done without having to know the internals:
68
70
 
69
71
  ```js
package/lib/helpers.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  import { Configuration } from 'webpack';
2
2
  import { DefaultConfiguration } from './webpack/common';
3
- export declare function extendConfig([webPackConfig, enhancer]: DefaultConfiguration, otherConfigPath: string, overrides?: Configuration): Configuration;
3
+ export declare function extendConfig([webPackConfig, enhancer]: DefaultConfiguration, otherConfigPath: string, overrides?: Configuration): Promise<Configuration>;
package/lib/helpers.js CHANGED
@@ -2,13 +2,20 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.extendConfig = extendConfig;
4
4
  const fs_1 = require("fs");
5
- function extendConfig([webPackConfig, enhancer], otherConfigPath, overrides = {}) {
5
+ async function extendConfig([webPackConfig, enhancer], otherConfigPath, overrides = {}) {
6
6
  const original = webPackConfig;
7
7
  if ((0, fs_1.existsSync)(otherConfigPath)) {
8
8
  try {
9
- const otherConfig = require(otherConfigPath);
9
+ let otherConfig = require(otherConfigPath);
10
+ if (otherConfig.default) {
11
+ // The webpack config file appears to be an ESM module;
12
+ // this interop should give us the actual exported config
13
+ otherConfig = otherConfig.default;
14
+ }
10
15
  if (typeof otherConfig === 'function') {
11
- webPackConfig = otherConfig(webPackConfig);
16
+ // support Promise for returned config:
17
+ // https://webpack.js.org/configuration/configuration-types/#exporting-a-promise
18
+ webPackConfig = await otherConfig(webPackConfig);
12
19
  }
13
20
  else if (typeof otherConfig === 'object') {
14
21
  webPackConfig = {
package/lib/helpers.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":";;AAIA,oCAsCC;AA1CD,2BAAgC;AAIhC,SAAgB,YAAY,CAC1B,CAAC,aAAa,EAAE,QAAQ,CAAuB,EAC/C,eAAuB,EACvB,YAA2B,EAAE;IAE7B,MAAM,QAAQ,GAAG,aAAa,CAAC;IAE/B,IAAI,IAAA,eAAU,EAAC,eAAe,CAAC,EAAE,CAAC;QAChC,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;YAE7C,IAAI,OAAO,WAAW,KAAK,UAAU,EAAE,CAAC;gBACtC,aAAa,GAAG,WAAW,CAAC,aAAa,CAAC,CAAC;YAC7C,CAAC;iBAAM,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;gBAC3C,aAAa,GAAG;oBACd,GAAG,aAAa;oBAChB,GAAG,WAAW;iBACf,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,IAAI,CAAC,sCAAsC,eAAe,cAAc,CAAC,CAAC;YACpF,CAAC;QACH,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACZ,OAAO,CAAC,KAAK,CAAC,sCAAsC,eAAe,MAAM,EAAE,EAAE,CAAC,CAAC;QACjF,CAAC;IACH,CAAC;IAED,CAAC,OAAO,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAChD,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;YACrC,OAAO,CAAC,IAAI,CACV,2BAA2B,CAAC,yEAAyE,CACtG,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,QAAQ,CAAC;QACd,GAAG,aAAa;QAChB,GAAG,SAAS;KACb,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":";;AAIA,oCA6CC;AAjDD,2BAAgC;AAIzB,KAAK,UAAU,YAAY,CAChC,CAAC,aAAa,EAAE,QAAQ,CAAuB,EAC/C,eAAuB,EACvB,YAA2B,EAAE;IAE7B,MAAM,QAAQ,GAAG,aAAa,CAAC;IAE/B,IAAI,IAAA,eAAU,EAAC,eAAe,CAAC,EAAE,CAAC;QAChC,IAAI,CAAC;YACH,IAAI,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;YAC3C,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;gBACxB,uDAAuD;gBACvD,yDAAyD;gBACzD,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC;YACpC,CAAC;YAED,IAAI,OAAO,WAAW,KAAK,UAAU,EAAE,CAAC;gBACtC,uCAAuC;gBACvC,gFAAgF;gBAChF,aAAa,GAAG,MAAM,WAAW,CAAC,aAAa,CAAC,CAAC;YACnD,CAAC;iBAAM,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;gBAC3C,aAAa,GAAG;oBACd,GAAG,aAAa;oBAChB,GAAG,WAAW;iBACf,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,IAAI,CAAC,sCAAsC,eAAe,cAAc,CAAC,CAAC;YACpF,CAAC;QACH,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACZ,OAAO,CAAC,KAAK,CAAC,sCAAsC,eAAe,MAAM,EAAE,EAAE,CAAC,CAAC;QACjF,CAAC;IACH,CAAC;IAED,CAAC,OAAO,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAChD,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;YACrC,OAAO,CAAC,IAAI,CACV,2BAA2B,CAAC,yEAAyE,CACtG,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,QAAQ,CAAC;QACd,GAAG,aAAa;QAChB,GAAG,SAAS;KACb,CAAC,CAAC;AACL,CAAC"}
package/lib/webpack/pilet.js CHANGED
@@ -74,7 +74,7 @@ const handler = {
74
74
  const { config = constants_1.defaultWebpackConfig } = options.args._;
75
75
  const otherConfigPath = (0, path_1.resolve)(options.root, config);
76
76
  const baseConfig = await getConfig(options.entryModule, options.outDir, options.outFile, options.externals, options.importmap, options.piralInstances, options.version, options.develop, options.sourceMaps, options.contentHash, options.minify);
77
- const wpConfig = (0, helpers_1.extendConfig)(baseConfig, otherConfigPath, {
77
+ const wpConfig = await (0, helpers_1.extendConfig)(baseConfig, otherConfigPath, {
78
78
  watch: options.watch,
79
79
  });
80
80
  return (0, bundler_run_1.runWebpack)(wpConfig, options.logLevel);
package/lib/webpack/pilet.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"pilet.js","sourceRoot":"","sources":["../../src/webpack/pilet.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pilet.js","sourceRoot":"","sources":["../../src/webpack/pilet.ts"],"names":[],"mappings":"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"}
package/lib/webpack/piral.js CHANGED
@@ -73,7 +73,7 @@ const handler = {
73
73
  const hmrPort = options.hmr ? await (0, utils_1.getFreePort)(defaultHmrPort) : 0;
74
74
  const otherConfigPath = (0, path_1.resolve)(options.root, config);
75
75
  const baseConfig = await getConfig(options.entryFiles, options.outDir, options.externals, options.emulator, options.sourceMaps, options.contentHash, options.minify, options.publicUrl, hmrPort);
76
- const wpConfig = (0, helpers_1.extendConfig)(baseConfig, otherConfigPath, {
76
+ const wpConfig = await (0, helpers_1.extendConfig)(baseConfig, otherConfigPath, {
77
77
  watch: options.watch,
78
78
  });
79
79
  return (0, bundler_run_1.runWebpack)(wpConfig, options.logLevel);
package/lib/webpack/piral.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"piral.js","sourceRoot":"","sources":["../../src/webpack/piral.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"piral.js","sourceRoot":"","sources":["../../src/webpack/piral.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": "1.9.0-beta.8209",
3
+ "version": "1.9.0-beta.8233",
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": "^18",
49
49
  "@types/terser-webpack-plugin": "^5.2.0",
50
50
  "@types/yargs": "^15",
51
- "piral-cli": "1.9.0-beta.8209",
51
+ "piral-cli": "1.9.0-beta.8233",
52
52
  "strip-ansi": "^6"
53
53
  },
54
54
  "dependencies": {
@@ -75,5 +75,5 @@
75
75
  "ts-loader": "^9",
76
76
  "webpack": "^5"
77
77
  },
78
- "gitHead": "6ae23abba61e76479bc06b76454c38957bc0e79e"
78
+ "gitHead": "311be807ecde5aca29507a124768fa38f375bf8e"
79
79
  }
package/src/helpers.ts CHANGED
@@ -2,19 +2,26 @@ import { existsSync } from 'fs';
2
2
  import { Configuration } from 'webpack';
3
3
  import { DefaultConfiguration } from './webpack/common';
4
4
 
5
- export function extendConfig(
5
+ export async function extendConfig(
6
6
  [webPackConfig, enhancer]: DefaultConfiguration,
7
7
  otherConfigPath: string,
8
8
  overrides: Configuration = {},
9
- ): Configuration {
9
+ ): Promise<Configuration> {
10
10
  const original = webPackConfig;
11
11
 
12
12
  if (existsSync(otherConfigPath)) {
13
13
  try {
14
- const otherConfig = require(otherConfigPath);
14
+ let otherConfig = require(otherConfigPath);
15
+ if (otherConfig.default) {
16
+ // The webpack config file appears to be an ESM module;
17
+ // this interop should give us the actual exported config
18
+ otherConfig = otherConfig.default;
19
+ }
15
20
 
16
21
  if (typeof otherConfig === 'function') {
17
- webPackConfig = otherConfig(webPackConfig);
22
+ // support Promise for returned config:
23
+ // https://webpack.js.org/configuration/configuration-types/#exporting-a-promise
24
+ webPackConfig = await otherConfig(webPackConfig);
18
25
  } else if (typeof otherConfig === 'object') {
19
26
  webPackConfig = {
20
27
  ...webPackConfig,
package/src/webpack/pilet.ts CHANGED
@@ -110,7 +110,7 @@ const handler: PiletBuildHandler = {
110
110
  options.contentHash,
111
111
  options.minify,
112
112
  );
113
- const wpConfig = extendConfig(baseConfig, otherConfigPath, {
113
+ const wpConfig = await extendConfig(baseConfig, otherConfigPath, {
114
114
  watch: options.watch,
115
115
  });
116
116
 
package/src/webpack/piral.ts CHANGED
@@ -106,7 +106,7 @@ const handler: PiralBuildHandler = {
106
106
  options.publicUrl,
107
107
  hmrPort,
108
108
  );
109
- const wpConfig = extendConfig(baseConfig, otherConfigPath, {
109
+ const wpConfig = await extendConfig(baseConfig, otherConfigPath, {
110
110
  watch: options.watch,
111
111
  });
112
112