@tramvai/cli 2.120.0 → 2.122.0

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 (34) hide show
  1. package/lib/builder/webpack/devServer/server.js +10 -0
  2. package/lib/builder/webpack/devServer/server.js.map +1 -1
  3. package/lib/config/configManager.js +12 -13
  4. package/lib/config/configManager.js.map +1 -1
  5. package/lib/library/webpack/application/client/dev.js +6 -14
  6. package/lib/library/webpack/application/client/dev.js.map +1 -1
  7. package/lib/library/webpack/application/client/prod/optimization/splitChunks.js +14 -1
  8. package/lib/library/webpack/application/client/prod/optimization/splitChunks.js.map +1 -1
  9. package/lib/library/webpack/blocks/pwa/client.js +24 -2
  10. package/lib/library/webpack/blocks/pwa/client.js.map +1 -1
  11. package/lib/library/webpack/common/main.js +3 -1
  12. package/lib/library/webpack/common/main.js.map +1 -1
  13. package/lib/library/webpack/plugins/PwaIconsPlugin.d.ts +3 -1
  14. package/lib/library/webpack/plugins/PwaIconsPlugin.js +7 -6
  15. package/lib/library/webpack/plugins/PwaIconsPlugin.js.map +1 -1
  16. package/lib/library/webpack/plugins/WebManifestPlugin.d.ts +6 -2
  17. package/lib/library/webpack/plugins/WebManifestPlugin.js +23 -3
  18. package/lib/library/webpack/plugins/WebManifestPlugin.js.map +1 -1
  19. package/lib/schema/autogeneratedSchema.json +16 -16
  20. package/lib/typings/pwa/index.d.ts +1 -1
  21. package/package.json +5 -5
  22. package/schema.json +16 -16
  23. package/src/api/start/__integration__/__fixtures__/app/server.tsx +1 -0
  24. package/src/api/start/__integration__/start.test.ts +2 -0
  25. package/src/builder/webpack/devServer/server.ts +13 -0
  26. package/src/config/configManager.ts +10 -13
  27. package/src/library/webpack/application/client/dev.ts +9 -17
  28. package/src/library/webpack/application/client/prod/optimization/splitChunks.ts +18 -1
  29. package/src/library/webpack/blocks/pwa/client.ts +36 -2
  30. package/src/library/webpack/common/main.ts +3 -1
  31. package/src/library/webpack/plugins/PwaIconsPlugin.ts +14 -7
  32. package/src/library/webpack/plugins/WebManifestPlugin.ts +35 -5
  33. package/src/schema/autogeneratedSchema.json +16 -16
  34. package/src/typings/pwa/index.ts +1 -1
@@ -57,6 +57,7 @@ const serverRunner = ({ di, config, compiler, configManager, server, }) => {
57
57
  let resolveWorkerPort;
58
58
  let workerPortPromise;
59
59
  let hasExitedUnexpectedly = false;
60
+ let proxyErrorCount = 0;
60
61
  const proxy = (0, http_proxy_1.createProxyServer)({
61
62
  // указываем, что сами обработаем ответ
62
63
  selfHandleResponse: true,
@@ -115,6 +116,7 @@ const serverRunner = ({ di, config, compiler, configManager, server, }) => {
115
116
  // делаем запросы к дочернему процессу и пытаемся полностью получить его ответ
116
117
  // если всё ок, то просто отправляем полученные данные клиенту
117
118
  proxy.on('proxyRes', (proxyRes, req, res) => {
119
+ proxyErrorCount--;
118
120
  if (!res.headersSent) {
119
121
  // дублируем всю логику прокси и отправляем ответ
120
122
  // немного костыль по мотивам https://github.com/http-party/node-http-proxy/issues/1263#issuecomment-394758768
@@ -150,7 +152,15 @@ const serverRunner = ({ di, config, compiler, configManager, server, }) => {
150
152
  res.end(EXITED_UNEXPECTEDLY);
151
153
  return;
152
154
  }
155
+ if (proxyErrorCount > 10) {
156
+ console.error('[dev-server-error] looping of request proxying to worker', err);
157
+ // @ts-ignore
158
+ res.statusCode = 500;
159
+ res.end(EXITED_UNEXPECTEDLY);
160
+ return;
161
+ }
153
162
  if (pool.state !== lightning_pool_1.PoolState.CLOSED) {
163
+ proxyErrorCount++;
154
164
  yield waitWorkerPort();
155
165
  proxy.web(req, res, { target: `http://localhost:${workerPort}` });
156
166
  }
@@ -1 +1 @@
1
- {"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../src/builder/webpack/devServer/server.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../src/builder/webpack/devServer/server.ts"],"names":[],"mappings":"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"}
@@ -39,7 +39,7 @@ exports.DEFAULT_STATIC_PORT = 4000;
39
39
  exports.DEFAULT_STATIC_MODULE_PORT = 4040;
40
40
  // eslint-disable-next-line max-statements, complexity
41
41
  const createConfigManager = (configEntry, settings) => {
42
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
42
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
43
43
  const env = (_a = settings.env) !== null && _a !== void 0 ? _a : 'development';
44
44
  const normalizedConfigEntry = omitEnvOptions(env, configEntry);
45
45
  const { type } = configEntry;
@@ -91,19 +91,18 @@ const createConfigManager = (configEntry, settings) => {
91
91
  config.buildPath = (0, path_1.resolve)(rootDir, buildType === 'server' ? config.output.server : config.output.client);
92
92
  const pwa = (_h = config.experiments) === null || _h === void 0 ? void 0 : _h.pwa;
93
93
  if ((_j = pwa.webmanifest) === null || _j === void 0 ? void 0 : _j.enabled) {
94
- pwa.webmanifest = Object.assign(Object.assign({ icons: ((_k = pwa.icon) === null || _k === void 0 ? void 0 : _k.src)
95
- ? pwa.icon.sizes.map((size) => ({
96
- src: `${config.assetsPrefix}${pwa.icon.dest}/${size}x${size}.png`,
97
- sizes: `${size}x${size}`,
98
- type: 'image/png',
99
- }))
100
- : [] }, pwa.webmanifest), { scope: (_l = pwa.webmanifest.scope) !== null && _l !== void 0 ? _l : (_m = pwa.sw) === null || _m === void 0 ? void 0 : _m.scope, name: (_o = pwa.webmanifest.name) !== null && _o !== void 0 ? _o : config.name, short_name: (_p = pwa.webmanifest.name) !== null && _p !== void 0 ? _p : config.name, theme_color: (_q = pwa.webmanifest.theme_color) !== null && _q !== void 0 ? _q : pwa.meta.themeColor });
94
+ pwa.webmanifest = Object.assign(Object.assign({}, pwa.webmanifest), { scope: (_k = pwa.webmanifest.scope) !== null && _k !== void 0 ? _k : (_l = pwa.sw) === null || _l === void 0 ? void 0 : _l.scope, name: (_m = pwa.webmanifest.name) !== null && _m !== void 0 ? _m : config.name, short_name: (_o = pwa.webmanifest.name) !== null && _o !== void 0 ? _o : config.name, theme_color: (_p = pwa.webmanifest.theme_color) !== null && _p !== void 0 ? _p : pwa.meta.themeColor });
101
95
  if (pwa.webmanifest.dest.includes('[hash]')) {
102
- const crypto = require('crypto');
103
- const hashSum = crypto.createHash('sha256');
104
- hashSum.update(JSON.stringify(pwa.webmanifest));
105
- const currentHash = hashSum.digest('hex');
106
- pwa.webmanifest.dest = pwa.webmanifest.dest.replace('[hash]', currentHash.substr(0, 8));
96
+ if (env === 'production') {
97
+ const crypto = require('crypto');
98
+ const hashSum = crypto.createHash('sha256');
99
+ hashSum.update(JSON.stringify(pwa.webmanifest));
100
+ const currentHash = hashSum.digest('hex');
101
+ pwa.webmanifest.dest = pwa.webmanifest.dest.replace('[hash]', currentHash.substr(0, 8));
102
+ }
103
+ else {
104
+ pwa.webmanifest.dest = pwa.webmanifest.dest.replace('.[hash]', '').replace('[hash].', '');
105
+ }
107
106
  }
108
107
  }
109
108
  }
@@ -1 +1 @@
1
- {"version":3,"file":"configManager.js","sourceRoot":"","sources":["../../src/config/configManager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"configManager.js","sourceRoot":"","sources":["../../src/config/configManager.ts"],"names":[],"mappings":"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"}
@@ -17,6 +17,7 @@ const sourcemaps_1 = tslib_1.__importDefault(require("../../blocks/sourcemaps"))
17
17
  const fancy_1 = tslib_1.__importDefault(require("../../plugins/WebpackBar/reporters/fancy"));
18
18
  const extendEntry_1 = require("../../utils/extendEntry");
19
19
  const extractCssPlugin_1 = require("../../blocks/extractCssPlugin");
20
+ const splitChunks_1 = require("./prod/optimization/splitChunks");
20
21
  // eslint-disable-next-line max-statements
21
22
  const webpackClientConfig = ({ configManager, showProgress, }) => {
22
23
  var _a, _b, _c;
@@ -51,7 +52,10 @@ const webpackClientConfig = ({ configManager, showProgress, }) => {
51
52
  .crossOriginLoading('anonymous');
52
53
  config.output.set('chunkLoadingGlobal', 'wsp');
53
54
  config.optimization.set('emitOnErrors', false);
54
- config.batch((0, extractCssPlugin_1.extractCssPluginFactory)(configManager));
55
+ config.batch((0, extractCssPlugin_1.extractCssPluginFactory)(configManager, {
56
+ filename: '[name].css',
57
+ chunkFilename: '[name].chunk.css',
58
+ }));
55
59
  if (showProgress) {
56
60
  config.plugin('progress').use(webpackbar_1.default, [
57
61
  {
@@ -91,21 +95,9 @@ const webpackClientConfig = ({ configManager, showProgress, }) => {
91
95
  config.plugin('define').tap((args) => [
92
96
  Object.assign(Object.assign({}, args[0]), { 'process.env.NODE_ENV': JSON.stringify('development') }),
93
97
  ]);
98
+ config.batch((0, splitChunks_1.splitChunksConfig)(configManager));
94
99
  const { hotRefresh } = configManager;
95
100
  if (hotRefresh === null || hotRefresh === void 0 ? void 0 : hotRefresh.enabled) {
96
- const splitChunks = {
97
- cacheGroups: {
98
- default: false,
99
- defaultVendors: false,
100
- commons: {
101
- name: 'hmr',
102
- enforce: true,
103
- test: /[\\/]node_modules[\\/](react-refresh|webpack-hot-middleware|@pmmmwh[\\/]react-refresh-webpack-plugin)[\\/]/,
104
- chunks: 'all',
105
- },
106
- },
107
- };
108
- config.optimization.splitChunks(splitChunks).set('chunkIds', 'named');
109
101
  (0, extendEntry_1.extendEntry)(config.entry('platform'), {
110
102
  import: [
111
103
  'webpack-hot-middleware/client?name=client&dynamicPublicPath=true&path=__webpack_hmr',
@@ -1 +1 @@
1
- {"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../../../src/library/webpack/application/client/dev.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../../../src/library/webpack/application/client/dev.ts"],"names":[],"mappings":"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"}
@@ -56,7 +56,8 @@ const splitChunksConfig = (configManager) => (config) => {
56
56
  if (!resource) {
57
57
  return false;
58
58
  }
59
- return topLevelFrameworkPaths.some((packagePath) => resource.startsWith(packagePath));
59
+ return (!resource.startsWith('react-refresh') &&
60
+ topLevelFrameworkPaths.some((packagePath) => resource.startsWith(packagePath)));
60
61
  },
61
62
  priority: 40,
62
63
  // Don't let webpack eliminate this chunk (prevents this chunk from becoming a part of the commons chunk)
@@ -78,6 +79,7 @@ const splitChunksConfig = (configManager) => (config) => {
78
79
  minChunks: splitChunks.granularChunksSplitNumber,
79
80
  minSize: splitChunks.granularChunksMinSize,
80
81
  reuseExistingChunk: true,
82
+ priority: 30,
81
83
  name(module, chunks) {
82
84
  return crypto_1.default
83
85
  .createHash('sha1')
@@ -99,11 +101,22 @@ const splitChunksConfig = (configManager) => (config) => {
99
101
  commons: {
100
102
  name: 'common-chunk',
101
103
  minChunks: splitChunks.commonChunkSplitNumber,
104
+ priority: 30,
102
105
  },
103
106
  },
104
107
  };
105
108
  break;
106
109
  }
110
+ const { hotRefresh } = configManager;
111
+ if ((hotRefresh === null || hotRefresh === void 0 ? void 0 : hotRefresh.enabled) && webpackSplitChunks) {
112
+ webpackSplitChunks.cacheGroups.hmr = {
113
+ name: 'hmr',
114
+ enforce: true,
115
+ test: /[\\/]node_modules[\\/](react-refresh|webpack-hot-middleware|@pmmmwh[\\/]react-refresh-webpack-plugin)[\\/]/,
116
+ chunks: 'all',
117
+ priority: 20,
118
+ };
119
+ }
107
120
  config.optimization
108
121
  .splitChunks(webpackSplitChunks)
109
122
  // namedChunks должно быть включено, чтобы webpack-flush-chunks смог определить имена чанков от которых зависит чанк бандла после обработчки через splitChunks
@@ -1 +1 @@
1
- {"version":3,"file":"splitChunks.js","sourceRoot":"","sources":["../../../../../../../src/library/webpack/application/client/prod/optimization/splitChunks.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"splitChunks.js","sourceRoot":"","sources":["../../../../../../../src/library/webpack/application/client/prod/optimization/splitChunks.ts"],"names":[],"mappings":"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"}
@@ -37,6 +37,21 @@ const pwaBlock =
37
37
  // @todo CSR fallback or all static pages?
38
38
  // do not forget about revision and possible conflict with modifyURLPrefix
39
39
  ],
40
+ manifestTransforms: [
41
+ (manifest, compilation) => {
42
+ return {
43
+ // we need to have a relative webmanifest url for precaching
44
+ manifest: manifest.map((asset) => {
45
+ const assetName = asset.url.replace(assetsPrefix, '');
46
+ const assetInfo = compilation.assetsInfo.get(asset.url.replace(assetsPrefix, ''));
47
+ if (assetInfo._webmanifestFilename) {
48
+ return Object.assign(Object.assign({}, asset), { url: `${pwa.sw.scope}${assetName}` });
49
+ }
50
+ return asset;
51
+ }),
52
+ };
53
+ },
54
+ ],
40
55
  };
41
56
  if (pwa.workbox.include) {
42
57
  workboxOptions.include = pwa.workbox.include.map((expr) => new RegExp(expr));
@@ -78,15 +93,22 @@ const pwaBlock =
78
93
  if (sourceMap) {
79
94
  config.output.set('devtoolNamespace', 'tramvai');
80
95
  }
96
+ config.plugin('define').tap((args) => [
97
+ Object.assign(Object.assign({}, args[0]), { 'process.env.ASSETS_PREFIX': JSON.stringify(assetsPrefix) }),
98
+ ]);
81
99
  config.plugin('workbox').use(workboxPlugin);
82
100
  }
83
101
  if ((_f = pwa.webmanifest) === null || _f === void 0 ? void 0 : _f.enabled) {
84
- const webmanifestPlugin = new WebManifestPlugin_1.WebManifestPlugin(pwa.webmanifest);
102
+ const webmanifestPlugin = new WebManifestPlugin_1.WebManifestPlugin({
103
+ manifest: pwa.webmanifest,
104
+ icon: pwa.icon,
105
+ assetsPrefix,
106
+ });
85
107
  config.plugin('webmanifest').use(webmanifestPlugin);
86
108
  }
87
109
  if ((_g = pwa.icon) === null || _g === void 0 ? void 0 : _g.src) {
88
110
  const iconSrc = path_1.default.join(rootDir, root, pwa.icon.src);
89
- const pwaIconsPlugin = new PwaIconsPlugin_1.PwaIconsPlugin(Object.assign(Object.assign({}, pwa.icon), { src: iconSrc }));
111
+ const pwaIconsPlugin = new PwaIconsPlugin_1.PwaIconsPlugin(Object.assign(Object.assign({}, pwa.icon), { src: iconSrc, mode: configManager.env }));
90
112
  config.plugin('pwa-icons').use(pwaIconsPlugin);
91
113
  }
92
114
  };
@@ -1 +1 @@
1
- {"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../src/library/webpack/blocks/pwa/client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../src/library/webpack/blocks/pwa/client.ts"],"names":[],"mappings":"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"}
@@ -73,7 +73,9 @@ exports.default = (configManager) => (config) => {
73
73
  .end()
74
74
  .plugin('define')
75
75
  .use(webpack_1.default.DefinePlugin, [
76
- Object.assign(Object.assign(Object.assign({}, configManager.define.shared), configManager.define[configManager.env]), { 'process.env.APP_ID': JSON.stringify(configManager.name || 'common'), 'process.env.APP_VERSION': JSON.stringify(process.env.APP_VERSION), 'process.env.ENABLE_DEVTOOLS': process.env.ENABLE_DEVTOOLS || configManager.env === 'development', 'process.env.DISABLE_EXTERNAL_SCRIPTS': process.env.DISABLE_EXTERNAL_SCRIPTS || false }),
76
+ Object.assign(Object.assign(Object.assign({}, configManager.define.shared), configManager.define[configManager.env]), { 'process.env.APP_ID': JSON.stringify(configManager.name || 'common'), 'process.env.APP_VERSION': process.env.APP_VERSION
77
+ ? JSON.stringify(process.env.APP_VERSION)
78
+ : undefined, 'process.env.ENABLE_DEVTOOLS': process.env.ENABLE_DEVTOOLS || configManager.env === 'development', 'process.env.DISABLE_EXTERNAL_SCRIPTS': process.env.DISABLE_EXTERNAL_SCRIPTS || false }),
77
79
  ]);
78
80
  // TODO: remove after dropping support for node@14
79
81
  if (configManager.buildType === 'server') {
@@ -1 +1 @@
1
- {"version":3,"file":"main.js","sourceRoot":"","sources":["../../../../src/library/webpack/common/main.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"main.js","sourceRoot":"","sources":["../../../../src/library/webpack/common/main.ts"],"names":[],"mappings":";;;AAAA,8DAA8B;AAE9B,wDAAwB;AACxB,uCAAsC;AACtC,4EAA0C;AAC1C,wEAAwC;AACxC,oFAAoD;AAEpD,4DAAgE;AAEhE,uCAAqD;AAErD,MAAM,gBAAgB,GAAG,CAAC,SAAmB,EAAE,EAAE;IAC/C,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE;QACnC,OAAO,QAAQ,IAAI,IAAA,qBAAU,EAAC,QAAQ,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,oDAAoD;AACpD,kBAAe,CAAC,aAA4C,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;;IAClF,MAAM,GAAG,GAAG,aAAa,CAAC,GAAG,KAAK,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;IAEjE,oDAAoD;IACpD,iEAAiE;IACjE,MAAM,CAAC,MAAM,CAAC,GAAG,CACf,YAAY,EACZ,GAAG,aAAa,CAAC,IAAI,IAAI,aAAa,CAAC,IAAI,IAAI,aAAa,CAAC,OAAO,EAAE,CACvE,CAAC;IAEF,MAAM,CAAC,OAAO,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAChE,MAAM,CAAC,KAAK,CAAC,IAAA,iBAAO,EAAC,aAAa,CAAC,CAAC,CAAC;IACrC,MAAM,CAAC,KAAK,CAAC,IAAA,uBAAa,GAAE,CAAC,CAAC;IAE9B,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC,GAAG,EAAE,CAAC;IAE7D,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;IAEjD,0FAA0F;IAC1F,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;IAE/D,2EAA2E;IAC3E,kIAAkI;IAClI,+CAA+C;IAC/C,mDAAmD;IAEnD,4EAA4E;IAC5E,+DAA+D;IAC/D,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,+BAA+B,EAAE,IAAI,CAAC,CAAC;IAEzD;;;;;;OAMG;IACH,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;IAE5D,IAAI,aAAa,CAAC,SAAS,EAAE;QAC3B,MAAM,CAAC,KAAK,CAAC;YACX,IAAI,EAAE,YAAY;YAClB,IAAI,EAAE,GAAG,GAAG,IAAI,aAAa,CAAC,IAAI,IAAI,aAAa,CAAC,SAAS,IAAI,aAAa,CAAC,IAAI,GACjF,aAAa,CAAC,SAAS,KAAK,QAAQ,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAC7E,EAAE;YACF,cAAc,EAAE,IAAA,wBAAY,EAAC,EAAE,GAAG,EAAE,aAAa,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;YAC7E,iBAAiB,EAAE;gBACjB,GAAG,EAAE,CAAC,cAAc,CAAC;gBACrB,OAAO,EAAE,CAAC,aAAa,CAAC;gBACxB,0HAA0H;gBAC1H,iEAAiE;gBACjE,MAAM,EAAE,gBAAgB,CAAC,CAAC,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC;gBAC/E,GAAG,EAAE,gBAAgB,CAAC;oBACpB,IAAA,gCAAkB,EAChB,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,IAAA,0BAAoB,EAAC,aAAa,CAAC,CAAC,EACxE,IAAI,CACL;iBACF,CAAC;aACH;SACF,CAAC,CAAC;KACJ;IAED,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE;QACrB,kFAAkF;QAClF,8JAA8J;QAC9J,YAAY,EAAE,EAAE;KACjB,CAAC,CAAC;IAEH,MAAM,CAAC,GAAG,CAAC,aAAa,EAAE,MAAA,aAAa,CAAC,WAAW,CAAC,OAAO,mCAAI,EAAE,CAAC,CAAC;IAEnE,MAAM;SACH,IAAI,CAAC,aAAa,CAAC;SACnB,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC;SAC5B,WAAW,CAAC,KAAK,CAAC;SAClB,GAAG,EAAE;SACL,MAAM,CAAC,QAAQ,CAAC;SAChB,GAAG,CAAC,iBAAO,CAAC,YAAY,EAAE;sDAEpB,aAAa,CAAC,MAAM,CAAC,MAAM,GAC3B,aAAa,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,KAE1C,oBAAoB,EAAE,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,IAAI,QAAQ,CAAC,EACpE,yBAAyB,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW;gBAChD,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;gBACzC,CAAC,CAAC,SAAS,EAEb,6BAA6B,EAC3B,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,aAAa,CAAC,GAAG,KAAK,aAAa,EAEpE,sCAAsC,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,KAAK;KAExF,CAAC,CAAC;IAEL,kDAAkD;IAClD,IAAI,aAAa,CAAC,SAAS,KAAK,QAAQ,EAAE;QACxC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAAC,iBAAO,CAAC,aAAa,EAAE;YAC3D;gBACE,WAAW,EAAE,CAAC,YAAY,EAAE,aAAa,CAAC;aAC3C;SACF,CAAC,CAAC;KACJ;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
@@ -4,6 +4,8 @@ import type { PwaIconOptions } from '../../../typings/pwa';
4
4
  export declare class PwaIconsPlugin implements webpack.WebpackPluginInstance {
5
5
  private options;
6
6
  private hash;
7
- constructor(options: PwaIconOptions);
7
+ constructor(options: PwaIconOptions & {
8
+ mode: 'production' | 'development';
9
+ });
8
10
  apply(compiler: Compiler): void;
9
11
  }
@@ -12,7 +12,7 @@ class PwaIconsPlugin {
12
12
  const { webpack } = compiler;
13
13
  const { Compilation } = webpack;
14
14
  const { RawSource } = webpack.sources;
15
- const { src, dest, sizes } = this.options;
15
+ const { src, dest, sizes, mode } = this.options;
16
16
  compiler.hooks.thisCompilation.tap(pluginName, (compilation) => {
17
17
  // watch icon source file
18
18
  if (!compilation.fileDependencies.has(src)) {
@@ -20,7 +20,8 @@ class PwaIconsPlugin {
20
20
  }
21
21
  compilation.hooks.processAssets.tapPromise({
22
22
  name: pluginName,
23
- stage: Compilation.PROCESS_ASSETS_STAGE_ADDITIONS,
23
+ // to work before WebManifestPlugin
24
+ stage: Compilation.PROCESS_ASSETS_STAGE_ADDITIONS - 1,
24
25
  }, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
25
26
  try {
26
27
  const sharp = require('sharp');
@@ -50,19 +51,19 @@ class PwaIconsPlugin {
50
51
  })
51
52
  .toBuffer()
52
53
  .then((content) => ({
53
- filename: `${dest}/${size}x${size}.png`,
54
+ filename: `${dest}/${size}x${size}${mode === 'development' ? '' : `.${this.hash}`}.png`,
54
55
  content,
55
56
  }));
56
57
  });
57
58
  const results = yield Promise.all(promises);
58
- results.forEach(({ filename, content }) => {
59
+ results.forEach(({ filename, content }, i) => {
59
60
  const source = new RawSource(content);
60
61
  const asset = compilation.getAsset(filename);
61
62
  if (asset) {
62
- compilation.updateAsset(filename, source);
63
+ compilation.updateAsset(filename, source, { _pwaIconSize: sizes[i] });
63
64
  }
64
65
  else {
65
- compilation.emitAsset(filename, source);
66
+ compilation.emitAsset(filename, source, { _pwaIconSize: sizes[i] });
66
67
  }
67
68
  });
68
69
  }
@@ -1 +1 @@
1
- {"version":3,"file":"PwaIconsPlugin.js","sourceRoot":"","sources":["../../../../src/library/webpack/plugins/PwaIconsPlugin.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PwaIconsPlugin.js","sourceRoot":"","sources":["../../../../src/library/webpack/plugins/PwaIconsPlugin.ts"],"names":[],"mappings":";;;;AAKA,MAAM,UAAU,GAAG,gBAAgB,CAAC;AAEpC,MAAa,cAAc;IAGzB,YACU,OAEP;QAFO,YAAO,GAAP,OAAO,CAEd;QAED,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,QAAkB;QACtB,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC;QAC7B,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;QAChC,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;QACtC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QAEhD,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,WAAW,EAAE,EAAE;YAC7D,yBAAyB;YACzB,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gBAC1C,WAAW,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;aACvC;YAED,WAAW,CAAC,KAAK,CAAC,aAAa,CAAC,UAAU,CACxC;gBACE,IAAI,EAAE,UAAU;gBAChB,mCAAmC;gBACnC,KAAK,EAAE,WAAW,CAAC,8BAA8B,GAAG,CAAC;aACtD,EACD,GAAS,EAAE;gBACT,IAAI;oBACF,MAAM,KAAK,GAAiB,OAAO,CAAC,OAAO,CAAC,CAAC;oBAC7C,iCAAiC;oBACjC,MAAM,QAAQ,GAAG,MAAM,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,EAAE;wBACrD,WAAW,CAAC,cAAc,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE;4BACtD,OAAO,CAAC,IAAI,CAAC,CAAC;wBAChB,CAAC,CAAC,CAAC;oBACL,CAAC,CAAC,CAAC;oBAEH,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;wBACd,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC;qBACtB;yBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE;wBACjC,uCAAuC;wBACvC,OAAO;qBACR;oBAED,4CAA4C;oBAC5C,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;wBAClC,OAAO,KAAK,CAAC,GAAG,CAAC;6BACd,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;6BACrC,GAAG,CAAC;4BACH,OAAO,EAAE,EAAE;4BACX,gBAAgB,EAAE,CAAC;4BACnB,iBAAiB,EAAE,IAAI;4BACvB,WAAW,EAAE,IAAI;4BACjB,KAAK,EAAE,IAAI;yBACZ,CAAC;6BACD,QAAQ,EAAE;6BACV,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;4BAClB,QAAQ,EAAE,GAAG,IAAI,IAAI,IAAI,IAAI,IAAI,GAC/B,IAAI,KAAK,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,EAC7C,MAAM;4BACN,OAAO;yBACR,CAAC,CAAC,CAAC;oBACR,CAAC,CAAC,CAAC;oBAEH,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;oBAE5C,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE;wBAC3C,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC;wBACtC,MAAM,KAAK,GAAG,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;wBAE7C,IAAI,KAAK,EAAE;4BACT,WAAW,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;yBACvE;6BAAM;4BACL,WAAW,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;yBACrE;oBACH,CAAC,CAAC,CAAC;iBACJ;gBAAC,OAAO,CAAC,EAAE;oBACV,sBAAsB;oBACtB,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,CAAC,CAAC,CAAC;iBACjD;YACH,CAAC,CAAA,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAtFD,wCAsFC"}
@@ -1,8 +1,12 @@
1
1
  import type webpack from 'webpack';
2
2
  import type { Compiler } from 'webpack';
3
- import type { WebManifestOptions } from '../../../typings/pwa';
3
+ import type { PwaIconOptions, WebManifestOptions } from '../../../typings/pwa';
4
4
  export declare class WebManifestPlugin implements webpack.WebpackPluginInstance {
5
5
  private options;
6
- constructor(options: WebManifestOptions);
6
+ constructor(options: {
7
+ manifest: WebManifestOptions;
8
+ icon: PwaIconOptions;
9
+ assetsPrefix: string;
10
+ });
7
11
  apply(compiler: Compiler): void;
8
12
  }
@@ -12,14 +12,34 @@ class WebManifestPlugin {
12
12
  const { webpack } = compiler;
13
13
  const { Compilation } = webpack;
14
14
  const { RawSource } = webpack.sources;
15
- const _a = this.options, { dest, enabled } = _a, content = tslib_1.__rest(_a, ["dest", "enabled"]);
15
+ const _a = this.options, _b = _a.manifest, { dest, enabled } = _b, content = tslib_1.__rest(_b, ["dest", "enabled"]), { icon, assetsPrefix } = _a;
16
16
  compiler.hooks.thisCompilation.tap(pluginName, (compilation) => {
17
17
  compilation.hooks.processAssets.tap({
18
18
  name: pluginName,
19
19
  stage: Compilation.PROCESS_ASSETS_STAGE_ADDITIONS,
20
- }, () => {
20
+ }, (compilationAssets) => {
21
+ if (!content.icons && (icon === null || icon === void 0 ? void 0 : icon.src)) {
22
+ const assets = Object.keys(compilationAssets);
23
+ assets.forEach((asset) => {
24
+ const assetInfo = compilation.assetsInfo.get(asset);
25
+ // asset info `_pwaIconSize` added in PwaIconsPlugin
26
+ const size = assetInfo._pwaIconSize;
27
+ if (size) {
28
+ if (!content.icons) {
29
+ content.icons = [];
30
+ }
31
+ content.icons.push({
32
+ src: `${assetsPrefix}${asset}`,
33
+ sizes: `${size}x${size}`,
34
+ type: 'image/png',
35
+ });
36
+ }
37
+ });
38
+ }
21
39
  const manifestFilename = dest.replace(/^\//, '');
22
- compilation.emitAsset(manifestFilename, new RawSource(JSON.stringify(content, null, 2)));
40
+ compilation.emitAsset(manifestFilename, new RawSource(JSON.stringify(content, null, 2)), {
41
+ _webmanifestFilename: manifestFilename,
42
+ });
23
43
  });
24
44
  });
25
45
  }
@@ -1 +1 @@
1
- {"version":3,"file":"WebManifestPlugin.js","sourceRoot":"","sources":["../../../../src/library/webpack/plugins/WebManifestPlugin.ts"],"names":[],"mappings":";;;;AAIA,MAAM,UAAU,GAAG,mBAAmB,CAAC;AAEvC,MAAa,iBAAiB;IAC5B,YAAoB,OAA2B;QAA3B,YAAO,GAAP,OAAO,CAAoB;QAC7C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,QAAkB;QACtB,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC;QAC7B,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;QAChC,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;QACtC,MAAM,KAAgC,IAAI,CAAC,OAAO,EAA5C,EAAE,IAAI,EAAE,OAAO,OAA6B,EAAxB,OAAO,sBAA3B,mBAA6B,CAAe,CAAC;QAEnD,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,WAAW,EAAE,EAAE;YAC7D,WAAW,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,CACjC;gBACE,IAAI,EAAE,UAAU;gBAChB,KAAK,EAAE,WAAW,CAAC,8BAA8B;aAClD,EACD,GAAG,EAAE;gBACH,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBAEjD,WAAW,CAAC,SAAS,CAAC,gBAAgB,EAAE,IAAI,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3F,CAAC,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAzBD,8CAyBC"}
1
+ {"version":3,"file":"WebManifestPlugin.js","sourceRoot":"","sources":["../../../../src/library/webpack/plugins/WebManifestPlugin.ts"],"names":[],"mappings":";;;;AAIA,MAAM,UAAU,GAAG,mBAAmB,CAAC;AAEvC,MAAa,iBAAiB;IAC5B,YACU,OAAqF;QAArF,YAAO,GAAP,OAAO,CAA8E;QAE7F,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,QAAkB;QACtB,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC;QAC7B,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;QAChC,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;QACtC,MAAM,KAIF,IAAI,CAAC,OAAO,EAHd,gBAAuC,EAAvC,EAAY,IAAI,EAAE,OAAO,OAAc,EAAT,OAAO,sBAA3B,mBAA6B,CAAF,EADjC,EAEJ,IAAI,EACJ,YAAY,OACE,CAAC;QAEjB,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,WAAW,EAAE,EAAE;YAC7D,WAAW,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,CACjC;gBACE,IAAI,EAAE,UAAU;gBAChB,KAAK,EAAE,WAAW,CAAC,8BAA8B;aAClD,EACD,CAAC,iBAAiB,EAAE,EAAE;gBACpB,IAAI,CAAC,OAAO,CAAC,KAAK,KAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,GAAG,CAAA,EAAE;oBAC/B,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;oBAE9C,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;wBACvB,MAAM,SAAS,GAAG,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;wBACpD,oDAAoD;wBACpD,MAAM,IAAI,GAAG,SAAS,CAAC,YAAY,CAAC;wBAEpC,IAAI,IAAI,EAAE;4BACR,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;gCAClB,OAAO,CAAC,KAAK,GAAG,EAAE,CAAC;6BACpB;4BAED,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;gCACjB,GAAG,EAAE,GAAG,YAAY,GAAG,KAAK,EAAE;gCAC9B,KAAK,EAAE,GAAG,IAAI,IAAI,IAAI,EAAE;gCACxB,IAAI,EAAE,WAAW;6BAClB,CAAC,CAAC;yBACJ;oBACH,CAAC,CAAC,CAAC;iBACJ;gBAED,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBAEjD,WAAW,CAAC,SAAS,CAAC,gBAAgB,EAAE,IAAI,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE;oBACvF,oBAAoB,EAAE,gBAAgB;iBACvC,CAAC,CAAC;YACL,CAAC,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAvDD,8CAuDC"}
@@ -652,7 +652,7 @@
652
652
  "type": "boolean"
653
653
  },
654
654
  "dest": {
655
- "title": "Name of generated manifest file (will be placed in \"output.client\" directory). You can use `[hash]` placeholder for manifest cache busting",
655
+ "title": "Name of generated manifest file (will be placed in \"output.client\" directory). You can use `[hash]` placeholder for manifest cache busting in production mode",
656
656
  "default": "/manifest.[hash].json",
657
657
  "type": "string"
658
658
  },
@@ -1122,23 +1122,23 @@
1122
1122
  "dotAll": {
1123
1123
  "type": "boolean"
1124
1124
  },
1125
- "__@match@8168": {
1125
+ "__@match@8191": {
1126
1126
  "type": "object",
1127
1127
  "additionalProperties": false
1128
1128
  },
1129
- "__@replace@8170": {
1129
+ "__@replace@8193": {
1130
1130
  "type": "object",
1131
1131
  "additionalProperties": false
1132
1132
  },
1133
- "__@search@8173": {
1133
+ "__@search@8196": {
1134
1134
  "type": "object",
1135
1135
  "additionalProperties": false
1136
1136
  },
1137
- "__@split@8175": {
1137
+ "__@split@8198": {
1138
1138
  "type": "object",
1139
1139
  "additionalProperties": false
1140
1140
  },
1141
- "__@matchAll@8177": {
1141
+ "__@matchAll@8200": {
1142
1142
  "type": "object",
1143
1143
  "additionalProperties": false
1144
1144
  }
@@ -1764,23 +1764,23 @@
1764
1764
  "dotAll": {
1765
1765
  "type": "boolean"
1766
1766
  },
1767
- "__@match@8168": {
1767
+ "__@match@8191": {
1768
1768
  "type": "object",
1769
1769
  "additionalProperties": false
1770
1770
  },
1771
- "__@replace@8170": {
1771
+ "__@replace@8193": {
1772
1772
  "type": "object",
1773
1773
  "additionalProperties": false
1774
1774
  },
1775
- "__@search@8173": {
1775
+ "__@search@8196": {
1776
1776
  "type": "object",
1777
1777
  "additionalProperties": false
1778
1778
  },
1779
- "__@split@8175": {
1779
+ "__@split@8198": {
1780
1780
  "type": "object",
1781
1781
  "additionalProperties": false
1782
1782
  },
1783
- "__@matchAll@8177": {
1783
+ "__@matchAll@8200": {
1784
1784
  "type": "object",
1785
1785
  "additionalProperties": false
1786
1786
  }
@@ -2406,23 +2406,23 @@
2406
2406
  "dotAll": {
2407
2407
  "type": "boolean"
2408
2408
  },
2409
- "__@match@8168": {
2409
+ "__@match@8191": {
2410
2410
  "type": "object",
2411
2411
  "additionalProperties": false
2412
2412
  },
2413
- "__@replace@8170": {
2413
+ "__@replace@8193": {
2414
2414
  "type": "object",
2415
2415
  "additionalProperties": false
2416
2416
  },
2417
- "__@search@8173": {
2417
+ "__@search@8196": {
2418
2418
  "type": "object",
2419
2419
  "additionalProperties": false
2420
2420
  },
2421
- "__@split@8175": {
2421
+ "__@split@8198": {
2422
2422
  "type": "object",
2423
2423
  "additionalProperties": false
2424
2424
  },
2425
- "__@matchAll@8177": {
2425
+ "__@matchAll@8200": {
2426
2426
  "type": "object",
2427
2427
  "additionalProperties": false
2428
2428
  }
@@ -5,7 +5,7 @@ export type WebManifestOptions = {
5
5
  */
6
6
  enabled?: boolean;
7
7
  /**
8
- * @title Name of generated manifest file (will be placed in "output.client" directory). You can use `[hash]` placeholder for manifest cache busting
8
+ * @title Name of generated manifest file (will be placed in "output.client" directory). You can use `[hash]` placeholder for manifest cache busting in production mode
9
9
  * @default "/manifest.[hash].json"
10
10
  */
11
11
  dest?: string;