@next-core/brick-container 2.94.16 → 2.94.17

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.
package/dist/preview.html CHANGED
@@ -1 +1 @@
1
- <!doctype html><html lang="zh-CN" data-theme="light" data-mode="default"><head><meta charset="utf-8"/><base href="<!--# echo var='base_href' default='/' -->"/><script>window.DEVELOPER_PREVIEW = true;</script><link href="preview.af3356b91578130626ac.css" rel="stylesheet"></head><body><div id="preview-root"><div id="main-mount-point"></div><div id="bg-mount-point" style="display: none"></div><div id="portal-mount-point"></div></div><script src="dll.82f02488.js"></script><script src="polyfill.5f60d909121d6c84d42d.js"></script><script src="preview.e567ac2e3de7bb4a6d0a.js"></script></body></html>
1
+ <!doctype html><html lang="zh-CN" data-theme="light" data-mode="default"><head><meta charset="utf-8"/><base href="<!--# echo var='base_href' default='/' -->"/><script>window.DEVELOPER_PREVIEW = true;</script><link href="preview.6f3151dc7fb56c258ab8.css" rel="stylesheet"></head><body><div id="preview-root"><div id="main-mount-point"></div><div id="bg-mount-point" style="display: none"></div><div id="portal-mount-point"></div></div><script src="dll.82f02488.js"></script><script src="polyfill.5f60d909121d6c84d42d.js"></script><script src="preview.e567ac2e3de7bb4a6d0a.js"></script></body></html>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@next-core/brick-container",
3
- "version": "2.94.16",
3
+ "version": "2.94.17",
4
4
  "description": "Brick Container Server",
5
5
  "homepage": "https://github.com/easyops-cn/next-core/tree/master/packages/brick-container",
6
6
  "license": "GPL-3.0",
@@ -73,5 +73,5 @@
73
73
  "webpack-dev-server": "^4.11.1",
74
74
  "webpack-merge": "^5.8.0"
75
75
  },
76
- "gitHead": "cc8369bd739524608c6ea51fdd8e510426e1d0f7"
76
+ "gitHead": "9b6d36be41fe4e50536e36f312a0b71218d3a0d3"
77
77
  }
@@ -15,6 +15,7 @@ const {
15
15
  appendLiveReloadScript,
16
16
  tryFiles,
17
17
  removeCacheHeaders,
18
+ getProcessedPublicDeps,
18
19
  } = require("./utils");
19
20
  const { injectIndexHtml } = require("./getIndexHtml");
20
21
 
@@ -491,16 +492,10 @@ module.exports = (env, getRawIndexHtml) => {
491
492
  )?.[1];
492
493
 
493
494
  if (publicDeps && localBrickPackages?.length) {
494
- try {
495
- const parsedPublicDeps = JSON.parse(publicDeps).filter(
496
- (item) =>
497
- !localBrickPackages.includes(item.filePath.split("/")[1])
498
- );
499
-
500
- publicDeps = JSON.stringify(parsedPublicDeps);
501
- } catch (err) {
502
- console.error(`JSON.parse() error: ${publicDeps}`);
503
- }
495
+ publicDeps = getProcessedPublicDeps(
496
+ publicDeps,
497
+ localBrickPackages
498
+ );
504
499
  }
505
500
 
506
501
  const appRootTpl = raw.match(
@@ -583,7 +578,22 @@ module.exports = (env, getRawIndexHtml) => {
583
578
  }
584
579
  return injectIndexHtml(null, env, rawIndexHtml);
585
580
  }
586
- const content = useSubdir ? raw : raw.replace(/\/next\//g, "/");
581
+ let content = useSubdir ? raw : raw.replace(/\/next\//g, "/");
582
+
583
+ const publicDeps = content.match(
584
+ /\bw\.PUBLIC_DEPS\s*=\s*(\[[^;]*\])\s*;/
585
+ )?.[1];
586
+
587
+ if (publicDeps && localBrickPackages?.length) {
588
+ content = content.replace(
589
+ /\bw\.PUBLIC_DEPS\s*=\s*\[[^;]*\]\s*;/,
590
+ `w.PUBLIC_DEPS=${getProcessedPublicDeps(
591
+ publicDeps,
592
+ localBrickPackages
593
+ )};`
594
+ );
595
+ }
596
+
587
597
  return env.liveReload
588
598
  ? appendLiveReloadScript(content, env)
589
599
  : content;
package/serve/utils.js CHANGED
@@ -400,6 +400,18 @@ function tryServeFiles(files, req, res) {
400
400
  });
401
401
  }
402
402
 
403
+ function getProcessedPublicDeps(publicDepsStr, localBrickPackages) {
404
+ try {
405
+ const parsedPublicDeps = JSON.parse(publicDepsStr).filter(
406
+ (item) => !localBrickPackages.includes(item.filePath.split("/")[1])
407
+ );
408
+
409
+ return JSON.stringify(parsedPublicDeps);
410
+ } catch (err) {
411
+ console.error(`JSON.parse() error: ${publicDepsStr}`);
412
+ }
413
+ }
414
+
403
415
  function appendLiveReloadScript(raw, env) {
404
416
  return raw.replace(
405
417
  "</body>",
@@ -441,3 +453,4 @@ exports.tryFiles = tryFiles;
441
453
  exports.tryServeFiles = tryServeFiles;
442
454
  exports.appendLiveReloadScript = appendLiveReloadScript;
443
455
  exports.removeCacheHeaders = removeCacheHeaders;
456
+ exports.getProcessedPublicDeps = getProcessedPublicDeps;