sugar-scripts 1.0.1-beta.0 → 1.0.1
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/lib/custom-config.type.d.ts +4 -1
- package/lib/custom-config.type.js.map +1 -1
- package/lib/webpack/server-browser-entry.d.ts +1 -1
- package/lib/webpack/server-browser-entry.js +23 -2
- package/lib/webpack/server-browser-entry.js.map +1 -1
- package/lib/webpack/webpack.browser.js +1 -0
- package/lib/webpack/webpack.browser.js.map +1 -1
- package/package.json +1 -1
|
@@ -44,8 +44,11 @@ export declare namespace SugarScriptsProject {
|
|
|
44
44
|
render?: string;
|
|
45
45
|
/**
|
|
46
46
|
* 自动生成browserEntry事entryKey的转化方式
|
|
47
|
+
* 支持以下方式，
|
|
48
|
+
* 1. string, 支持 {hash:16} 和 {basename}的占位符
|
|
49
|
+
* 2. 回调函数
|
|
47
50
|
*/
|
|
48
|
-
browserEntryKey?: (originEntryKey: string) => string;
|
|
51
|
+
browserEntryKey?: string | ((originEntryKey: string) => string);
|
|
49
52
|
};
|
|
50
53
|
}
|
|
51
54
|
type SugarPackageConfigs = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom-config.type.js","sourceRoot":"","sources":["../src/custom-config.type.ts"],"names":[],"mappings":";;;AAWA,IAAiB,mBAAmB,
|
|
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"}
|
|
@@ -3,7 +3,7 @@ import { SugarScriptsContext } from '../core/running-context';
|
|
|
3
3
|
export interface SugarServerBrowserEntryPluginOptions {
|
|
4
4
|
root: string;
|
|
5
5
|
output: string;
|
|
6
|
-
browserEntryKey?: (originEntryKey: string) => string;
|
|
6
|
+
browserEntryKey?: string | ((originEntryKey: string) => string);
|
|
7
7
|
}
|
|
8
8
|
export declare function getCacheFilePath(context: SugarScriptsContext): string;
|
|
9
9
|
export declare class SugarServerBrowserEntryPlugin {
|
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.SugarServerBrowserEntryPlugin = exports.getCacheFilePath = void 0;
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
|
+
const crypto_1 = __importDefault(require("crypto"));
|
|
8
9
|
const file_helpers_1 = require("../shared/file-helpers");
|
|
9
10
|
const PLUGIN_NAME = 'SugarServerEntryPlugin';
|
|
10
11
|
const CACHE_FILE_NAME = 'server-browser-entries.json';
|
|
@@ -26,9 +27,29 @@ class SugarServerBrowserEntryPlugin {
|
|
|
26
27
|
if (result.request.startsWith(WEBPACK_IMPORT_SYNTAX)) {
|
|
27
28
|
const filePath = result.request.slice(WEBPACK_IMPORT_SYNTAX.length);
|
|
28
29
|
const absoluteFilePath = path_1.default.resolve(result.context, filePath);
|
|
29
|
-
let entryKey = path_1.default.relative(this.options.root, absoluteFilePath).
|
|
30
|
+
let entryKey = path_1.default.relative(this.options.root, absoluteFilePath).replace(/\\/g, '/');
|
|
30
31
|
if (this.options.browserEntryKey) {
|
|
31
|
-
|
|
32
|
+
if (typeof this.options.browserEntryKey === 'string') {
|
|
33
|
+
const browserEntryKey = this.options.browserEntryKey;
|
|
34
|
+
const hash = crypto_1.default.createHash('sha256');
|
|
35
|
+
hash.update(entryKey);
|
|
36
|
+
const hashText = hash.digest('hex');
|
|
37
|
+
const replaceMap = {
|
|
38
|
+
hash: hashText,
|
|
39
|
+
basename: path_1.default.basename(entryKey)
|
|
40
|
+
};
|
|
41
|
+
entryKey = browserEntryKey.replace(/{(hash|basename)(\:([0-9]+))?}/g, (match, p1, p2, p3) => {
|
|
42
|
+
const text = replaceMap[p1] || '';
|
|
43
|
+
if (p3) {
|
|
44
|
+
const len = +p3;
|
|
45
|
+
return text.slice(0, len);
|
|
46
|
+
}
|
|
47
|
+
return text;
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
else if (typeof this.options.browserEntryKey === 'function') {
|
|
51
|
+
entryKey = this.options.browserEntryKey(entryKey);
|
|
52
|
+
}
|
|
32
53
|
}
|
|
33
54
|
data[entryKey] = absoluteFilePath;
|
|
34
55
|
logger.log(`find sugar browser import in [${result.context}] use [${absoluteFilePath}]`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-browser-entry.js","sourceRoot":"","sources":["../../src/webpack/server-browser-entry.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;
|
|
1
|
+
{"version":3,"file":"server-browser-entry.js","sourceRoot":"","sources":["../../src/webpack/server-browser-entry.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,6 +35,7 @@ function mergeBrowserEntry(context, chainConfig) {
|
|
|
35
35
|
fileName: path_1.default.resolve(context.packageConfig.server.output, './browser-manifest.json'),
|
|
36
36
|
useEntryKeys: true,
|
|
37
37
|
writeToFileEmit: true,
|
|
38
|
+
removeKeyHash: false,
|
|
38
39
|
generate: (seed, fileDescriptors, entries) => {
|
|
39
40
|
const entriesManifest = {};
|
|
40
41
|
fileDescriptors.forEach((fileDescriptor) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack.browser.js","sourceRoot":"","sources":["../../src/webpack/webpack.browser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAAwB;AAExB,+BAA4B;AAC5B,qEAAgE;AAKhE,iEAEgC;AAGhC,SAAS,eAAe,CACtB,SAAiB,EACjB,IAAY;IAEZ,IAAI,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QAC7B,OAAO,WAAI,CAAC,IAAI,CACd,cAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAC3B,CAAA;KACF;IACD,OAAO,CAAC,SAAS,CAAC,CAAC;AACrB,CAAC;AAGD,SAAsB,iBAAiB,CACrC,OAA4B,EAC5B,WAA+B;;QAE/B,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO;YAAE,OAAO;QAC3C,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC;QAEpD,MAAM,wBAAwB,GAAG,IAAA,uCAAgB,EAAC,OAAO,CAAC,CAAC;QAE3D,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE;YAChC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC;iBAC3B,GAAG,CACF,+CAAqB,EACrB,CAAC;oBACC,QAAQ,EAAE,cAAI,CAAC,OAAO,CACpB,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,EACnC,yBAAyB,CAC1B;oBACD,YAAY,EAAE,IAAI;oBAClB,eAAe,EAAE,IAAI;oBACrB,QAAQ,EAAE,CAAC,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,EAAE;wBAC3C,MAAM,eAAe,GAEjB,EAAE,CAAC;wBAEP,eAAe,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE;4BACzC,MAAM,EACJ,IAAI,EACJ,IAAI,EACL,GAAG,cAAc,CAAC;4BACnB,IAAI,cAAc,CAAC,OAAO,EAAE;gCAC1B,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE;oCAC1B,eAAe,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;iCAC5B;gCACD,eAAe,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;6BAClC;wBACH,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"webpack.browser.js","sourceRoot":"","sources":["../../src/webpack/webpack.browser.ts"],"names":[],"mappings":"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"}
|