vxrn 1.2.73 → 1.2.74
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/config/mergeUserConfig.js +12 -8
- package/dist/config/mergeUserConfig.js.map +1 -1
- package/dist/config/mergeUserConfig.mjs +4 -2
- package/dist/config/mergeUserConfig.mjs.map +1 -1
- package/dist/config/mergeUserConfig.native.js +10 -2
- package/dist/config/mergeUserConfig.native.js.map +1 -1
- package/dist/config/mergeUserConfig.test.js +80 -0
- package/dist/config/mergeUserConfig.test.js.map +6 -0
- package/dist/config/mergeUserConfig.test.mjs +83 -0
- package/dist/config/mergeUserConfig.test.mjs.map +1 -0
- package/dist/config/mergeUserConfig.test.native.js +90 -0
- package/dist/config/mergeUserConfig.test.native.js.map +1 -0
- package/dist/plugins/autoDepOptimizePlugin.js +10 -6
- package/dist/plugins/autoDepOptimizePlugin.js.map +1 -1
- package/dist/plugins/autoDepOptimizePlugin.mjs +12 -6
- package/dist/plugins/autoDepOptimizePlugin.mjs.map +1 -1
- package/dist/plugins/autoDepOptimizePlugin.native.js +18 -6
- package/dist/plugins/autoDepOptimizePlugin.native.js.map +1 -1
- package/dist/plugins/autoDepOptimizePlugin.test.js +19 -0
- package/dist/plugins/autoDepOptimizePlugin.test.js.map +6 -0
- package/dist/plugins/autoDepOptimizePlugin.test.mjs +25 -0
- package/dist/plugins/autoDepOptimizePlugin.test.mjs.map +1 -0
- package/dist/plugins/autoDepOptimizePlugin.test.native.js +35 -0
- package/dist/plugins/autoDepOptimizePlugin.test.native.js.map +1 -0
- package/dist/plugins/defaultDepOptimizePlugin.js +1 -1
- package/dist/plugins/defaultDepOptimizePlugin.js.map +1 -1
- package/dist/plugins/defaultDepOptimizePlugin.mjs +1 -1
- package/dist/plugins/defaultDepOptimizePlugin.mjs.map +1 -1
- package/dist/plugins/defaultDepOptimizePlugin.native.js +1 -1
- package/dist/plugins/defaultDepOptimizePlugin.native.js.map +1 -1
- package/dist/utils/scanDepsToOptimize.js +0 -1
- package/dist/utils/scanDepsToOptimize.js.map +1 -1
- package/dist/utils/scanDepsToOptimize.mjs +1 -1
- package/dist/utils/scanDepsToOptimize.mjs.map +1 -1
- package/dist/utils/scanDepsToOptimize.native.js +1 -1
- package/dist/utils/scanDepsToOptimize.native.js.map +1 -1
- package/package.json +12 -12
- package/src/config/mergeUserConfig.test.ts +126 -0
- package/src/config/mergeUserConfig.ts +16 -8
- package/src/plugins/autoDepOptimizePlugin.test.ts +42 -0
- package/src/plugins/autoDepOptimizePlugin.ts +19 -5
- package/src/plugins/defaultDepOptimizePlugin.ts +2 -1
- package/src/utils/scanDepsToOptimize.ts +0 -1
- package/types/config/mergeUserConfig.d.ts.map +1 -1
- package/types/config/mergeUserConfig.test.d.ts +2 -0
- package/types/config/mergeUserConfig.test.d.ts.map +1 -0
- package/types/plugins/autoDepOptimizePlugin.d.ts.map +1 -1
- package/types/plugins/autoDepOptimizePlugin.test.d.ts +2 -0
- package/types/plugins/autoDepOptimizePlugin.test.d.ts.map +1 -0
- package/types/plugins/defaultDepOptimizePlugin.d.ts.map +1 -1
- package/types/utils/scanDepsToOptimize.d.ts.map +1 -1
|
@@ -10,7 +10,15 @@ function mergeUserConfig(optimizeDeps, serverConfig, userViteConfig) {
|
|
|
10
10
|
return serverConfig;
|
|
11
11
|
}
|
|
12
12
|
function deepMergeOptimizeDeps(a, b, extraDepsOpt, avoidMergeExternal = !1) {
|
|
13
|
-
a.optimizeDeps ||= {}, b.optimizeDeps ||= {}
|
|
13
|
+
a.optimizeDeps ||= {}, b.optimizeDeps ||= {};
|
|
14
|
+
const excludeSet = new Set(
|
|
15
|
+
uniq([
|
|
16
|
+
...a.optimizeDeps.exclude || [],
|
|
17
|
+
...b.optimizeDeps.exclude || [],
|
|
18
|
+
...extraDepsOpt?.exclude || []
|
|
19
|
+
])
|
|
20
|
+
);
|
|
21
|
+
avoidMergeExternal || (a.noExternal === !0 || b.noExternal === !0 ? a.noExternal = !0 : a.noExternal = uniq([
|
|
14
22
|
...coerceToArray(a.noExternal || []),
|
|
15
23
|
...a.optimizeDeps.include || [],
|
|
16
24
|
...b.optimizeDeps.include || [],
|
|
@@ -21,19 +29,15 @@ function deepMergeOptimizeDeps(a, b, extraDepsOpt, avoidMergeExternal = !1) {
|
|
|
21
29
|
"react-dom",
|
|
22
30
|
"react-dom/server",
|
|
23
31
|
"react-dom/client"
|
|
24
|
-
])), a.optimizeDeps.exclude = uniq([
|
|
25
|
-
...a.optimizeDeps.exclude || [],
|
|
26
|
-
...b.optimizeDeps.exclude || [],
|
|
27
|
-
...extraDepsOpt?.exclude || []
|
|
28
|
-
]), a.optimizeDeps.include = uniq([
|
|
32
|
+
]).filter((dep) => typeof dep != "string" || !excludeSet.has(dep))), a.optimizeDeps.exclude = [...excludeSet], a.optimizeDeps.include = uniq([
|
|
29
33
|
...a.optimizeDeps.include || [],
|
|
30
34
|
...b.optimizeDeps.include || [],
|
|
31
35
|
...extraDepsOpt?.include || []
|
|
32
|
-
]), a.optimizeDeps.needsInterop = uniq([
|
|
36
|
+
]).filter((dep) => !excludeSet.has(dep)), a.optimizeDeps.needsInterop = uniq([
|
|
33
37
|
...a.optimizeDeps.needsInterop || [],
|
|
34
38
|
...b.optimizeDeps.needsInterop || [],
|
|
35
39
|
...extraDepsOpt?.needsInterop || []
|
|
36
|
-
]), a.optimizeDeps.esbuildOptions = {
|
|
40
|
+
]).filter((dep) => !excludeSet.has(dep)), a.optimizeDeps.esbuildOptions = {
|
|
37
41
|
...a.optimizeDeps.esbuildOptions,
|
|
38
42
|
...b.optimizeDeps.esbuildOptions,
|
|
39
43
|
...extraDepsOpt?.esbuildOptions
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/config/mergeUserConfig.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,mBAAgE;AACzE,SAAS,qBAAqB;AAC9B,SAAS,YAAY;AAgBd,SAAS,gBACd,cACA,cACA,gBACA;AACA,MAAI,gBAAgB;AASlB,QARA,eAAe,YAAY,cAAc,cAAc,GAGnD,eAAe,QACjB,aAAa,MAAM,eAAe,MAKlC,aAAa,KAAK,cAClB,aAAa,IAAI,eAAe,MAChC,CAAC,MAAM,QAAQ,aAAa,IAAI,UAAU;AAE1C,YAAM,IAAI,MAAM,yCAAyC;AAO3D,iBAAa,QAAQ,CAAC,GACtB,eAAe,QAAQ,CAAC,GACxB,sBAAsB,aAAa,KAAK,eAAe,KAAK,YAAY,GACxE,sBAAsB,aAAa,KAAK,gBAAgB,YAAY;AAAA,EACtE;AAEA,SAAO;AACT;AAEO,SAAS,sBACd,GACA,GACA,cACA,qBAAqB,IACrB;AACA,IAAE,iBAAiB,CAAC,GACpB,EAAE,iBAAiB,CAAC,
|
|
4
|
+
"mappings": "AAAA,SAAS,mBAAgE;AACzE,SAAS,qBAAqB;AAC9B,SAAS,YAAY;AAgBd,SAAS,gBACd,cACA,cACA,gBACA;AACA,MAAI,gBAAgB;AASlB,QARA,eAAe,YAAY,cAAc,cAAc,GAGnD,eAAe,QACjB,aAAa,MAAM,eAAe,MAKlC,aAAa,KAAK,cAClB,aAAa,IAAI,eAAe,MAChC,CAAC,MAAM,QAAQ,aAAa,IAAI,UAAU;AAE1C,YAAM,IAAI,MAAM,yCAAyC;AAO3D,iBAAa,QAAQ,CAAC,GACtB,eAAe,QAAQ,CAAC,GACxB,sBAAsB,aAAa,KAAK,eAAe,KAAK,YAAY,GACxE,sBAAsB,aAAa,KAAK,gBAAgB,YAAY;AAAA,EACtE;AAEA,SAAO;AACT;AAEO,SAAS,sBACd,GACA,GACA,cACA,qBAAqB,IACrB;AACA,IAAE,iBAAiB,CAAC,GACpB,EAAE,iBAAiB,CAAC;AAGpB,QAAM,aAAa,IAAI;AAAA,IACrB,KAAK;AAAA,MACH,GAAI,EAAE,aAAa,WAAW,CAAC;AAAA,MAC/B,GAAI,EAAE,aAAa,WAAW,CAAC;AAAA,MAC/B,GAAI,cAAc,WAAW,CAAC;AAAA,IAChC,CAAC;AAAA,EACH;AAEA,EAAK,uBAEC,EAAE,eAAe,MAAQ,EAAE,eAAe,KAC5C,EAAE,aAAa,KAGf,EAAE,aAAa,KAAK;AAAA,IAClB,GAAG,cAAe,EAAE,cAA2B,CAAC,CAAC;AAAA,IACjD,GAAI,EAAE,aAAa,WAAW,CAAC;AAAA,IAC/B,GAAI,EAAE,aAAa,WAAW,CAAC;AAAA,IAC/B,GAAG,cAAc,EAAE,cAAc,CAAC,CAAC;AAAA,IACnC,GAAI,cAAc,WAAW,CAAC;AAAA;AAAA,IAG9B;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,CAAC,EAAE,OAAO,CAAC,QAAQ,OAAO,OAAQ,YAAY,CAAC,WAAW,IAAI,GAAG,CAAC,IAItE,EAAE,aAAa,UAAU,CAAC,GAAG,UAAU,GAIvC,EAAE,aAAa,UAAU,KAAK;AAAA,IAC5B,GAAI,EAAE,aAAa,WAAW,CAAC;AAAA,IAC/B,GAAI,EAAE,aAAa,WAAW,CAAC;AAAA,IAC/B,GAAI,cAAc,WAAW,CAAC;AAAA,EAChC,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,WAAW,IAAI,GAAG,CAAC,GAEvC,EAAE,aAAa,eAAe,KAAK;AAAA,IACjC,GAAI,EAAE,aAAa,gBAAgB,CAAC;AAAA,IACpC,GAAI,EAAE,aAAa,gBAAgB,CAAC;AAAA,IACpC,GAAI,cAAc,gBAAgB,CAAC;AAAA,EACrC,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,WAAW,IAAI,GAAG,CAAC,GAEvC,EAAE,aAAa,iBAAiB;AAAA,IAC9B,GAAG,EAAE,aAAa;AAAA,IAClB,GAAG,EAAE,aAAa;AAAA,IAClB,GAAG,cAAc;AAAA,EACnB;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -9,9 +9,11 @@ function mergeUserConfig(optimizeDeps, serverConfig, userViteConfig) {
|
|
|
9
9
|
return serverConfig;
|
|
10
10
|
}
|
|
11
11
|
function deepMergeOptimizeDeps(a, b, extraDepsOpt, avoidMergeExternal = !1) {
|
|
12
|
-
a.optimizeDeps ||= {}, b.optimizeDeps ||= {}
|
|
12
|
+
a.optimizeDeps ||= {}, b.optimizeDeps ||= {};
|
|
13
|
+
const excludeSet = new Set(uniq([...(a.optimizeDeps.exclude || []), ...(b.optimizeDeps.exclude || []), ...(extraDepsOpt?.exclude || [])]));
|
|
14
|
+
avoidMergeExternal || (a.noExternal === !0 || b.noExternal === !0 ? a.noExternal = !0 : a.noExternal = uniq([...coerceToArray(a.noExternal || []), ...(a.optimizeDeps.include || []), ...(b.optimizeDeps.include || []), ...coerceToArray(b.noExternal || []), ...(extraDepsOpt?.include || []),
|
|
13
15
|
// TODO at least move to getOptimizeDeps
|
|
14
|
-
"react", "react-dom", "react-dom/server", "react-dom/client"])
|
|
16
|
+
"react", "react-dom", "react-dom/server", "react-dom/client"]).filter(dep => typeof dep != "string" || !excludeSet.has(dep))), a.optimizeDeps.exclude = [...excludeSet], a.optimizeDeps.include = uniq([...(a.optimizeDeps.include || []), ...(b.optimizeDeps.include || []), ...(extraDepsOpt?.include || [])]).filter(dep => !excludeSet.has(dep)), a.optimizeDeps.needsInterop = uniq([...(a.optimizeDeps.needsInterop || []), ...(b.optimizeDeps.needsInterop || []), ...(extraDepsOpt?.needsInterop || [])]).filter(dep => !excludeSet.has(dep)), a.optimizeDeps.esbuildOptions = {
|
|
15
17
|
...a.optimizeDeps.esbuildOptions,
|
|
16
18
|
...b.optimizeDeps.esbuildOptions,
|
|
17
19
|
...extraDepsOpt?.esbuildOptions
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["mergeConfig","coerceToArray","uniq","mergeUserConfig","optimizeDeps","serverConfig","userViteConfig","css","ssr","noExternal","Array","isArray","Error","deepMergeOptimizeDeps","a","b","extraDepsOpt","avoidMergeExternal","
|
|
1
|
+
{"version":3,"names":["mergeConfig","coerceToArray","uniq","mergeUserConfig","optimizeDeps","serverConfig","userViteConfig","css","ssr","noExternal","Array","isArray","Error","deepMergeOptimizeDeps","a","b","extraDepsOpt","avoidMergeExternal","excludeSet","Set","exclude","include","filter","dep","has","needsInterop","esbuildOptions"],"sources":["../../src/config/mergeUserConfig.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -13,9 +13,17 @@ function deepMergeOptimizeDeps(a, b, extraDepsOpt) {
|
|
|
13
13
|
var avoidMergeExternal = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : !1,
|
|
14
14
|
_a,
|
|
15
15
|
_b;
|
|
16
|
-
(_a = a).optimizeDeps || (_a.optimizeDeps = {}), (_b = b).optimizeDeps || (_b.optimizeDeps = {})
|
|
16
|
+
(_a = a).optimizeDeps || (_a.optimizeDeps = {}), (_b = b).optimizeDeps || (_b.optimizeDeps = {});
|
|
17
|
+
var excludeSet = new Set(uniq([...(a.optimizeDeps.exclude || []), ...(b.optimizeDeps.exclude || []), ...(extraDepsOpt?.exclude || [])]));
|
|
18
|
+
avoidMergeExternal || (a.noExternal === !0 || b.noExternal === !0 ? a.noExternal = !0 : a.noExternal = uniq([...coerceToArray(a.noExternal || []), ...(a.optimizeDeps.include || []), ...(b.optimizeDeps.include || []), ...coerceToArray(b.noExternal || []), ...(extraDepsOpt?.include || []),
|
|
17
19
|
// TODO at least move to getOptimizeDeps
|
|
18
|
-
"react", "react-dom", "react-dom/server", "react-dom/client"])
|
|
20
|
+
"react", "react-dom", "react-dom/server", "react-dom/client"]).filter(function (dep) {
|
|
21
|
+
return typeof dep != "string" || !excludeSet.has(dep);
|
|
22
|
+
})), a.optimizeDeps.exclude = [...excludeSet], a.optimizeDeps.include = uniq([...(a.optimizeDeps.include || []), ...(b.optimizeDeps.include || []), ...(extraDepsOpt?.include || [])]).filter(function (dep) {
|
|
23
|
+
return !excludeSet.has(dep);
|
|
24
|
+
}), a.optimizeDeps.needsInterop = uniq([...(a.optimizeDeps.needsInterop || []), ...(b.optimizeDeps.needsInterop || []), ...(extraDepsOpt?.needsInterop || [])]).filter(function (dep) {
|
|
25
|
+
return !excludeSet.has(dep);
|
|
26
|
+
}), a.optimizeDeps.esbuildOptions = {
|
|
19
27
|
...a.optimizeDeps.esbuildOptions,
|
|
20
28
|
...b.optimizeDeps.esbuildOptions,
|
|
21
29
|
...extraDepsOpt?.esbuildOptions
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["mergeConfig","coerceToArray","uniq","mergeUserConfig","optimizeDeps","serverConfig","userViteConfig","_serverConfig","_userViteConfig","_serverConfig_ssr","css","ssr","noExternal","Array","isArray","Error","deepMergeOptimizeDeps","a","b","extraDepsOpt","avoidMergeExternal","arguments","length","_a","_b","
|
|
1
|
+
{"version":3,"names":["mergeConfig","coerceToArray","uniq","mergeUserConfig","optimizeDeps","serverConfig","userViteConfig","_serverConfig","_userViteConfig","_serverConfig_ssr","css","ssr","noExternal","Array","isArray","Error","deepMergeOptimizeDeps","a","b","extraDepsOpt","avoidMergeExternal","arguments","length","_a","_b","excludeSet","Set","exclude","include","filter","dep","has","needsInterop"],"sources":["../../src/config/mergeUserConfig.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
import { describe, expect, it } from "vitest";
|
|
2
|
+
import { deepMergeOptimizeDeps } from "./mergeUserConfig";
|
|
3
|
+
describe("deepMergeOptimizeDeps", () => {
|
|
4
|
+
it("filters excluded deps from include list", () => {
|
|
5
|
+
const a = {
|
|
6
|
+
optimizeDeps: {
|
|
7
|
+
include: ["react", "react-native-reanimated", "lodash"],
|
|
8
|
+
exclude: []
|
|
9
|
+
}
|
|
10
|
+
};
|
|
11
|
+
deepMergeOptimizeDeps(a, {
|
|
12
|
+
optimizeDeps: {
|
|
13
|
+
exclude: ["react-native-reanimated"]
|
|
14
|
+
}
|
|
15
|
+
}), expect(a.optimizeDeps.include).toContain("react"), expect(a.optimizeDeps.include).toContain("lodash"), expect(a.optimizeDeps.include).not.toContain("react-native-reanimated"), expect(a.optimizeDeps.exclude).toContain("react-native-reanimated");
|
|
16
|
+
}), it("filters excluded deps from noExternal list", () => {
|
|
17
|
+
const a = {
|
|
18
|
+
optimizeDeps: {
|
|
19
|
+
include: ["react", "react-native-reanimated"]
|
|
20
|
+
},
|
|
21
|
+
noExternal: ["react", "react-native-reanimated"]
|
|
22
|
+
};
|
|
23
|
+
deepMergeOptimizeDeps(a, {
|
|
24
|
+
optimizeDeps: {
|
|
25
|
+
exclude: ["react-native-reanimated"]
|
|
26
|
+
}
|
|
27
|
+
}), expect(a.noExternal).toContain("react"), expect(a.noExternal).not.toContain("react-native-reanimated");
|
|
28
|
+
}), it("filters excluded deps from needsInterop list", () => {
|
|
29
|
+
const a = {
|
|
30
|
+
optimizeDeps: {
|
|
31
|
+
include: [],
|
|
32
|
+
needsInterop: ["react", "react-native-reanimated"]
|
|
33
|
+
}
|
|
34
|
+
};
|
|
35
|
+
deepMergeOptimizeDeps(a, {
|
|
36
|
+
optimizeDeps: {
|
|
37
|
+
exclude: ["react-native-reanimated"]
|
|
38
|
+
}
|
|
39
|
+
}), expect(a.optimizeDeps.needsInterop).toContain("react"), expect(a.optimizeDeps.needsInterop).not.toContain("react-native-reanimated");
|
|
40
|
+
}), it("merges excludes from all sources", () => {
|
|
41
|
+
const a = {
|
|
42
|
+
optimizeDeps: {
|
|
43
|
+
exclude: ["a"]
|
|
44
|
+
}
|
|
45
|
+
};
|
|
46
|
+
deepMergeOptimizeDeps(a, {
|
|
47
|
+
optimizeDeps: {
|
|
48
|
+
exclude: ["b"]
|
|
49
|
+
}
|
|
50
|
+
}, {
|
|
51
|
+
include: [],
|
|
52
|
+
exclude: ["c"],
|
|
53
|
+
needsInterop: [],
|
|
54
|
+
esbuildOptions: { resolveExtensions: [] }
|
|
55
|
+
}), expect(a.optimizeDeps.exclude).toContain("a"), expect(a.optimizeDeps.exclude).toContain("b"), expect(a.optimizeDeps.exclude).toContain("c");
|
|
56
|
+
}), it("preserves noExternal: true when set", () => {
|
|
57
|
+
const a = {
|
|
58
|
+
optimizeDeps: {},
|
|
59
|
+
noExternal: !0
|
|
60
|
+
};
|
|
61
|
+
deepMergeOptimizeDeps(a, {
|
|
62
|
+
optimizeDeps: {
|
|
63
|
+
exclude: ["react-native-reanimated"]
|
|
64
|
+
}
|
|
65
|
+
}), expect(a.noExternal).toBe(!0);
|
|
66
|
+
}), it("handles RegExp in noExternal", () => {
|
|
67
|
+
const regex = /some-pattern/, a = {
|
|
68
|
+
optimizeDeps: {
|
|
69
|
+
include: ["react", "react-native-reanimated"]
|
|
70
|
+
},
|
|
71
|
+
noExternal: [regex, "react", "react-native-reanimated"]
|
|
72
|
+
};
|
|
73
|
+
deepMergeOptimizeDeps(a, {
|
|
74
|
+
optimizeDeps: {
|
|
75
|
+
exclude: ["react-native-reanimated"]
|
|
76
|
+
}
|
|
77
|
+
}), expect(a.noExternal).toContain(regex), expect(a.noExternal).toContain("react"), expect(a.noExternal).not.toContain("react-native-reanimated");
|
|
78
|
+
});
|
|
79
|
+
});
|
|
80
|
+
//# sourceMappingURL=mergeUserConfig.test.js.map
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../src/config/mergeUserConfig.test.ts"],
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": []
|
|
6
|
+
}
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
import { describe, expect, it } from "vitest";
|
|
2
|
+
import { deepMergeOptimizeDeps } from "./mergeUserConfig.mjs";
|
|
3
|
+
describe("deepMergeOptimizeDeps", () => {
|
|
4
|
+
it("filters excluded deps from include list", () => {
|
|
5
|
+
const a = {
|
|
6
|
+
optimizeDeps: {
|
|
7
|
+
include: ["react", "react-native-reanimated", "lodash"],
|
|
8
|
+
exclude: []
|
|
9
|
+
}
|
|
10
|
+
};
|
|
11
|
+
deepMergeOptimizeDeps(a, {
|
|
12
|
+
optimizeDeps: {
|
|
13
|
+
exclude: ["react-native-reanimated"]
|
|
14
|
+
}
|
|
15
|
+
}), expect(a.optimizeDeps.include).toContain("react"), expect(a.optimizeDeps.include).toContain("lodash"), expect(a.optimizeDeps.include).not.toContain("react-native-reanimated"), expect(a.optimizeDeps.exclude).toContain("react-native-reanimated");
|
|
16
|
+
}), it("filters excluded deps from noExternal list", () => {
|
|
17
|
+
const a = {
|
|
18
|
+
optimizeDeps: {
|
|
19
|
+
include: ["react", "react-native-reanimated"]
|
|
20
|
+
},
|
|
21
|
+
noExternal: ["react", "react-native-reanimated"]
|
|
22
|
+
};
|
|
23
|
+
deepMergeOptimizeDeps(a, {
|
|
24
|
+
optimizeDeps: {
|
|
25
|
+
exclude: ["react-native-reanimated"]
|
|
26
|
+
}
|
|
27
|
+
}), expect(a.noExternal).toContain("react"), expect(a.noExternal).not.toContain("react-native-reanimated");
|
|
28
|
+
}), it("filters excluded deps from needsInterop list", () => {
|
|
29
|
+
const a = {
|
|
30
|
+
optimizeDeps: {
|
|
31
|
+
include: [],
|
|
32
|
+
needsInterop: ["react", "react-native-reanimated"]
|
|
33
|
+
}
|
|
34
|
+
};
|
|
35
|
+
deepMergeOptimizeDeps(a, {
|
|
36
|
+
optimizeDeps: {
|
|
37
|
+
exclude: ["react-native-reanimated"]
|
|
38
|
+
}
|
|
39
|
+
}), expect(a.optimizeDeps.needsInterop).toContain("react"), expect(a.optimizeDeps.needsInterop).not.toContain("react-native-reanimated");
|
|
40
|
+
}), it("merges excludes from all sources", () => {
|
|
41
|
+
const a = {
|
|
42
|
+
optimizeDeps: {
|
|
43
|
+
exclude: ["a"]
|
|
44
|
+
}
|
|
45
|
+
};
|
|
46
|
+
deepMergeOptimizeDeps(a, {
|
|
47
|
+
optimizeDeps: {
|
|
48
|
+
exclude: ["b"]
|
|
49
|
+
}
|
|
50
|
+
}, {
|
|
51
|
+
include: [],
|
|
52
|
+
exclude: ["c"],
|
|
53
|
+
needsInterop: [],
|
|
54
|
+
esbuildOptions: {
|
|
55
|
+
resolveExtensions: []
|
|
56
|
+
}
|
|
57
|
+
}), expect(a.optimizeDeps.exclude).toContain("a"), expect(a.optimizeDeps.exclude).toContain("b"), expect(a.optimizeDeps.exclude).toContain("c");
|
|
58
|
+
}), it("preserves noExternal: true when set", () => {
|
|
59
|
+
const a = {
|
|
60
|
+
optimizeDeps: {},
|
|
61
|
+
noExternal: !0
|
|
62
|
+
};
|
|
63
|
+
deepMergeOptimizeDeps(a, {
|
|
64
|
+
optimizeDeps: {
|
|
65
|
+
exclude: ["react-native-reanimated"]
|
|
66
|
+
}
|
|
67
|
+
}), expect(a.noExternal).toBe(!0);
|
|
68
|
+
}), it("handles RegExp in noExternal", () => {
|
|
69
|
+
const regex = /some-pattern/,
|
|
70
|
+
a = {
|
|
71
|
+
optimizeDeps: {
|
|
72
|
+
include: ["react", "react-native-reanimated"]
|
|
73
|
+
},
|
|
74
|
+
noExternal: [regex, "react", "react-native-reanimated"]
|
|
75
|
+
};
|
|
76
|
+
deepMergeOptimizeDeps(a, {
|
|
77
|
+
optimizeDeps: {
|
|
78
|
+
exclude: ["react-native-reanimated"]
|
|
79
|
+
}
|
|
80
|
+
}), expect(a.noExternal).toContain(regex), expect(a.noExternal).toContain("react"), expect(a.noExternal).not.toContain("react-native-reanimated");
|
|
81
|
+
});
|
|
82
|
+
});
|
|
83
|
+
//# sourceMappingURL=mergeUserConfig.test.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["describe","expect","it","deepMergeOptimizeDeps","a","optimizeDeps","include","exclude","toContain","not","noExternal","needsInterop","esbuildOptions","resolveExtensions","toBe","regex"],"sources":["../../src/config/mergeUserConfig.test.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
import { describe, expect, it } from "vitest";
|
|
2
|
+
import { deepMergeOptimizeDeps } from "./mergeUserConfig.native.js";
|
|
3
|
+
describe("deepMergeOptimizeDeps", function () {
|
|
4
|
+
it("filters excluded deps from include list", function () {
|
|
5
|
+
var a = {
|
|
6
|
+
optimizeDeps: {
|
|
7
|
+
include: ["react", "react-native-reanimated", "lodash"],
|
|
8
|
+
exclude: []
|
|
9
|
+
}
|
|
10
|
+
},
|
|
11
|
+
b = {
|
|
12
|
+
optimizeDeps: {
|
|
13
|
+
exclude: ["react-native-reanimated"]
|
|
14
|
+
}
|
|
15
|
+
};
|
|
16
|
+
deepMergeOptimizeDeps(a, b), expect(a.optimizeDeps.include).toContain("react"), expect(a.optimizeDeps.include).toContain("lodash"), expect(a.optimizeDeps.include).not.toContain("react-native-reanimated"), expect(a.optimizeDeps.exclude).toContain("react-native-reanimated");
|
|
17
|
+
}), it("filters excluded deps from noExternal list", function () {
|
|
18
|
+
var a = {
|
|
19
|
+
optimizeDeps: {
|
|
20
|
+
include: ["react", "react-native-reanimated"]
|
|
21
|
+
},
|
|
22
|
+
noExternal: ["react", "react-native-reanimated"]
|
|
23
|
+
},
|
|
24
|
+
b = {
|
|
25
|
+
optimizeDeps: {
|
|
26
|
+
exclude: ["react-native-reanimated"]
|
|
27
|
+
}
|
|
28
|
+
};
|
|
29
|
+
deepMergeOptimizeDeps(a, b), expect(a.noExternal).toContain("react"), expect(a.noExternal).not.toContain("react-native-reanimated");
|
|
30
|
+
}), it("filters excluded deps from needsInterop list", function () {
|
|
31
|
+
var a = {
|
|
32
|
+
optimizeDeps: {
|
|
33
|
+
include: [],
|
|
34
|
+
needsInterop: ["react", "react-native-reanimated"]
|
|
35
|
+
}
|
|
36
|
+
},
|
|
37
|
+
b = {
|
|
38
|
+
optimizeDeps: {
|
|
39
|
+
exclude: ["react-native-reanimated"]
|
|
40
|
+
}
|
|
41
|
+
};
|
|
42
|
+
deepMergeOptimizeDeps(a, b), expect(a.optimizeDeps.needsInterop).toContain("react"), expect(a.optimizeDeps.needsInterop).not.toContain("react-native-reanimated");
|
|
43
|
+
}), it("merges excludes from all sources", function () {
|
|
44
|
+
var a = {
|
|
45
|
+
optimizeDeps: {
|
|
46
|
+
exclude: ["a"]
|
|
47
|
+
}
|
|
48
|
+
},
|
|
49
|
+
b = {
|
|
50
|
+
optimizeDeps: {
|
|
51
|
+
exclude: ["b"]
|
|
52
|
+
}
|
|
53
|
+
},
|
|
54
|
+
extra = {
|
|
55
|
+
include: [],
|
|
56
|
+
exclude: ["c"],
|
|
57
|
+
needsInterop: [],
|
|
58
|
+
esbuildOptions: {
|
|
59
|
+
resolveExtensions: []
|
|
60
|
+
}
|
|
61
|
+
};
|
|
62
|
+
deepMergeOptimizeDeps(a, b, extra), expect(a.optimizeDeps.exclude).toContain("a"), expect(a.optimizeDeps.exclude).toContain("b"), expect(a.optimizeDeps.exclude).toContain("c");
|
|
63
|
+
}), it("preserves noExternal: true when set", function () {
|
|
64
|
+
var a = {
|
|
65
|
+
optimizeDeps: {},
|
|
66
|
+
noExternal: !0
|
|
67
|
+
},
|
|
68
|
+
b = {
|
|
69
|
+
optimizeDeps: {
|
|
70
|
+
exclude: ["react-native-reanimated"]
|
|
71
|
+
}
|
|
72
|
+
};
|
|
73
|
+
deepMergeOptimizeDeps(a, b), expect(a.noExternal).toBe(!0);
|
|
74
|
+
}), it("handles RegExp in noExternal", function () {
|
|
75
|
+
var regex = /some-pattern/,
|
|
76
|
+
a = {
|
|
77
|
+
optimizeDeps: {
|
|
78
|
+
include: ["react", "react-native-reanimated"]
|
|
79
|
+
},
|
|
80
|
+
noExternal: [regex, "react", "react-native-reanimated"]
|
|
81
|
+
},
|
|
82
|
+
b = {
|
|
83
|
+
optimizeDeps: {
|
|
84
|
+
exclude: ["react-native-reanimated"]
|
|
85
|
+
}
|
|
86
|
+
};
|
|
87
|
+
deepMergeOptimizeDeps(a, b), expect(a.noExternal).toContain(regex), expect(a.noExternal).toContain("react"), expect(a.noExternal).not.toContain("react-native-reanimated");
|
|
88
|
+
});
|
|
89
|
+
});
|
|
90
|
+
//# sourceMappingURL=mergeUserConfig.test.native.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["describe","expect","it","deepMergeOptimizeDeps","a","optimizeDeps","include","exclude","b","toContain","not","noExternal","needsInterop","extra","esbuildOptions","resolveExtensions"],"sources":["../../src/config/mergeUserConfig.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,EAAUC,MAAA,EAAQC,EAAA,QAAU;AACrC,SAASC,qBAAA,QAA6B;AAEtCH,QAAA,CAAS,yBAAyB,YAAM;EACtCE,EAAA,CAAG,2CAA2C,YAAM;IAClD,IAAAE,CAAA,GAAM;QACJC,YAAA,EAAc;UACZC,OAAA,EAAS,CACT,OAAS,EACX,2BACF,SAOA;UALEC,OAAA;QAAc;MACuB;MACrCC,CAAA;QAGwBH,YAEjB;UAMXE,OAAG,GACK,yBAAI;QACM;MACgC;IAC9CJ,qBACa,CAAAC,CAAA,EAASI,CAAA,GAAAP,MAAA,CAAAG,CAAA,CAAAC,YAAyB,CAAAC,OAAA,EAAAG,SAAA,WAAAR,MAAA,CAAAG,CAAA,CAAAC,YAAA,CAAAC,OAAA,EAAAG,SAAA,YAAAR,MAAA,CAAAG,CAAA,CAAAC,YAAA,CAAAC,OAAA,EAAAI,GAAA,CAAAD,SAAA,6BAAAR,MAAA,CAAAG,CAAA,CAAAC,YAAA,CAAAE,OAAA,EAAAE,SAAA;EAAA,EACjD,EAAAP,EAAA;IAOA,IAAAE,CAAA;QALEC,YAAA,EAAc;UACZC,OAAA,EAAS,CACX,SAKF,yBAAqB;QAKrB;QACEK,UAAA,GACE,SACA,yBAAwB;MAE5B;MAAAH,CAAA;QAOAH,YAAA;UALEE,OAAA,GACE,yBAAU;QAIY;MAI3B;IAGCJ,qBAAU,CAAAC,CAAA,EAAAI,CAAA,GAAAP,MAAA,CAAAG,CAAA,CAAAO,UAAA,EAAAF,SAAA,WAAAR,MAAA,CAAAG,CAAA,CAAAO,UAAA,EAAAD,GAAA,CAAAD,SAAA;EAAA,IACRP,EAAA,+CAAc;IAAA,IACZE,CAAA;QACFC,YAAA;UACFC,OAAA;UAaAM,YAAA,GAXE,SACE,yBAAa;QAEjB;MACc;MACZJ,CAAA;QACAH,YAAU,EAAG;UACbE,OAAA,GACA,yBAAkB;QAUtB;MACE;IAAUJ,qBACO,CAAAC,CAAA,EAAAI,CAAA,GAAAP,MAAA,CAAAG,CAAA,CAAAC,YAAA,CAAAO,YAAA,EAAAH,SAAA,WAAAR,MAAA,CAAAG,CAAA,CAAAC,YAAA,CAAAO,YAAA,EAAAF,GAAA,CAAAD,SAAA;EAAA,IACfP,EAAA,mCAAY;IACd,IAAAE,CAAA;QAOAC,YAAA;UALEE,OAAA,GACE;QAIsB;MAG3B;MAEDC,CAAA,GAAG;QACDH,YAAc;UAEZE,OAAA,GACE;QAEF;MACF;MAAAM,KAAA;QAOAP,OAAA;QALEC,OAAA,GACE,IACF;QAGwBK,YAGjB;QAGVE,cAAA;UACFC,iBAAA","ignoreList":[]}
|
|
@@ -13,12 +13,14 @@ function autoDepOptimizePlugin(props) {
|
|
|
13
13
|
return {
|
|
14
14
|
name,
|
|
15
15
|
enforce: "pre",
|
|
16
|
-
async config(
|
|
16
|
+
async config(cfg, env) {
|
|
17
17
|
debug?.("Config hook called");
|
|
18
|
-
const depsConfig = globalThis.__oneOptions?.deps, exclude = depsConfig ? Object.entries(depsConfig).filter(([
|
|
18
|
+
const depsConfig = globalThis.__oneOptions?.deps, exclude = depsConfig ? Object.entries(depsConfig).filter(([_, value]) => value === !1).map(([k]) => k) : [], userExcludes = Array.isArray(props.exclude) ? props.exclude : [props.exclude], userViteExcludes = cfg.optimizeDeps?.exclude || [], userSsrExcludes = cfg.ssr?.optimizeDeps?.exclude || [], finalConfig = await getScannedOptimizeDepsConfig({
|
|
19
19
|
...props,
|
|
20
20
|
mode: env.mode,
|
|
21
|
-
exclude: [...exclude, ...userExcludes].filter(
|
|
21
|
+
exclude: [...exclude, ...userExcludes, ...userViteExcludes, ...userSsrExcludes].filter(
|
|
22
|
+
Boolean
|
|
23
|
+
)
|
|
22
24
|
});
|
|
23
25
|
return debugDetails?.(
|
|
24
26
|
`Final auto-dep-optimize config: ${JSON.stringify(finalConfig, null, 2)}
|
|
@@ -30,13 +32,15 @@ from props: ${JSON.stringify(props)}`
|
|
|
30
32
|
const getSSRExternalsCachePath = (root) => path.join(getCacheDir(root), "deps-to-pre-bundle-for-ssr-cache.json");
|
|
31
33
|
async function getScannedOptimizeDepsConfig(props) {
|
|
32
34
|
const result = await findDepsToOptimize(props);
|
|
33
|
-
|
|
35
|
+
props.onScannedDeps?.(result);
|
|
36
|
+
const excludeStrings = (Array.isArray(props.exclude) ? props.exclude : [props.exclude]).filter((e) => typeof e == "string"), excludeSet = new Set(excludeStrings), filteredDeps = result.prebundleDeps.filter((dep) => !excludeSet.has(dep));
|
|
37
|
+
return {
|
|
34
38
|
ssr: {
|
|
35
39
|
optimizeDeps: {
|
|
36
|
-
include:
|
|
40
|
+
include: filteredDeps,
|
|
37
41
|
exclude: EXCLUDE_LIST
|
|
38
42
|
},
|
|
39
|
-
noExternal:
|
|
43
|
+
noExternal: filteredDeps
|
|
40
44
|
}
|
|
41
45
|
};
|
|
42
46
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/plugins/autoDepOptimizePlugin.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,sBAAsB;AAC/B,OAAO,aAAa;AACpB,OAAO,UAAU;AACjB,SAAS,oBAAiC;AAE1C;AAAA,EACE;AAAA,EAEA;AAAA,OACK;AACP,SAAS,aAAa,kBAAkB;AACxC,SAAS,mBAAmB;AAE5B,MAAM,OAAO,0BAEP,EAAE,OAAO,aAAa,IAAI,eAAe,IAAI;AAO5C,SAAS,sBAAsB,OAAgC;AACpE,SAAO;AAAA,IACL;AAAA,IACA,SAAS;AAAA,IAET,MAAM,OAAO,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -14,15 +14,17 @@ function autoDepOptimizePlugin(props) {
|
|
|
14
14
|
return {
|
|
15
15
|
name,
|
|
16
16
|
enforce: "pre",
|
|
17
|
-
async config(
|
|
17
|
+
async config(cfg, env) {
|
|
18
18
|
debug?.("Config hook called");
|
|
19
19
|
const depsConfig = globalThis.__oneOptions?.deps,
|
|
20
|
-
exclude = depsConfig ? Object.entries(depsConfig).filter(([
|
|
20
|
+
exclude = depsConfig ? Object.entries(depsConfig).filter(([_, value]) => value === !1).map(([k]) => k) : [],
|
|
21
21
|
userExcludes = Array.isArray(props.exclude) ? props.exclude : [props.exclude],
|
|
22
|
+
userViteExcludes = cfg.optimizeDeps?.exclude || [],
|
|
23
|
+
userSsrExcludes = cfg.ssr?.optimizeDeps?.exclude || [],
|
|
22
24
|
finalConfig = await getScannedOptimizeDepsConfig({
|
|
23
25
|
...props,
|
|
24
26
|
mode: env.mode,
|
|
25
|
-
exclude: [...exclude, ...userExcludes].filter(Boolean)
|
|
27
|
+
exclude: [...exclude, ...userExcludes, ...userViteExcludes, ...userSsrExcludes].filter(Boolean)
|
|
26
28
|
});
|
|
27
29
|
return debugDetails?.(`Final auto-dep-optimize config: ${JSON.stringify(finalConfig, null, 2)}
|
|
28
30
|
from props: ${JSON.stringify(props)}`), finalConfig;
|
|
@@ -32,13 +34,17 @@ from props: ${JSON.stringify(props)}`), finalConfig;
|
|
|
32
34
|
const getSSRExternalsCachePath = root => path.join(getCacheDir(root), "deps-to-pre-bundle-for-ssr-cache.json");
|
|
33
35
|
async function getScannedOptimizeDepsConfig(props) {
|
|
34
36
|
const result = await findDepsToOptimize(props);
|
|
35
|
-
|
|
37
|
+
props.onScannedDeps?.(result);
|
|
38
|
+
const excludeStrings = (Array.isArray(props.exclude) ? props.exclude : [props.exclude]).filter(e => typeof e == "string"),
|
|
39
|
+
excludeSet = new Set(excludeStrings),
|
|
40
|
+
filteredDeps = result.prebundleDeps.filter(dep => !excludeSet.has(dep));
|
|
41
|
+
return {
|
|
36
42
|
ssr: {
|
|
37
43
|
optimizeDeps: {
|
|
38
|
-
include:
|
|
44
|
+
include: filteredDeps,
|
|
39
45
|
exclude: EXCLUDE_LIST
|
|
40
46
|
},
|
|
41
|
-
noExternal:
|
|
47
|
+
noExternal: filteredDeps
|
|
42
48
|
}
|
|
43
49
|
};
|
|
44
50
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["createDebugger","FSExtra","path","createFilter","EXCLUDE_LIST","scanDepsToOptimize","getFileHash","lookupFile","getCacheDir","name","debug","debugDetails","autoDepOptimizePlugin","props","enforce","config","
|
|
1
|
+
{"version":3,"names":["createDebugger","FSExtra","path","createFilter","EXCLUDE_LIST","scanDepsToOptimize","getFileHash","lookupFile","getCacheDir","name","debug","debugDetails","autoDepOptimizePlugin","props","enforce","config","cfg","env","depsConfig","globalThis","__oneOptions","deps","exclude","Object","entries","filter","_","value","map","k","userExcludes","Array","isArray","userViteExcludes","optimizeDeps","userSsrExcludes","ssr","finalConfig","getScannedOptimizeDepsConfig","mode","Boolean","JSON","stringify","getSSRExternalsCachePath","root","join","result","findDepsToOptimize","onScannedDeps","excludeStrings","e","excludeSet","Set","filteredDeps","prebundleDeps","dep","has","include","noExternal","sessionCacheVal","cacheFilePath","startedAt","Date","now","noCache","sessionCache","lockFile","lockFileHash","cachedLockFileHash","depsToPreBundleForSsr","cachedDepsToPreBundle","readJSON","err","outputJSON","length","namespace"],"sources":["../../src/plugins/autoDepOptimizePlugin.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,cAAA,QAAsB;AAC/B,OAAOC,OAAA,MAAa;AACpB,OAAOC,IAAA,MAAU;AACjB,SAASC,YAAA,QAAiC;AAE1C,SACEC,YAAA,EAEAC,kBAAA,QACK;AACP,SAASC,WAAA,EAAaC,UAAA,QAAkB;AACxC,SAASC,WAAA,QAAmB;AAE5B,MAAMC,IAAA,GAAO;EAEP;IAAEC,KAAA;IAAOC;EAAa,IAAIX,cAAA,CAAeS,IAAI;AAO5C,SAASG,sBAAsBC,KAAA,EAAgC;EACpE,OAAO;IACLJ,IAAA;IACAK,OAAA,EAAS;IAET,MAAMC,OAAOC,GAAA,EAAKC,GAAA,EAAK;MACrBP,KAAA,GAAQ,oBAAoB;MAI5B,MAAMQ,UAAA,GADcC,UAAA,CAAWC,YAAA,EACCC,IAAA;QAE1BC,OAAA,GAAUJ,UAAA,GACZK,MAAA,CAAOC,OAAA,CAAQN,UAAU,EACtBO,MAAA,CAAO,CAAC,CAACC,CAAA,EAAGC,KAAK,MAAMA,KAAA,KAAU,EAAK,EACtCC,GAAA,CAAI,CAAC,CAACC,CAAC,MAAMA,CAAC,IACjB,EAAC;QAECC,YAAA,GAAeC,KAAA,CAAMC,OAAA,CAAQnB,KAAA,CAAMS,OAAO,IAAIT,KAAA,CAAMS,OAAA,GAAU,CAACT,KAAA,CAAMS,OAAO;QAG5EW,gBAAA,GAAmBjB,GAAA,CAAIkB,YAAA,EAAcZ,OAAA,IAAW,EAAC;QACjDa,eAAA,GAAkBnB,GAAA,CAAIoB,GAAA,EAAKF,YAAA,EAAcZ,OAAA,IAAW,EAAC;QAErDe,WAAA,GAAc,MAAMC,4BAAA,CAA6B;UACrD,GAAGzB,KAAA;UACH0B,IAAA,EAAMtB,GAAA,CAAIsB,IAAA;UACVjB,OAAA,EAAS,CAAC,GAAGA,OAAA,EAAS,GAAGQ,YAAA,EAAc,GAAGG,gBAAA,EAAkB,GAAGE,eAAe,EAAEV,MAAA,CAC9Ee,OACF;QACF,CAAC;MAED,OAAA7B,YAAA,GACE,mCAAmC8B,IAAA,CAAKC,SAAA,CAAUL,WAAA,EAAa,MAAM,CAAC,CAAC;AAAA,cAAiBI,IAAA,CAAKC,SAAA,CAAU7B,KAAK,CAAC,EAC/G,GAEOwB,WAAA;IACT;EACF;AACF;AAEO,MAAMM,wBAAA,GAA4BC,IAAA,IAChC1C,IAAA,CAAK2C,IAAA,CAAKrC,WAAA,CAAYoC,IAAI,GAAG,uCAAuC;AAK7E,eAAsBN,6BAA6BzB,KAAA,EAA8B;EAC/E,MAAMiC,MAAA,GAAS,MAAMC,kBAAA,CAAmBlC,KAAK;EAE7CA,KAAA,CAAMmC,aAAA,GAAgBF,MAAM;EAK5B,MAAMG,cAAA,IADelB,KAAA,CAAMC,OAAA,CAAQnB,KAAA,CAAMS,OAAO,IAAIT,KAAA,CAAMS,OAAA,GAAU,CAACT,KAAA,CAAMS,OAAO,GAC9CG,MAAA,CAAQyB,CAAA,IAAmB,OAAOA,CAAA,IAAM,QAAQ;IAC9EC,UAAA,GAAa,IAAIC,GAAA,CAAIH,cAAc;IAEnCI,YAAA,GAAeP,MAAA,CAAOQ,aAAA,CAAc7B,MAAA,CAAQ8B,GAAA,IAAQ,CAACJ,UAAA,CAAWK,GAAA,CAAID,GAAG,CAAC;EAE9E,OAAO;IACLnB,GAAA,EAAK;MACHF,YAAA,EAAc;QACZuB,OAAA,EAASJ,YAAA;QACT/B,OAAA,EAASlB;MACX;MACAsD,UAAA,EAAYL;IACd;EACF;AACF;AAEA,IAAIM,eAAA,GAAyC;AAE7C,eAAsBZ,mBAAmB;EACvCH,IAAA;EACAL,IAAA;EACAjB,OAAA;EACAmC;AACF,GAA0B;EACxB,MAAMG,aAAA,GAAgBjB,wBAAA,CAAyBC,IAAI;IAC7CiB,SAAA,GAAYnD,KAAA,GAAQoD,IAAA,CAAKC,GAAA,CAAI,IAAI;IAGjCC,OAAA,GAAUzB,IAAA,KAAS;IAGnB0B,YAAA,GAAe1B,IAAA,KAAS;EAE9B,IAAI0B,YAAA,IAAgBN,eAAA,EAClB,OAAOA,eAAA;EAGT,MAAMO,QAAA,GAAW,MAAM3D,UAAA,CAAWqC,IAAA,EAAM,CACtC,aACA,qBACA,kBACA,YACD;IAEKuB,YAAA,GAAeD,QAAA,GAAW,MAAM5D,WAAA,CAAY4D,QAAQ,IAAI;EAE9D,IAAIvC,KAAA;EAEJ,IAAIwC,YAAA,IAAgB,CAACH,OAAA,EACnB,IAAI;IACF,MAAM;MACJG,YAAA,EAAcC,kBAAA;MACdC,qBAAA,EAAuBC;IACzB,IAAI,MAAMrE,OAAA,CAAQsE,QAAA,CAASX,aAAa;IAGtCO,YAAA,KAAiBC,kBAAA,IACfE,qBAAA,IACF,mBAAmBA,qBAAA,KAEnB3C,KAAA,GAAQ2C,qBAAA,EACR5D,KAAA,GAAQ,kCAAkCkD,aAAa,EAAE;EAE7D,SAASY,GAAA,EAAK;IACZ9D,KAAA,GAAQ,GAAG8D,GAAG,EAAE;EAClB;EAGF,MAAM/C,MAAA,GAAStB,YAAA,CAAasD,OAAA,EAASnC,OAAO;EAE5C,OAAKK,KAAA,KACHA,KAAA,GAAQ,MAAMtB,kBAAA,CAAmB,GAAGuC,IAAI,iBAAiB;IAAEnB;EAAO,CAAC,GAE/DwC,YAAA,KACFN,eAAA,GAAkBhC,KAAA,GAGfqC,OAAA,IACE/D,OAAA,CAAQwE,UAAA,CAAWb,aAAA,EAAe;IACrCO,YAAA;IACAE,qBAAA,EAAuB1C;EACzB,CAAC,IAILjB,KAAA,GAAQ,yBAAyBoD,IAAA,CAAKC,GAAA,CAAI,IAAIF,SAAS,IAAI,GAC3DnD,KAAA,GACE,GAAGiB,KAAA,CAAM2B,aAAA,CAAcoB,MAAM,2DAC1B/D,YAAA,GACG,KACA,uCAAuCD,KAAA,CAAMiE,SAAS,2BAC9D,GAEAhE,YAAA,GACE,8CAA8CgB,KAAA,CAAM2B,aAAA,CAAcT,IAAA,CAAK,IAAI,CAAC,EAC9E,GAEOlB,KAAA;AACT","ignoreList":[]}
|
|
@@ -14,22 +14,25 @@ function autoDepOptimizePlugin(props) {
|
|
|
14
14
|
return {
|
|
15
15
|
name,
|
|
16
16
|
enforce: "pre",
|
|
17
|
-
async config(
|
|
17
|
+
async config(cfg, env) {
|
|
18
|
+
var _cfg_optimizeDeps, _cfg_ssr_optimizeDeps, _cfg_ssr;
|
|
18
19
|
debug?.("Config hook called");
|
|
19
20
|
var userOptions = globalThis.__oneOptions,
|
|
20
21
|
depsConfig = userOptions?.deps,
|
|
21
22
|
exclude = depsConfig ? Object.entries(depsConfig).filter(function (param) {
|
|
22
|
-
var [
|
|
23
|
+
var [_, value] = param;
|
|
23
24
|
return value === !1;
|
|
24
25
|
}).map(function (param) {
|
|
25
26
|
var [k] = param;
|
|
26
27
|
return k;
|
|
27
28
|
}) : [],
|
|
28
29
|
userExcludes = Array.isArray(props.exclude) ? props.exclude : [props.exclude],
|
|
30
|
+
userViteExcludes = ((_cfg_optimizeDeps = cfg.optimizeDeps) === null || _cfg_optimizeDeps === void 0 ? void 0 : _cfg_optimizeDeps.exclude) || [],
|
|
31
|
+
userSsrExcludes = ((_cfg_ssr = cfg.ssr) === null || _cfg_ssr === void 0 || (_cfg_ssr_optimizeDeps = _cfg_ssr.optimizeDeps) === null || _cfg_ssr_optimizeDeps === void 0 ? void 0 : _cfg_ssr_optimizeDeps.exclude) || [],
|
|
29
32
|
finalConfig = await getScannedOptimizeDepsConfig({
|
|
30
33
|
...props,
|
|
31
34
|
mode: env.mode,
|
|
32
|
-
exclude: [...exclude, ...userExcludes].filter(Boolean)
|
|
35
|
+
exclude: [...exclude, ...userExcludes, ...userViteExcludes, ...userSsrExcludes].filter(Boolean)
|
|
33
36
|
});
|
|
34
37
|
return debugDetails?.(`Final auto-dep-optimize config: ${JSON.stringify(finalConfig, null, 2)}
|
|
35
38
|
from props: ${JSON.stringify(props)}`), finalConfig;
|
|
@@ -42,13 +45,22 @@ var getSSRExternalsCachePath = function (root) {
|
|
|
42
45
|
async function getScannedOptimizeDepsConfig(props) {
|
|
43
46
|
var _props_onScannedDeps,
|
|
44
47
|
result = await findDepsToOptimize(props);
|
|
45
|
-
|
|
48
|
+
(_props_onScannedDeps = props.onScannedDeps) === null || _props_onScannedDeps === void 0 || _props_onScannedDeps.call(props, result);
|
|
49
|
+
var excludeArray = Array.isArray(props.exclude) ? props.exclude : [props.exclude],
|
|
50
|
+
excludeStrings = excludeArray.filter(function (e) {
|
|
51
|
+
return typeof e == "string";
|
|
52
|
+
}),
|
|
53
|
+
excludeSet = new Set(excludeStrings),
|
|
54
|
+
filteredDeps = result.prebundleDeps.filter(function (dep) {
|
|
55
|
+
return !excludeSet.has(dep);
|
|
56
|
+
});
|
|
57
|
+
return {
|
|
46
58
|
ssr: {
|
|
47
59
|
optimizeDeps: {
|
|
48
|
-
include:
|
|
60
|
+
include: filteredDeps,
|
|
49
61
|
exclude: EXCLUDE_LIST
|
|
50
62
|
},
|
|
51
|
-
noExternal:
|
|
63
|
+
noExternal: filteredDeps
|
|
52
64
|
}
|
|
53
65
|
};
|
|
54
66
|
}
|