sugar-scripts 1.0.1 → 1.1.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.
@@ -16,6 +16,7 @@ export declare namespace SugarScriptsProject {
16
16
  * 浏览器端js输出目录,不配置就不会进行相关打包
17
17
  */
18
18
  browser?: {
19
+ includes?: string[];
19
20
  /**
20
21
  * 输出目录,必填
21
22
  */
@@ -1 +1 @@
1
- {"version":3,"file":"custom-config.type.js","sourceRoot":"","sources":["../src/custom-config.type.ts"],"names":[],"mappings":";;;AAWA,IAAiB,mBAAmB,CAsEnC;AAtED,WAAiB,mBAAmB;IAqEjC,CAAC;AACJ,CAAC,EAtEgB,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAsEnC"}
1
+ {"version":3,"file":"custom-config.type.js","sourceRoot":"","sources":["../src/custom-config.type.ts"],"names":[],"mappings":";;;AAWA,IAAiB,mBAAmB,CAuEnC;AAvED,WAAiB,mBAAmB;IAsEjC,CAAC;AACJ,CAAC,EAvEgB,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAuEnC"}
@@ -4,6 +4,7 @@ export interface SugarServerBrowserEntryPluginOptions {
4
4
  root: string;
5
5
  output: string;
6
6
  browserEntryKey?: string | ((originEntryKey: string) => string);
7
+ browserIncludes?: string[];
7
8
  }
8
9
  export declare function getCacheFilePath(context: SugarScriptsContext): string;
9
10
  export declare class SugarServerBrowserEntryPlugin {
@@ -24,10 +24,23 @@ class SugarServerBrowserEntryPlugin {
24
24
  compiler.hooks.normalModuleFactory.tap(PLUGIN_NAME, (factory) => {
25
25
  factory.hooks.beforeResolve
26
26
  .tap(PLUGIN_NAME, (result) => {
27
+ let entryFilePath;
27
28
  if (result.request.startsWith(WEBPACK_IMPORT_SYNTAX)) {
28
29
  const filePath = result.request.slice(WEBPACK_IMPORT_SYNTAX.length);
29
30
  const absoluteFilePath = path_1.default.resolve(result.context, filePath);
30
- let entryKey = path_1.default.relative(this.options.root, absoluteFilePath).replace(/\\/g, '/');
31
+ entryFilePath = absoluteFilePath;
32
+ }
33
+ if (this.options.browserIncludes
34
+ && this.options.browserIncludes.length > 0) {
35
+ const absoluteFilePath = path_1.default.resolve(result.context, result.request);
36
+ if (this.options.browserIncludes.some((includePath) => {
37
+ return !path_1.default.relative(path_1.default.resolve(this.options.root, includePath), absoluteFilePath).startsWith('..');
38
+ })) {
39
+ entryFilePath = absoluteFilePath;
40
+ }
41
+ }
42
+ if (entryFilePath) {
43
+ let entryKey = path_1.default.relative(this.options.root, entryFilePath).replace(/\\/g, '/');
31
44
  if (this.options.browserEntryKey) {
32
45
  if (typeof this.options.browserEntryKey === 'string') {
33
46
  const browserEntryKey = this.options.browserEntryKey;
@@ -51,8 +64,8 @@ class SugarServerBrowserEntryPlugin {
51
64
  entryKey = this.options.browserEntryKey(entryKey);
52
65
  }
53
66
  }
54
- data[entryKey] = absoluteFilePath;
55
- logger.log(`find sugar browser import in [${result.context}] use [${absoluteFilePath}]`);
67
+ data[entryKey] = entryFilePath;
68
+ logger.log(`find sugar browser import in [${result.context}] use [${entryFilePath}]`);
56
69
  const base64 = Buffer.from(`export default "${entryKey}"`).toString('base64');
57
70
  result.request = `data:text/javascript;charset=utf-8;base64,${base64}`;
58
71
  }
@@ -1 +1 @@
1
- {"version":3,"file":"server-browser-entry.js","sourceRoot":"","sources":["../../src/webpack/server-browser-entry.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"server-browser-entry.js","sourceRoot":"","sources":["../../src/webpack/server-browser-entry.ts"],"names":[],"mappings":"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"}
@@ -63,7 +63,8 @@ function mergeBrowserEntry(context, chainConfig) {
63
63
  });
64
64
  }
65
65
  catch (e) {
66
- console.log(e);
66
+ console.log('load autoBrowserEntryFilePath fail', autoBrowserEntryFilePath);
67
+ console.log('skip autoBrowserEntryFilePath');
67
68
  }
68
69
  if (browserConfig.entry) {
69
70
  const entry = browserConfig.entry;
@@ -1 +1 @@
1
- {"version":3,"file":"webpack.browser.js","sourceRoot":"","sources":["../../src/webpack/webpack.browser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"webpack.browser.js","sourceRoot":"","sources":["../../src/webpack/webpack.browser.ts"],"names":[],"mappings":"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"}
@@ -22,6 +22,7 @@ function mergeServerEntry(context, chainConfig) {
22
22
  if (!context.packageConfig.server)
23
23
  return;
24
24
  const serverConfig = context.packageConfig.server;
25
+ const browserConfig = context.packageConfig.browser;
25
26
  chainConfig.entry('main')
26
27
  .merge([
27
28
  serverConfig.render || '',
@@ -50,6 +51,7 @@ function mergeServerEntry(context, chainConfig) {
50
51
  plugin: server_browser_entry_1.SugarServerBrowserEntryPlugin,
51
52
  args: [{
52
53
  root: context.root,
54
+ browserIncludes: browserConfig === null || browserConfig === void 0 ? void 0 : browserConfig.includes,
53
55
  browserEntryKey: serverConfig.browserEntryKey,
54
56
  output: (0, server_browser_entry_1.getCacheFilePath)(context)
55
57
  }]
@@ -1 +1 @@
1
- {"version":3,"file":"webpack.server.js","sourceRoot":"","sources":["../../src/webpack/webpack.server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAAwB;AACxB,sDAA8B;AAO9B,iEAGgC;AAEhC,SAAsB,gBAAgB,CACpC,OAA4B,EAC5B,WAA+B;;;QAE/B,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM;YAAE,OAAO;QAC1C,MAAM,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC;QAElD,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC;aACtB,KAAK,CACJ;YACE,YAAY,CAAC,MAAM,IAAI,EAAE;YACzB,YAAY,CAAC,KAAK;SACnB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAa,CACvC,CAAC;QAEJ,WAAW,CAAC,KAAK,CAAC;YACd,MAAM,EAAE,MAAM;YACd,IAAI,EAAE;gBACJ,MAAM,EAAE,KAAK;gBACb,UAAU,EAAE,KAAK;gBACjB,SAAS,EAAE,KAAK;aACjB;YACD,MAAM,EAAE;gBACN,QAAQ,EAAE,WAAW;gBACrB,OAAO,EAAE;oBACP,IAAI,EAAE,UAAU;iBACjB;aACF;YACD,YAAY,EAAE;gBACZ,QAAQ,EAAE,KAAK;aAChB;YACD,OAAO,EAAE,YAAY;YACrB,gBAAgB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;YAChC,MAAM,EAAE;gBACN,+BAA+B,EAAE;oBAC/B,MAAM,EAAE,oDAA6B;oBACrC,IAAI,EAAE,CAAC;4BACL,IAAI,EAAE,OAAO,CAAC,IAAI;4BAClB,eAAe,EAAE,YAAY,CAAC,eAAe;4BAC7C,MAAM,EAAE,IAAA,uCAAgB,EAAC,OAAO,CAAC;yBAClC,CAAC;iBACH;gBACD,cAAc,EAAE;oBACd,MAAM,EAAE,iBAAO,CAAC,YAAY;oBAC5B,IAAI,EAAE,CAAC;4BACL,gCAAgC,EAAE,IAAI,CAAC,SAAS,CAC9C,OAAO,CAAC,IAAI,CACb;4BACD,8BAA8B,EAAE,IAAI,CAAC,SAAS,CAC5C,cAAI,CAAC,OAAO,CACV,OAAO,CAAC,IAAI,EACZ,YAAY,CAAC,MAAM,CACpB,CACF;4BACD,+BAA+B,EAAE,CAAA,MAAA,OAAO,CAAC,aAAa,CAAC,OAAO,0CAAE,MAAM,KAAI,IAAI,CAAC,SAAS,CACtF,cAAI,CAAC,OAAO,CACV,OAAO,CAAC,IAAI,EACZ,MAAA,OAAO,CAAC,aAAa,CAAC,OAAO,0CAAE,MAAM,CACtC,CACF;4BACD,+BAA+B,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;4BACrD,kCAAkC,EAAE,IAAI,CAAC,SAAS,CAChD,YAAY,CAAC,MAAM;mCAChB,cAAI,CAAC,OAAO,CACb,OAAO,CAAC,IAAI,EACZ,YAAY,CAAC,MAAM,CACpB,CACF;4BACD,mCAAmC,EAAE,oCAAoC;yBAC1E,CAAC;iBACH;aACF;SACF,CAAC,CAAA;;CACL;AAzED,4CAyEC;AAED,SAAsB,uBAAuB,CAC3C,OAA4B,EAC5B,WAA+B;;QAE/B,IAAI,OAAO,CAAC,cAAc,CAAC,mBAAmB,EAAE;YAC9C,MAAM,OAAO,CAAC,cAAc,CAAC,mBAAmB,CAC9C,WAAW,EACX,OAAO,CACR,CAAA;SACF;IACH,CAAC;CAAA;AAVD,0DAUC"}
1
+ {"version":3,"file":"webpack.server.js","sourceRoot":"","sources":["../../src/webpack/webpack.server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAAwB;AACxB,sDAA8B;AAO9B,iEAGgC;AAEhC,SAAsB,gBAAgB,CACpC,OAA4B,EAC5B,WAA+B;;;QAE/B,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM;YAAE,OAAO;QAC1C,MAAM,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC;QAClD,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC;QAEpD,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC;aACtB,KAAK,CACJ;YACE,YAAY,CAAC,MAAM,IAAI,EAAE;YACzB,YAAY,CAAC,KAAK;SACnB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAa,CACvC,CAAC;QAEJ,WAAW,CAAC,KAAK,CAAC;YACd,MAAM,EAAE,MAAM;YACd,IAAI,EAAE;gBACJ,MAAM,EAAE,KAAK;gBACb,UAAU,EAAE,KAAK;gBACjB,SAAS,EAAE,KAAK;aACjB;YACD,MAAM,EAAE;gBACN,QAAQ,EAAE,WAAW;gBACrB,OAAO,EAAE;oBACP,IAAI,EAAE,UAAU;iBACjB;aACF;YACD,YAAY,EAAE;gBACZ,QAAQ,EAAE,KAAK;aAChB;YACD,OAAO,EAAE,YAAY;YACrB,gBAAgB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;YAChC,MAAM,EAAE;gBACN,+BAA+B,EAAE;oBAC/B,MAAM,EAAE,oDAA6B;oBACrC,IAAI,EAAE,CAAC;4BACL,IAAI,EAAE,OAAO,CAAC,IAAI;4BAClB,eAAe,EAAE,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,QAAQ;4BACxC,eAAe,EAAE,YAAY,CAAC,eAAe;4BAC7C,MAAM,EAAE,IAAA,uCAAgB,EAAC,OAAO,CAAC;yBAClC,CAAC;iBACH;gBACD,cAAc,EAAE;oBACd,MAAM,EAAE,iBAAO,CAAC,YAAY;oBAC5B,IAAI,EAAE,CAAC;4BACL,gCAAgC,EAAE,IAAI,CAAC,SAAS,CAC9C,OAAO,CAAC,IAAI,CACb;4BACD,8BAA8B,EAAE,IAAI,CAAC,SAAS,CAC5C,cAAI,CAAC,OAAO,CACV,OAAO,CAAC,IAAI,EACZ,YAAY,CAAC,MAAM,CACpB,CACF;4BACD,+BAA+B,EAAE,CAAA,MAAA,OAAO,CAAC,aAAa,CAAC,OAAO,0CAAE,MAAM,KAAI,IAAI,CAAC,SAAS,CACtF,cAAI,CAAC,OAAO,CACV,OAAO,CAAC,IAAI,EACZ,MAAA,OAAO,CAAC,aAAa,CAAC,OAAO,0CAAE,MAAM,CACtC,CACF;4BACD,+BAA+B,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;4BACrD,kCAAkC,EAAE,IAAI,CAAC,SAAS,CAChD,YAAY,CAAC,MAAM;mCAChB,cAAI,CAAC,OAAO,CACb,OAAO,CAAC,IAAI,EACZ,YAAY,CAAC,MAAM,CACpB,CACF;4BACD,mCAAmC,EAAE,oCAAoC;yBAC1E,CAAC;iBACH;aACF;SACF,CAAC,CAAA;;CACL;AA3ED,4CA2EC;AAED,SAAsB,uBAAuB,CAC3C,OAA4B,EAC5B,WAA+B;;QAE/B,IAAI,OAAO,CAAC,cAAc,CAAC,mBAAmB,EAAE;YAC9C,MAAM,OAAO,CAAC,cAAc,CAAC,mBAAmB,CAC9C,WAAW,EACX,OAAO,CACR,CAAA;SACF;IACH,CAAC;CAAA;AAVD,0DAUC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sugar-scripts",
3
- "version": "1.0.1",
3
+ "version": "1.1.0",
4
4
  "description": "",
5
5
  "main": "lib/index.js",
6
6
  "bin": {
@@ -16,7 +16,7 @@
16
16
  "commander": "^9.4.0",
17
17
  "glob": "^8.0.3",
18
18
  "nodemon": "^2.0.20",
19
- "sugar-server": "^1.0.0",
19
+ "sugar-server": "^1.1.0",
20
20
  "ts-node": "^10.9.1",
21
21
  "webpack": "^5.74.0",
22
22
  "webpack-chain": "~6.5.1",