vxrn 0.1.52 → 0.1.53
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/cjs/utils/getViteServerConfig.js +13 -7
- package/dist/cjs/utils/getViteServerConfig.js.map +1 -1
- package/dist/cjs/utils/getViteServerConfig.native.js +6 -7
- package/dist/cjs/utils/getViteServerConfig.native.js.map +2 -2
- package/dist/cjs/utils/swapPrebuiltReactModules.js +1 -1
- package/dist/cjs/utils/swapPrebuiltReactModules.js.map +1 -1
- package/dist/cjs/utils/swapPrebuiltReactModules.native.js +1 -1
- package/dist/cjs/utils/swapPrebuiltReactModules.native.js.map +1 -1
- package/dist/esm/utils/getViteServerConfig.js +13 -7
- package/dist/esm/utils/getViteServerConfig.js.map +1 -1
- package/dist/esm/utils/getViteServerConfig.mjs +27 -27
- package/dist/esm/utils/getViteServerConfig.native.js +6 -7
- package/dist/esm/utils/getViteServerConfig.native.js.map +2 -2
- package/dist/esm/utils/swapPrebuiltReactModules.js +3 -3
- package/dist/esm/utils/swapPrebuiltReactModules.js.map +1 -1
- package/dist/esm/utils/swapPrebuiltReactModules.mjs +3 -3
- package/dist/esm/utils/swapPrebuiltReactModules.native.js +3 -3
- package/dist/esm/utils/swapPrebuiltReactModules.native.js.map +2 -2
- package/package.json +9 -9
- package/src/utils/getViteServerConfig.ts +20 -8
- package/src/utils/swapPrebuiltReactModules.ts +6 -6
- package/types/utils/swapPrebuiltReactModules.d.ts +2 -6
|
@@ -19,7 +19,7 @@ __export(getViteServerConfig_exports, {
|
|
|
19
19
|
module.exports = __toCommonJS(getViteServerConfig_exports);
|
|
20
20
|
var import_vite = require("vite"), import_getBaseViteConfig = require("./getBaseViteConfig"), import_getOptimizeDeps = require("./getOptimizeDeps"), import_uniq = require("./uniq"), import_coerceToArray = require("./coerceToArray"), import_reactNativeHMRPlugin = require("../plugins/reactNativeHMRPlugin");
|
|
21
21
|
async function getViteServerConfig(config) {
|
|
22
|
-
const { root, host
|
|
22
|
+
const { root, host } = config, { optimizeDeps } = (0, import_getOptimizeDeps.getOptimizeDeps)("serve");
|
|
23
23
|
let serverConfig = (0, import_vite.mergeConfig)(
|
|
24
24
|
(0, import_getBaseViteConfig.getBaseViteConfig)({
|
|
25
25
|
mode: "development"
|
|
@@ -49,32 +49,38 @@ async function getViteServerConfig(config) {
|
|
|
49
49
|
host
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
|
-
);
|
|
52
|
+
), webConfig = config.webConfig || {};
|
|
53
53
|
if (webConfig && (serverConfig = (0, import_vite.mergeConfig)(serverConfig, webConfig)), serverConfig.ssr?.noExternal && !Array.isArray(serverConfig.ssr?.noExternal))
|
|
54
54
|
throw new Error("ssr.noExternal must be array");
|
|
55
|
-
return serverConfig.ssr ||= {}, serverConfig.ssr.noExternal = [
|
|
55
|
+
return serverConfig.ssr ||= {}, serverConfig.ssr.optimizeDeps ||= {}, webConfig.ssr ||= {}, webConfig.ssr.optimizeDeps ||= {}, serverConfig.ssr.noExternal = (0, import_uniq.uniq)([
|
|
56
56
|
...(0, import_coerceToArray.coerceToArray)(serverConfig.ssr?.noExternal || []),
|
|
57
|
+
...serverConfig.ssr?.optimizeDeps.include || [],
|
|
58
|
+
...webConfig.ssr?.optimizeDeps.include || [],
|
|
59
|
+
...(0, import_coerceToArray.coerceToArray)(webConfig.ssr?.noExternal || []),
|
|
57
60
|
...optimizeDeps.include,
|
|
58
61
|
"react",
|
|
59
62
|
"react-dom",
|
|
60
63
|
"react-dom/server",
|
|
61
64
|
"react-dom/client"
|
|
62
|
-
], serverConfig.ssr.optimizeDeps
|
|
65
|
+
]), serverConfig.ssr.optimizeDeps.exclude = (0, import_uniq.uniq)([
|
|
63
66
|
...serverConfig.ssr?.optimizeDeps.exclude || [],
|
|
67
|
+
...webConfig.ssr?.optimizeDeps.exclude || [],
|
|
64
68
|
...optimizeDeps.exclude
|
|
65
69
|
]), serverConfig.ssr.optimizeDeps.include = (0, import_uniq.uniq)([
|
|
66
70
|
...serverConfig.ssr?.optimizeDeps.include || [],
|
|
71
|
+
...webConfig.ssr?.optimizeDeps.include || [],
|
|
67
72
|
...optimizeDeps.include
|
|
68
73
|
]), serverConfig.ssr.optimizeDeps.needsInterop = (0, import_uniq.uniq)([
|
|
69
74
|
...serverConfig.ssr?.optimizeDeps.needsInterop || [],
|
|
75
|
+
...webConfig.ssr?.optimizeDeps.needsInterop || [],
|
|
70
76
|
...optimizeDeps.needsInterop
|
|
71
77
|
]), serverConfig.ssr.optimizeDeps.esbuildOptions = {
|
|
72
78
|
...serverConfig.ssr?.optimizeDeps.esbuildOptions || {},
|
|
79
|
+
...webConfig.ssr?.optimizeDeps.esbuildOptions || {},
|
|
73
80
|
...optimizeDeps.esbuildOptions
|
|
74
|
-
}, process.env.DEBUG && (console.debug("
|
|
75
|
-
`, JSON.stringify(serverConfig.ssr, null, 2))), serverConfig = {
|
|
81
|
+
}, process.env.DEBUG && (console.debug("user config is", JSON.stringify(webConfig, null, 2)), console.debug("server config is", JSON.stringify(serverConfig, null, 2))), serverConfig = {
|
|
76
82
|
...serverConfig,
|
|
77
83
|
plugins: [...serverConfig.plugins]
|
|
78
|
-
},
|
|
84
|
+
}, serverConfig;
|
|
79
85
|
}
|
|
80
86
|
//# sourceMappingURL=getViteServerConfig.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/utils/getViteServerConfig.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAgE,iBAChE,2BAAkC,gCAElC,yBAAgC,8BAChC,cAAqB,mBACrB,uBAA8B,4BAC9B,8BAAqC;AAErC,eAAsB,oBAAoB,QAA0B;AAClE,QAAM,EAAE,MAAM,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAgE,iBAChE,2BAAkC,gCAElC,yBAAgC,8BAChC,cAAqB,mBACrB,uBAA8B,4BAC9B,8BAAqC;AAErC,eAAsB,oBAAoB,QAA0B;AAClE,QAAM,EAAE,MAAM,KAAK,IAAI,QACjB,EAAE,aAAa,QAAI,wCAAgB,OAAO;AAEhD,MAAI,mBAA2B;AAAA,QAC7B,4CAAkB;AAAA,MAChB,MAAM;AAAA,IACR,CAAC;AAAA,IACD;AAAA,MACE;AAAA,MACA,aAAa;AAAA,MACb,SAAS;AAAA,YACP,kDAAqB,MAAM;AAAA,QAE3B;AAAA,UACE,MAAM;AAAA,UACN,UAAU,MAAM,IAAI,SAAS;AAC3B,gBAAI,IAAG,SAAS,cAAc,KAC1B,KAAK,SAAS,+BAA+B;AAC/C,qBAAO,KAAK,WAAW,iCAAiC,GAAG,CAAC,CAAC,SAAS,GAAG,EAAE;AAAA,UAE/E;AAAA,QACF;AAAA,MACF;AAAA,MAEA;AAAA,MAEA,KAAK;AAAA,QACH;AAAA,MACF;AAAA,MAEA,QAAQ;AAAA,QACN,KAAK;AAAA,UACH,MAAM;AAAA,QACR;AAAA,QACA,MAAM;AAAA,QACN;AAAA,MACF;AAAA,IACF;AAAA,EACF,GAEI,YAAY,OAAO,aAAa,CAAC;AAMrC,MAJI,cACF,mBAAe,yBAAY,cAAc,SAAS,IAGhD,aAAa,KAAK,cAAc,CAAC,MAAM,QAAQ,aAAa,KAAK,UAAU;AAC7E,UAAM,IAAI,MAAM,8BAA8B;AAKhD,sBAAa,QAAQ,CAAC,GACtB,aAAa,IAAI,iBAAiB,CAAC,GAEnC,UAAU,QAAQ,CAAC,GACnB,UAAU,IAAI,iBAAiB,CAAC,GAEhC,aAAa,IAAI,iBAAa,kBAAK;AAAA,IACjC,OAAG,oCAAe,aAAa,KAAK,cAA2B,CAAC,CAAC;AAAA,IACjE,GAAI,aAAa,KAAK,aAAa,WAAW,CAAC;AAAA,IAC/C,GAAI,UAAU,KAAK,aAAa,WAAW,CAAC;AAAA,IAC5C,OAAG,oCAAc,UAAU,KAAK,cAAc,CAAC,CAAC;AAAA,IAChD,GAAG,aAAa;AAAA,IAChB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,CAAC,GAED,aAAa,IAAI,aAAa,cAAU,kBAAK;AAAA,IAC3C,GAAI,aAAa,KAAK,aAAa,WAAW,CAAC;AAAA,IAC/C,GAAI,UAAU,KAAK,aAAa,WAAW,CAAC;AAAA,IAC5C,GAAG,aAAa;AAAA,EAClB,CAAC,GAED,aAAa,IAAI,aAAa,cAAU,kBAAK;AAAA,IAC3C,GAAI,aAAa,KAAK,aAAa,WAAW,CAAC;AAAA,IAC/C,GAAI,UAAU,KAAK,aAAa,WAAW,CAAC;AAAA,IAC5C,GAAG,aAAa;AAAA,EAClB,CAAC,GAED,aAAa,IAAI,aAAa,mBAAe,kBAAK;AAAA,IAChD,GAAI,aAAa,KAAK,aAAa,gBAAgB,CAAC;AAAA,IACpD,GAAI,UAAU,KAAK,aAAa,gBAAgB,CAAC;AAAA,IACjD,GAAG,aAAa;AAAA,EAClB,CAAC,GAED,aAAa,IAAI,aAAa,iBAAiB;AAAA,IAC7C,GAAI,aAAa,KAAK,aAAa,kBAAkB,CAAC;AAAA,IACtD,GAAI,UAAU,KAAK,aAAa,kBAAkB,CAAC;AAAA,IACnD,GAAG,aAAa;AAAA,EAClB,GAGI,QAAQ,IAAI,UACd,QAAQ,MAAM,kBAAkB,KAAK,UAAU,WAAW,MAAM,CAAC,CAAC,GAClE,QAAQ,MAAM,oBAAoB,KAAK,UAAU,cAAc,MAAM,CAAC,CAAC,IAGzE,eAAe;AAAA,IACb,GAAG;AAAA,IACH,SAAS,CAAC,GAAG,aAAa,OAAQ;AAAA,EACpC,GAEO;AACT;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -204,9 +204,9 @@ function getViteServerConfig(config) {
|
|
|
204
204
|
}
|
|
205
205
|
function _getViteServerConfig() {
|
|
206
206
|
return _getViteServerConfig = _async_to_generator(function(config) {
|
|
207
|
-
var _serverConfig_ssr, _serverConfig_ssr1, _serverConfig_ssr2, _serverConfig_ssr3, _serverConfig_ssr4, _serverConfig_ssr5, _serverConfig_ssr6, _serverConfig, root, host,
|
|
207
|
+
var _serverConfig_ssr, _serverConfig_ssr1, _serverConfig_ssr2, _serverConfig_ssr3, _webConfig_ssr, _webConfig_ssr1, _serverConfig_ssr4, _webConfig_ssr2, _serverConfig_ssr5, _webConfig_ssr3, _serverConfig_ssr6, _webConfig_ssr4, _serverConfig_ssr7, _webConfig_ssr5, _serverConfig, _serverConfig_ssr8, _webConfig, _webConfig_ssr6, root, host, optimizeDeps, serverConfig, webConfig;
|
|
208
208
|
return _ts_generator(this, function(_state) {
|
|
209
|
-
if (root = config.root, host = config.host,
|
|
209
|
+
if (root = config.root, host = config.host, optimizeDeps = (0, import_getOptimizeDeps.getOptimizeDeps)("serve").optimizeDeps, serverConfig = (0, import_vite.mergeConfig)((0, import_getBaseViteConfig.getBaseViteConfig)({
|
|
210
210
|
mode: "development"
|
|
211
211
|
}), {
|
|
212
212
|
root,
|
|
@@ -232,17 +232,16 @@ function _getViteServerConfig() {
|
|
|
232
232
|
cors: !0,
|
|
233
233
|
host
|
|
234
234
|
}
|
|
235
|
-
}), webConfig && (serverConfig = (0, import_vite.mergeConfig)(serverConfig, webConfig)), !((_serverConfig_ssr = serverConfig.ssr) === null || _serverConfig_ssr === void 0) && _serverConfig_ssr.noExternal && !Array.isArray((_serverConfig_ssr1 = serverConfig.ssr) === null || _serverConfig_ssr1 === void 0 ? void 0 : _serverConfig_ssr1.noExternal))
|
|
235
|
+
}), webConfig = config.webConfig || {}, webConfig && (serverConfig = (0, import_vite.mergeConfig)(serverConfig, webConfig)), !((_serverConfig_ssr = serverConfig.ssr) === null || _serverConfig_ssr === void 0) && _serverConfig_ssr.noExternal && !Array.isArray((_serverConfig_ssr1 = serverConfig.ssr) === null || _serverConfig_ssr1 === void 0 ? void 0 : _serverConfig_ssr1.noExternal))
|
|
236
236
|
throw new Error("ssr.noExternal must be array");
|
|
237
|
-
return (_serverConfig = serverConfig).ssr || (_serverConfig.ssr = {}), serverConfig.ssr.noExternal = _to_consumable_array((0, import_coerceToArray.coerceToArray)(((_serverConfig_ssr2 = serverConfig.ssr) === null || _serverConfig_ssr2 === void 0 ? void 0 : _serverConfig_ssr2.noExternal) || [])).concat(_to_consumable_array(optimizeDeps.include), [
|
|
237
|
+
return (_serverConfig = serverConfig).ssr || (_serverConfig.ssr = {}), (_serverConfig_ssr8 = serverConfig.ssr).optimizeDeps || (_serverConfig_ssr8.optimizeDeps = {}), (_webConfig = webConfig).ssr || (_webConfig.ssr = {}), (_webConfig_ssr6 = webConfig.ssr).optimizeDeps || (_webConfig_ssr6.optimizeDeps = {}), serverConfig.ssr.noExternal = (0, import_uniq.uniq)(_to_consumable_array((0, import_coerceToArray.coerceToArray)(((_serverConfig_ssr2 = serverConfig.ssr) === null || _serverConfig_ssr2 === void 0 ? void 0 : _serverConfig_ssr2.noExternal) || [])).concat(_to_consumable_array(((_serverConfig_ssr3 = serverConfig.ssr) === null || _serverConfig_ssr3 === void 0 ? void 0 : _serverConfig_ssr3.optimizeDeps.include) || []), _to_consumable_array(((_webConfig_ssr = webConfig.ssr) === null || _webConfig_ssr === void 0 ? void 0 : _webConfig_ssr.optimizeDeps.include) || []), _to_consumable_array((0, import_coerceToArray.coerceToArray)(((_webConfig_ssr1 = webConfig.ssr) === null || _webConfig_ssr1 === void 0 ? void 0 : _webConfig_ssr1.noExternal) || [])), _to_consumable_array(optimizeDeps.include), [
|
|
238
238
|
"react",
|
|
239
239
|
"react-dom",
|
|
240
240
|
"react-dom/server",
|
|
241
241
|
"react-dom/client"
|
|
242
|
-
]), serverConfig.ssr.optimizeDeps
|
|
243
|
-
`, JSON.stringify(serverConfig.ssr, null, 2))), serverConfig = _object_spread_props(_object_spread({}, serverConfig), {
|
|
242
|
+
])), serverConfig.ssr.optimizeDeps.exclude = (0, import_uniq.uniq)(_to_consumable_array(((_serverConfig_ssr4 = serverConfig.ssr) === null || _serverConfig_ssr4 === void 0 ? void 0 : _serverConfig_ssr4.optimizeDeps.exclude) || []).concat(_to_consumable_array(((_webConfig_ssr2 = webConfig.ssr) === null || _webConfig_ssr2 === void 0 ? void 0 : _webConfig_ssr2.optimizeDeps.exclude) || []), _to_consumable_array(optimizeDeps.exclude))), serverConfig.ssr.optimizeDeps.include = (0, import_uniq.uniq)(_to_consumable_array(((_serverConfig_ssr5 = serverConfig.ssr) === null || _serverConfig_ssr5 === void 0 ? void 0 : _serverConfig_ssr5.optimizeDeps.include) || []).concat(_to_consumable_array(((_webConfig_ssr3 = webConfig.ssr) === null || _webConfig_ssr3 === void 0 ? void 0 : _webConfig_ssr3.optimizeDeps.include) || []), _to_consumable_array(optimizeDeps.include))), serverConfig.ssr.optimizeDeps.needsInterop = (0, import_uniq.uniq)(_to_consumable_array(((_serverConfig_ssr6 = serverConfig.ssr) === null || _serverConfig_ssr6 === void 0 ? void 0 : _serverConfig_ssr6.optimizeDeps.needsInterop) || []).concat(_to_consumable_array(((_webConfig_ssr4 = webConfig.ssr) === null || _webConfig_ssr4 === void 0 ? void 0 : _webConfig_ssr4.optimizeDeps.needsInterop) || []), _to_consumable_array(optimizeDeps.needsInterop))), serverConfig.ssr.optimizeDeps.esbuildOptions = _object_spread({}, ((_serverConfig_ssr7 = serverConfig.ssr) === null || _serverConfig_ssr7 === void 0 ? void 0 : _serverConfig_ssr7.optimizeDeps.esbuildOptions) || {}, ((_webConfig_ssr5 = webConfig.ssr) === null || _webConfig_ssr5 === void 0 ? void 0 : _webConfig_ssr5.optimizeDeps.esbuildOptions) || {}, optimizeDeps.esbuildOptions), process.env.DEBUG && (console.debug("user config is", JSON.stringify(webConfig, null, 2)), console.debug("server config is", JSON.stringify(serverConfig, null, 2))), serverConfig = _object_spread_props(_object_spread({}, serverConfig), {
|
|
244
243
|
plugins: _to_consumable_array(serverConfig.plugins)
|
|
245
|
-
}),
|
|
244
|
+
}), [
|
|
246
245
|
2,
|
|
247
246
|
serverConfig
|
|
248
247
|
];
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/utils/Users/n8/vxrn/packages/vxrn/src/utils/getViteServerConfig.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;AAAA,kBAAgE,iBAChE,2BAAkC,gCAElC,yBAAgC,8BAChC,cAAqB,mBACrB,uBAA8B,4BAC9B,8BAAqC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAErC,SAAsBA,oBAAoBC,QAAwB;SAA5CD,qBAAAA,MAAAA,MAAAA,SAAAA;;SAAAA,uBAAAA;AAAAA,gCAAf,oBAAA,SAAmCC,QAAwB;
|
|
5
|
-
"names": ["getViteServerConfig", "config", "serverConfig", "
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["getViteServerConfig", "config", "serverConfig", "webConfig", "root", "host", "optimizeDeps", "getOptimizeDeps", "mergeConfig", "getBaseViteConfig", "mode", "clearScreen", "plugins", "reactNativeHMRPlugin", "name", "transform", "code", "id", "options", "includes", "replaceAll", "ssr", "server", "hmr", "path", "cors", "noExternal", "Array", "isArray", "Error", "uniq", "coerceToArray", "include", "exclude", "needsInterop", "esbuildOptions", "process", "env", "DEBUG", "console", "debug", "JSON", "stringify"]
|
|
6
6
|
}
|
|
@@ -25,7 +25,7 @@ __export(swapPrebuiltReactModules_exports, {
|
|
|
25
25
|
swapPrebuiltReactModules: () => swapPrebuiltReactModules
|
|
26
26
|
});
|
|
27
27
|
module.exports = __toCommonJS(swapPrebuiltReactModules_exports);
|
|
28
|
-
var
|
|
28
|
+
var import_react_native_prebuilt = require("@vxrn/react-native-prebuilt"), import_fs_extra = __toESM(require("fs-extra"), 1), import_promises = require("node:fs/promises"), import_node_path = require("node:path"), import_isBuildingNativeBundle = require("./isBuildingNativeBundle"), import_resolveFile = require("./resolveFile");
|
|
29
29
|
async function swapPrebuiltReactModules(cacheDir) {
|
|
30
30
|
const prebuilds = {
|
|
31
31
|
reactJSX: (0, import_node_path.join)(cacheDir, "react-jsx-runtime.js"),
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/utils/swapPrebuiltReactModules.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mCAA4D,wCAC5D,kBAAoB,iCACpB,kBAAyB,6BACzB,mBAAuC,sBAEvC,gCAAuC,qCACvC,qBAA4B;AAK5B,eAAsB,yBAAyB,UAAmC;AAChF,QAAM,YAAY;AAAA,IAChB,cAAU,uBAAK,UAAU,sBAAsB;AAAA,IAC/C,WAAO,uBAAK,UAAU,UAAU;AAAA,IAChC,iBAAa,uBAAK,UAAU,iBAAiB;AAAA,EAC/C;AAEA,EAAM,MAAM,gBAAAA,QAAQ,WAAW,UAAU,WAAW,MAClD,QAAQ,KAAK,uEAAuE,GACpF,MAAM,QAAQ,IAAI;AAAA,QAChB,+CAAiB;AAAA,MACf,aAAa,KAAC,gCAAY,cAAc,CAAC;AAAA,MACzC,SAAS,UAAU;AAAA,IACrB,CAAC;AAAA,QACD,yCAAW;AAAA,MACT,aAAa,KAAC,gCAAY,OAAO,CAAC;AAAA,MAClC,SAAS,UAAU;AAAA,IACrB,CAAC;AAAA,QACD,4CAAc;AAAA,MACZ,aAAa,KAAC,gCAAY,uBAAuB,CAAC;AAAA,MAClD,SAAS,UAAU;AAAA,IACrB,CAAC;AAAA,EACH,CAAC;AAIH,QAAM,aAAa;AAAA;AAAA,IAEjB,OAAO,UAAU;AAAA,IACjB,UAAU,UAAM,0BAAS,UAAU,UAAU,OAAO;AAAA,EACtD,GAEM,iBAAiB;AAAA,IACrB,gBAAgB;AAAA;AAAA,MAEd,OAAO,UAAU;AAAA,MACjB,UAAU,UAAM,0BAAS,UAAU,aAAa,OAAO;AAAA,IACzD;AAAA,IACA,OAAO;AAAA;AAAA,MAEL,OAAO,UAAU;AAAA,MACjB,UAAU,UAAM,0BAAS,UAAU,OAAO,OAAO;AAAA,IACnD;AAAA,IACA,qBAAqB;AAAA,IACrB,yBAAyB;AAAA,EAC3B;AAEA,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,IAET,UAAU,IAAI,WAAW,IAAI;AAC3B,UAAI,GAAG,WAAW,wBAAwB;AACxC,eAAO,wBAAwB,EAAE;AAInC,UAAI,OAAO;AACT,eAAO,UAAU;AAGnB,iBAAW,YAAY;AACrB,YAAI,OAAO,YAAY,GAAG,SAAS,gBAAgB,QAAQ,GAAG;AAG5D,iBAFa,eAAe,QAAQ,EAExB;AAQhB,UAAI,wDACE,GAAG,CAAC,MAAM,KAAK;AACjB,cAAM,mBAAe,8BAAQ,0BAAQ,QAAQ,GAAG,EAAE,GAC5C,aAAa,aAAa,QAAQ,WAAW,YAAY;AAC/D,YAAI,eAAe;AAAI;AACvB,YAAI;AACF,gBAAM,gBAAgB,eAAe,oBAC/B,yBAAyB,eAAe;AAC9C,cAAI,gBAAAA,QAAQ,eAAe,aAAa;AACtC,mBAAO;AAET,cAAI,gBAAAA,QAAQ,eAAe,sBAAsB;AAC/C,mBAAO;AAET,cAAI,gBAAAA,QAAQ,eAAe,UAAU;AACnC,mBAAO;AAAA,QAEX,SAAS,KAAK;AACZ,kBAAQ,KAAK,uBAAuB,GAAG;AAAA,QACzC;AAAA,MACF;AAAA,IAEJ;AAAA,IAEA,KAAK,IAAI;AACP,UAAI,GAAG,WAAW,sBAAsB;AAKtC,eAHU,mCADI,GAAG,QAAQ,yBAAyB,EAAE,CACF;AAAA;AAAA;AAMpD,iBAAW,YAAY,gBAAgB;AACrC,cAAM,OAAO,eAAe,QAAuC;AACnE,YAAI,OAAO,KAAK;AACd,iBAAO,KAAK;AAAA,MAEhB;AAAA,IACF;AAAA,EACF;AACF;",
|
|
5
5
|
"names": ["FSExtra"]
|
|
6
6
|
}
|
|
@@ -26,7 +26,7 @@ __export(swapPrebuiltReactModules_exports, {
|
|
|
26
26
|
swapPrebuiltReactModules: () => swapPrebuiltReactModules
|
|
27
27
|
});
|
|
28
28
|
module.exports = __toCommonJS(swapPrebuiltReactModules_exports);
|
|
29
|
-
var
|
|
29
|
+
var import_react_native_prebuilt = require("@vxrn/react-native-prebuilt"), import_fs_extra = __toESM(require("fs-extra"), 1), import_promises = require("node:fs/promises"), import_node_path = require("node:path"), import_isBuildingNativeBundle = require("./isBuildingNativeBundle"), import_resolveFile = require("./resolveFile");
|
|
30
30
|
function asyncGeneratorStep(gen, resolve2, reject, _next, _throw, key, arg) {
|
|
31
31
|
try {
|
|
32
32
|
var info = gen[key](arg), value = info.value;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/utils/Users/n8/vxrn/packages/vxrn/src/utils/swapPrebuiltReactModules.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["swapPrebuiltReactModules", "cacheDir", "prebuilds", "jsxRuntime", "virtualModules", "reactJSX", "join", "react", "reactNative", "FSExtra", "pathExists", "console", "info", "Promise", "all", "buildReactNative", "entryPoints", "resolveFile", "outfile", "buildReact", "buildReactJSX", "alias", "readFile", "contents", "name", "enforce", "resolveId", "id", "importer", "startsWith", "targetId", "includes", "isBuildingNativeBundle", "absolutePath", "resolve", "dirname", "nativePath", "replace", "directoryPath", "directoryNonNativePath", "pathExistsSync", "err", "warn", "load", "idOut", "out"]
|
|
6
6
|
}
|
|
@@ -5,7 +5,7 @@ import { uniq } from "./uniq";
|
|
|
5
5
|
import { coerceToArray } from "./coerceToArray";
|
|
6
6
|
import { reactNativeHMRPlugin } from "../plugins/reactNativeHMRPlugin";
|
|
7
7
|
async function getViteServerConfig(config) {
|
|
8
|
-
const { root, host
|
|
8
|
+
const { root, host } = config, { optimizeDeps } = getOptimizeDeps("serve");
|
|
9
9
|
let serverConfig = mergeConfig(
|
|
10
10
|
getBaseViteConfig({
|
|
11
11
|
mode: "development"
|
|
@@ -35,33 +35,39 @@ async function getViteServerConfig(config) {
|
|
|
35
35
|
host
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
|
-
);
|
|
38
|
+
), webConfig = config.webConfig || {};
|
|
39
39
|
if (webConfig && (serverConfig = mergeConfig(serverConfig, webConfig)), serverConfig.ssr?.noExternal && !Array.isArray(serverConfig.ssr?.noExternal))
|
|
40
40
|
throw new Error("ssr.noExternal must be array");
|
|
41
|
-
return serverConfig.ssr ||= {}, serverConfig.ssr.noExternal = [
|
|
41
|
+
return serverConfig.ssr ||= {}, serverConfig.ssr.optimizeDeps ||= {}, webConfig.ssr ||= {}, webConfig.ssr.optimizeDeps ||= {}, serverConfig.ssr.noExternal = uniq([
|
|
42
42
|
...coerceToArray(serverConfig.ssr?.noExternal || []),
|
|
43
|
+
...serverConfig.ssr?.optimizeDeps.include || [],
|
|
44
|
+
...webConfig.ssr?.optimizeDeps.include || [],
|
|
45
|
+
...coerceToArray(webConfig.ssr?.noExternal || []),
|
|
43
46
|
...optimizeDeps.include,
|
|
44
47
|
"react",
|
|
45
48
|
"react-dom",
|
|
46
49
|
"react-dom/server",
|
|
47
50
|
"react-dom/client"
|
|
48
|
-
], serverConfig.ssr.optimizeDeps
|
|
51
|
+
]), serverConfig.ssr.optimizeDeps.exclude = uniq([
|
|
49
52
|
...serverConfig.ssr?.optimizeDeps.exclude || [],
|
|
53
|
+
...webConfig.ssr?.optimizeDeps.exclude || [],
|
|
50
54
|
...optimizeDeps.exclude
|
|
51
55
|
]), serverConfig.ssr.optimizeDeps.include = uniq([
|
|
52
56
|
...serverConfig.ssr?.optimizeDeps.include || [],
|
|
57
|
+
...webConfig.ssr?.optimizeDeps.include || [],
|
|
53
58
|
...optimizeDeps.include
|
|
54
59
|
]), serverConfig.ssr.optimizeDeps.needsInterop = uniq([
|
|
55
60
|
...serverConfig.ssr?.optimizeDeps.needsInterop || [],
|
|
61
|
+
...webConfig.ssr?.optimizeDeps.needsInterop || [],
|
|
56
62
|
...optimizeDeps.needsInterop
|
|
57
63
|
]), serverConfig.ssr.optimizeDeps.esbuildOptions = {
|
|
58
64
|
...serverConfig.ssr?.optimizeDeps.esbuildOptions || {},
|
|
65
|
+
...webConfig.ssr?.optimizeDeps.esbuildOptions || {},
|
|
59
66
|
...optimizeDeps.esbuildOptions
|
|
60
|
-
}, process.env.DEBUG && (console.debug("
|
|
61
|
-
`, JSON.stringify(serverConfig.ssr, null, 2))), serverConfig = {
|
|
67
|
+
}, process.env.DEBUG && (console.debug("user config is", JSON.stringify(webConfig, null, 2)), console.debug("server config is", JSON.stringify(serverConfig, null, 2))), serverConfig = {
|
|
62
68
|
...serverConfig,
|
|
63
69
|
plugins: [...serverConfig.plugins]
|
|
64
|
-
},
|
|
70
|
+
}, serverConfig;
|
|
65
71
|
}
|
|
66
72
|
export {
|
|
67
73
|
getViteServerConfig
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/utils/getViteServerConfig.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,mBAAuD;AAChE,SAAS,yBAAyB;AAElC,SAAS,uBAAuB;AAChC,SAAS,YAAY;AACrB,SAAS,qBAAqB;AAC9B,SAAS,4BAA4B;AAErC,eAAsB,oBAAoB,QAA0B;AAClE,QAAM,EAAE,MAAM,
|
|
4
|
+
"mappings": "AAAA,SAAS,mBAAuD;AAChE,SAAS,yBAAyB;AAElC,SAAS,uBAAuB;AAChC,SAAS,YAAY;AACrB,SAAS,qBAAqB;AAC9B,SAAS,4BAA4B;AAErC,eAAsB,oBAAoB,QAA0B;AAClE,QAAM,EAAE,MAAM,KAAK,IAAI,QACjB,EAAE,aAAa,IAAI,gBAAgB,OAAO;AAEhD,MAAI,eAA2B;AAAA,IAC7B,kBAAkB;AAAA,MAChB,MAAM;AAAA,IACR,CAAC;AAAA,IACD;AAAA,MACE;AAAA,MACA,aAAa;AAAA,MACb,SAAS;AAAA,QACP,qBAAqB,MAAM;AAAA,QAE3B;AAAA,UACE,MAAM;AAAA,UACN,UAAU,MAAM,IAAI,SAAS;AAC3B,gBAAI,IAAG,SAAS,cAAc,KAC1B,KAAK,SAAS,+BAA+B;AAC/C,qBAAO,KAAK,WAAW,iCAAiC,GAAG,CAAC,CAAC,SAAS,GAAG,EAAE;AAAA,UAE/E;AAAA,QACF;AAAA,MACF;AAAA,MAEA;AAAA,MAEA,KAAK;AAAA,QACH;AAAA,MACF;AAAA,MAEA,QAAQ;AAAA,QACN,KAAK;AAAA,UACH,MAAM;AAAA,QACR;AAAA,QACA,MAAM;AAAA,QACN;AAAA,MACF;AAAA,IACF;AAAA,EACF,GAEI,YAAY,OAAO,aAAa,CAAC;AAMrC,MAJI,cACF,eAAe,YAAY,cAAc,SAAS,IAGhD,aAAa,KAAK,cAAc,CAAC,MAAM,QAAQ,aAAa,KAAK,UAAU;AAC7E,UAAM,IAAI,MAAM,8BAA8B;AAKhD,sBAAa,QAAQ,CAAC,GACtB,aAAa,IAAI,iBAAiB,CAAC,GAEnC,UAAU,QAAQ,CAAC,GACnB,UAAU,IAAI,iBAAiB,CAAC,GAEhC,aAAa,IAAI,aAAa,KAAK;AAAA,IACjC,GAAG,cAAe,aAAa,KAAK,cAA2B,CAAC,CAAC;AAAA,IACjE,GAAI,aAAa,KAAK,aAAa,WAAW,CAAC;AAAA,IAC/C,GAAI,UAAU,KAAK,aAAa,WAAW,CAAC;AAAA,IAC5C,GAAG,cAAc,UAAU,KAAK,cAAc,CAAC,CAAC;AAAA,IAChD,GAAG,aAAa;AAAA,IAChB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,CAAC,GAED,aAAa,IAAI,aAAa,UAAU,KAAK;AAAA,IAC3C,GAAI,aAAa,KAAK,aAAa,WAAW,CAAC;AAAA,IAC/C,GAAI,UAAU,KAAK,aAAa,WAAW,CAAC;AAAA,IAC5C,GAAG,aAAa;AAAA,EAClB,CAAC,GAED,aAAa,IAAI,aAAa,UAAU,KAAK;AAAA,IAC3C,GAAI,aAAa,KAAK,aAAa,WAAW,CAAC;AAAA,IAC/C,GAAI,UAAU,KAAK,aAAa,WAAW,CAAC;AAAA,IAC5C,GAAG,aAAa;AAAA,EAClB,CAAC,GAED,aAAa,IAAI,aAAa,eAAe,KAAK;AAAA,IAChD,GAAI,aAAa,KAAK,aAAa,gBAAgB,CAAC;AAAA,IACpD,GAAI,UAAU,KAAK,aAAa,gBAAgB,CAAC;AAAA,IACjD,GAAG,aAAa;AAAA,EAClB,CAAC,GAED,aAAa,IAAI,aAAa,iBAAiB;AAAA,IAC7C,GAAI,aAAa,KAAK,aAAa,kBAAkB,CAAC;AAAA,IACtD,GAAI,UAAU,KAAK,aAAa,kBAAkB,CAAC;AAAA,IACnD,GAAG,aAAa;AAAA,EAClB,GAGI,QAAQ,IAAI,UACd,QAAQ,MAAM,kBAAkB,KAAK,UAAU,WAAW,MAAM,CAAC,CAAC,GAClE,QAAQ,MAAM,oBAAoB,KAAK,UAAU,cAAc,MAAM,CAAC,CAAC,IAGzE,eAAe;AAAA,IACb,GAAG;AAAA,IACH,SAAS,CAAC,GAAG,aAAa,OAAQ;AAAA,EACpC,GAEO;AACT;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -7,43 +7,43 @@ import { reactNativeHMRPlugin } from "../plugins/reactNativeHMRPlugin.mjs";
|
|
|
7
7
|
async function getViteServerConfig(config) {
|
|
8
8
|
const {
|
|
9
9
|
root,
|
|
10
|
-
host
|
|
11
|
-
webConfig
|
|
10
|
+
host
|
|
12
11
|
} = config,
|
|
13
12
|
{
|
|
14
13
|
optimizeDeps
|
|
15
14
|
} = getOptimizeDeps("serve");
|
|
16
15
|
let serverConfig = mergeConfig(getBaseViteConfig({
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
},
|
|
31
|
-
server: {
|
|
32
|
-
hmr: {
|
|
33
|
-
path: "/__vxrnhmr"
|
|
16
|
+
mode: "development"
|
|
17
|
+
}), {
|
|
18
|
+
root,
|
|
19
|
+
clearScreen: !1,
|
|
20
|
+
plugins: [reactNativeHMRPlugin(config), {
|
|
21
|
+
name: "process-env-ssr",
|
|
22
|
+
transform(code, id, options) {
|
|
23
|
+
if (!id.includes("node_modules") && code.includes("process.env.TAMAGUI_IS_SERVER")) return code.replaceAll("process.env.TAMAGUI_IS_SERVER", `${!!options?.ssr}`);
|
|
24
|
+
}
|
|
25
|
+
}],
|
|
26
|
+
optimizeDeps,
|
|
27
|
+
ssr: {
|
|
28
|
+
optimizeDeps
|
|
34
29
|
},
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
30
|
+
server: {
|
|
31
|
+
hmr: {
|
|
32
|
+
path: "/__vxrnhmr"
|
|
33
|
+
},
|
|
34
|
+
cors: !0,
|
|
35
|
+
host
|
|
36
|
+
}
|
|
37
|
+
}),
|
|
38
|
+
webConfig = config.webConfig || {};
|
|
39
39
|
if (webConfig && (serverConfig = mergeConfig(serverConfig, webConfig)), serverConfig.ssr?.noExternal && !Array.isArray(serverConfig.ssr?.noExternal)) throw new Error("ssr.noExternal must be array");
|
|
40
|
-
return serverConfig.ssr ||= {}, serverConfig.ssr.noExternal = [...coerceToArray(serverConfig.ssr?.noExternal || []), ...optimizeDeps.include, "react", "react-dom", "react-dom/server", "react-dom/client"], serverConfig.ssr.optimizeDeps =
|
|
40
|
+
return serverConfig.ssr ||= {}, serverConfig.ssr.optimizeDeps ||= {}, webConfig.ssr ||= {}, webConfig.ssr.optimizeDeps ||= {}, serverConfig.ssr.noExternal = uniq([...coerceToArray(serverConfig.ssr?.noExternal || []), ...(serverConfig.ssr?.optimizeDeps.include || []), ...(webConfig.ssr?.optimizeDeps.include || []), ...coerceToArray(webConfig.ssr?.noExternal || []), ...optimizeDeps.include, "react", "react-dom", "react-dom/server", "react-dom/client"]), serverConfig.ssr.optimizeDeps.exclude = uniq([...(serverConfig.ssr?.optimizeDeps.exclude || []), ...(webConfig.ssr?.optimizeDeps.exclude || []), ...optimizeDeps.exclude]), serverConfig.ssr.optimizeDeps.include = uniq([...(serverConfig.ssr?.optimizeDeps.include || []), ...(webConfig.ssr?.optimizeDeps.include || []), ...optimizeDeps.include]), serverConfig.ssr.optimizeDeps.needsInterop = uniq([...(serverConfig.ssr?.optimizeDeps.needsInterop || []), ...(webConfig.ssr?.optimizeDeps.needsInterop || []), ...optimizeDeps.needsInterop]), serverConfig.ssr.optimizeDeps.esbuildOptions = {
|
|
41
41
|
...(serverConfig.ssr?.optimizeDeps.esbuildOptions || {}),
|
|
42
|
+
...(webConfig.ssr?.optimizeDeps.esbuildOptions || {}),
|
|
42
43
|
...optimizeDeps.esbuildOptions
|
|
43
|
-
}, process.env.DEBUG && (console.debug("
|
|
44
|
-
`, JSON.stringify(serverConfig.ssr, null, 2))), serverConfig = {
|
|
44
|
+
}, process.env.DEBUG && (console.debug("user config is", JSON.stringify(webConfig, null, 2)), console.debug("server config is", JSON.stringify(serverConfig, null, 2))), serverConfig = {
|
|
45
45
|
...serverConfig,
|
|
46
46
|
plugins: [...serverConfig.plugins]
|
|
47
|
-
},
|
|
47
|
+
}, serverConfig;
|
|
48
48
|
}
|
|
49
49
|
export { getViteServerConfig };
|
|
@@ -189,9 +189,9 @@ function getViteServerConfig(config) {
|
|
|
189
189
|
}
|
|
190
190
|
function _getViteServerConfig() {
|
|
191
191
|
return _getViteServerConfig = _async_to_generator(function(config) {
|
|
192
|
-
var _serverConfig_ssr, _serverConfig_ssr1, _serverConfig_ssr2, _serverConfig_ssr3, _serverConfig_ssr4, _serverConfig_ssr5, _serverConfig_ssr6, _serverConfig, root, host,
|
|
192
|
+
var _serverConfig_ssr, _serverConfig_ssr1, _serverConfig_ssr2, _serverConfig_ssr3, _webConfig_ssr, _webConfig_ssr1, _serverConfig_ssr4, _webConfig_ssr2, _serverConfig_ssr5, _webConfig_ssr3, _serverConfig_ssr6, _webConfig_ssr4, _serverConfig_ssr7, _webConfig_ssr5, _serverConfig, _serverConfig_ssr8, _webConfig, _webConfig_ssr6, root, host, optimizeDeps, serverConfig, webConfig;
|
|
193
193
|
return _ts_generator(this, function(_state) {
|
|
194
|
-
if (root = config.root, host = config.host,
|
|
194
|
+
if (root = config.root, host = config.host, optimizeDeps = getOptimizeDeps("serve").optimizeDeps, serverConfig = mergeConfig(getBaseViteConfig({
|
|
195
195
|
mode: "development"
|
|
196
196
|
}), {
|
|
197
197
|
root,
|
|
@@ -217,17 +217,16 @@ function _getViteServerConfig() {
|
|
|
217
217
|
cors: !0,
|
|
218
218
|
host
|
|
219
219
|
}
|
|
220
|
-
}), webConfig && (serverConfig = mergeConfig(serverConfig, webConfig)), !((_serverConfig_ssr = serverConfig.ssr) === null || _serverConfig_ssr === void 0) && _serverConfig_ssr.noExternal && !Array.isArray((_serverConfig_ssr1 = serverConfig.ssr) === null || _serverConfig_ssr1 === void 0 ? void 0 : _serverConfig_ssr1.noExternal))
|
|
220
|
+
}), webConfig = config.webConfig || {}, webConfig && (serverConfig = mergeConfig(serverConfig, webConfig)), !((_serverConfig_ssr = serverConfig.ssr) === null || _serverConfig_ssr === void 0) && _serverConfig_ssr.noExternal && !Array.isArray((_serverConfig_ssr1 = serverConfig.ssr) === null || _serverConfig_ssr1 === void 0 ? void 0 : _serverConfig_ssr1.noExternal))
|
|
221
221
|
throw new Error("ssr.noExternal must be array");
|
|
222
|
-
return (_serverConfig = serverConfig).ssr || (_serverConfig.ssr = {}), serverConfig.ssr.noExternal = _to_consumable_array(coerceToArray(((_serverConfig_ssr2 = serverConfig.ssr) === null || _serverConfig_ssr2 === void 0 ? void 0 : _serverConfig_ssr2.noExternal) || [])).concat(_to_consumable_array(optimizeDeps.include), [
|
|
222
|
+
return (_serverConfig = serverConfig).ssr || (_serverConfig.ssr = {}), (_serverConfig_ssr8 = serverConfig.ssr).optimizeDeps || (_serverConfig_ssr8.optimizeDeps = {}), (_webConfig = webConfig).ssr || (_webConfig.ssr = {}), (_webConfig_ssr6 = webConfig.ssr).optimizeDeps || (_webConfig_ssr6.optimizeDeps = {}), serverConfig.ssr.noExternal = uniq(_to_consumable_array(coerceToArray(((_serverConfig_ssr2 = serverConfig.ssr) === null || _serverConfig_ssr2 === void 0 ? void 0 : _serverConfig_ssr2.noExternal) || [])).concat(_to_consumable_array(((_serverConfig_ssr3 = serverConfig.ssr) === null || _serverConfig_ssr3 === void 0 ? void 0 : _serverConfig_ssr3.optimizeDeps.include) || []), _to_consumable_array(((_webConfig_ssr = webConfig.ssr) === null || _webConfig_ssr === void 0 ? void 0 : _webConfig_ssr.optimizeDeps.include) || []), _to_consumable_array(coerceToArray(((_webConfig_ssr1 = webConfig.ssr) === null || _webConfig_ssr1 === void 0 ? void 0 : _webConfig_ssr1.noExternal) || [])), _to_consumable_array(optimizeDeps.include), [
|
|
223
223
|
"react",
|
|
224
224
|
"react-dom",
|
|
225
225
|
"react-dom/server",
|
|
226
226
|
"react-dom/client"
|
|
227
|
-
]), serverConfig.ssr.optimizeDeps =
|
|
228
|
-
`, JSON.stringify(serverConfig.ssr, null, 2))), serverConfig = _object_spread_props(_object_spread({}, serverConfig), {
|
|
227
|
+
])), serverConfig.ssr.optimizeDeps.exclude = uniq(_to_consumable_array(((_serverConfig_ssr4 = serverConfig.ssr) === null || _serverConfig_ssr4 === void 0 ? void 0 : _serverConfig_ssr4.optimizeDeps.exclude) || []).concat(_to_consumable_array(((_webConfig_ssr2 = webConfig.ssr) === null || _webConfig_ssr2 === void 0 ? void 0 : _webConfig_ssr2.optimizeDeps.exclude) || []), _to_consumable_array(optimizeDeps.exclude))), serverConfig.ssr.optimizeDeps.include = uniq(_to_consumable_array(((_serverConfig_ssr5 = serverConfig.ssr) === null || _serverConfig_ssr5 === void 0 ? void 0 : _serverConfig_ssr5.optimizeDeps.include) || []).concat(_to_consumable_array(((_webConfig_ssr3 = webConfig.ssr) === null || _webConfig_ssr3 === void 0 ? void 0 : _webConfig_ssr3.optimizeDeps.include) || []), _to_consumable_array(optimizeDeps.include))), serverConfig.ssr.optimizeDeps.needsInterop = uniq(_to_consumable_array(((_serverConfig_ssr6 = serverConfig.ssr) === null || _serverConfig_ssr6 === void 0 ? void 0 : _serverConfig_ssr6.optimizeDeps.needsInterop) || []).concat(_to_consumable_array(((_webConfig_ssr4 = webConfig.ssr) === null || _webConfig_ssr4 === void 0 ? void 0 : _webConfig_ssr4.optimizeDeps.needsInterop) || []), _to_consumable_array(optimizeDeps.needsInterop))), serverConfig.ssr.optimizeDeps.esbuildOptions = _object_spread({}, ((_serverConfig_ssr7 = serverConfig.ssr) === null || _serverConfig_ssr7 === void 0 ? void 0 : _serverConfig_ssr7.optimizeDeps.esbuildOptions) || {}, ((_webConfig_ssr5 = webConfig.ssr) === null || _webConfig_ssr5 === void 0 ? void 0 : _webConfig_ssr5.optimizeDeps.esbuildOptions) || {}, optimizeDeps.esbuildOptions), process.env.DEBUG && (console.debug("user config is", JSON.stringify(webConfig, null, 2)), console.debug("server config is", JSON.stringify(serverConfig, null, 2))), serverConfig = _object_spread_props(_object_spread({}, serverConfig), {
|
|
229
228
|
plugins: _to_consumable_array(serverConfig.plugins)
|
|
230
|
-
}),
|
|
229
|
+
}), [
|
|
231
230
|
2,
|
|
232
231
|
serverConfig
|
|
233
232
|
];
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/utils/Users/n8/vxrn/packages/vxrn/src/utils/getViteServerConfig.ts"],
|
|
4
|
-
"mappings": "AAAA,SAASA,mBAAuD;AAChE,SAASC,yBAAyB;AAElC,SAASC,uBAAuB;AAChC,SAASC,YAAY;AACrB,SAASC,qBAAqB;AAC9B,SAASC,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAErC,SAAsBC,oBAAoBC,QAAwB;SAA5CD,qBAAAA,MAAAA,MAAAA,SAAAA;;SAAAA,uBAAAA;AAAAA,gCAAf,oBAAA,SAAmCC,QAAwB;
|
|
5
|
-
"names": ["mergeConfig", "getBaseViteConfig", "getOptimizeDeps", "uniq", "coerceToArray", "reactNativeHMRPlugin", "getViteServerConfig", "config", "serverConfig", "
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["mergeConfig", "getBaseViteConfig", "getOptimizeDeps", "uniq", "coerceToArray", "reactNativeHMRPlugin", "getViteServerConfig", "config", "serverConfig", "webConfig", "root", "host", "optimizeDeps", "mode", "clearScreen", "plugins", "name", "transform", "code", "id", "options", "includes", "replaceAll", "ssr", "server", "hmr", "path", "cors", "noExternal", "Array", "isArray", "Error", "include", "exclude", "needsInterop", "esbuildOptions", "process", "env", "DEBUG", "console", "debug", "JSON", "stringify"]
|
|
6
6
|
}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { readFile } from "node:fs/promises";
|
|
2
|
-
import { dirname, join, resolve } from "node:path";
|
|
3
1
|
import { buildReact, buildReactJSX, buildReactNative } from "@vxrn/react-native-prebuilt";
|
|
4
|
-
import { resolveFile } from "./resolveFile";
|
|
5
2
|
import FSExtra from "fs-extra";
|
|
3
|
+
import { readFile } from "node:fs/promises";
|
|
4
|
+
import { dirname, join, resolve } from "node:path";
|
|
6
5
|
import { isBuildingNativeBundle } from "./isBuildingNativeBundle";
|
|
6
|
+
import { resolveFile } from "./resolveFile";
|
|
7
7
|
async function swapPrebuiltReactModules(cacheDir) {
|
|
8
8
|
const prebuilds = {
|
|
9
9
|
reactJSX: join(cacheDir, "react-jsx-runtime.js"),
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/utils/swapPrebuiltReactModules.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,gBAAgB;AACzB,SAAS,SAAS,MAAM,eAAe;
|
|
4
|
+
"mappings": "AAAA,SAAS,YAAY,eAAe,wBAAwB;AAC5D,OAAO,aAAa;AACpB,SAAS,gBAAgB;AACzB,SAAS,SAAS,MAAM,eAAe;AAEvC,SAAS,8BAA8B;AACvC,SAAS,mBAAmB;AAK5B,eAAsB,yBAAyB,UAAmC;AAChF,QAAM,YAAY;AAAA,IAChB,UAAU,KAAK,UAAU,sBAAsB;AAAA,IAC/C,OAAO,KAAK,UAAU,UAAU;AAAA,IAChC,aAAa,KAAK,UAAU,iBAAiB;AAAA,EAC/C;AAEA,EAAM,MAAM,QAAQ,WAAW,UAAU,WAAW,MAClD,QAAQ,KAAK,uEAAuE,GACpF,MAAM,QAAQ,IAAI;AAAA,IAChB,iBAAiB;AAAA,MACf,aAAa,CAAC,YAAY,cAAc,CAAC;AAAA,MACzC,SAAS,UAAU;AAAA,IACrB,CAAC;AAAA,IACD,WAAW;AAAA,MACT,aAAa,CAAC,YAAY,OAAO,CAAC;AAAA,MAClC,SAAS,UAAU;AAAA,IACrB,CAAC;AAAA,IACD,cAAc;AAAA,MACZ,aAAa,CAAC,YAAY,uBAAuB,CAAC;AAAA,MAClD,SAAS,UAAU;AAAA,IACrB,CAAC;AAAA,EACH,CAAC;AAIH,QAAM,aAAa;AAAA;AAAA,IAEjB,OAAO,UAAU;AAAA,IACjB,UAAU,MAAM,SAAS,UAAU,UAAU,OAAO;AAAA,EACtD,GAEM,iBAAiB;AAAA,IACrB,gBAAgB;AAAA;AAAA,MAEd,OAAO,UAAU;AAAA,MACjB,UAAU,MAAM,SAAS,UAAU,aAAa,OAAO;AAAA,IACzD;AAAA,IACA,OAAO;AAAA;AAAA,MAEL,OAAO,UAAU;AAAA,MACjB,UAAU,MAAM,SAAS,UAAU,OAAO,OAAO;AAAA,IACnD;AAAA,IACA,qBAAqB;AAAA,IACrB,yBAAyB;AAAA,EAC3B;AAEA,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,IAET,UAAU,IAAI,WAAW,IAAI;AAC3B,UAAI,GAAG,WAAW,wBAAwB;AACxC,eAAO,wBAAwB,EAAE;AAInC,UAAI,OAAO;AACT,eAAO,UAAU;AAGnB,iBAAW,YAAY;AACrB,YAAI,OAAO,YAAY,GAAG,SAAS,gBAAgB,QAAQ,GAAG;AAG5D,iBAFa,eAAe,QAAQ,EAExB;AAQhB,UAAI,0BACE,GAAG,CAAC,MAAM,KAAK;AACjB,cAAM,eAAe,QAAQ,QAAQ,QAAQ,GAAG,EAAE,GAC5C,aAAa,aAAa,QAAQ,WAAW,YAAY;AAC/D,YAAI,eAAe;AAAI;AACvB,YAAI;AACF,gBAAM,gBAAgB,eAAe,oBAC/B,yBAAyB,eAAe;AAC9C,cAAI,QAAQ,eAAe,aAAa;AACtC,mBAAO;AAET,cAAI,QAAQ,eAAe,sBAAsB;AAC/C,mBAAO;AAET,cAAI,QAAQ,eAAe,UAAU;AACnC,mBAAO;AAAA,QAEX,SAAS,KAAK;AACZ,kBAAQ,KAAK,uBAAuB,GAAG;AAAA,QACzC;AAAA,MACF;AAAA,IAEJ;AAAA,IAEA,KAAK,IAAI;AACP,UAAI,GAAG,WAAW,sBAAsB;AAKtC,eAHU,mCADI,GAAG,QAAQ,yBAAyB,EAAE,CACF;AAAA;AAAA;AAMpD,iBAAW,YAAY,gBAAgB;AACrC,cAAM,OAAO,eAAe,QAAuC;AACnE,YAAI,OAAO,KAAK;AACd,iBAAO,KAAK;AAAA,MAEhB;AAAA,IACF;AAAA,EACF;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { readFile } from "node:fs/promises";
|
|
2
|
-
import { dirname, join, resolve } from "node:path";
|
|
3
1
|
import { buildReact, buildReactJSX, buildReactNative } from "@vxrn/react-native-prebuilt";
|
|
4
|
-
import { resolveFile } from "./resolveFile.mjs";
|
|
5
2
|
import FSExtra from "fs-extra";
|
|
3
|
+
import { readFile } from "node:fs/promises";
|
|
4
|
+
import { dirname, join, resolve } from "node:path";
|
|
6
5
|
import { isBuildingNativeBundle } from "./isBuildingNativeBundle.mjs";
|
|
6
|
+
import { resolveFile } from "./resolveFile.mjs";
|
|
7
7
|
async function swapPrebuiltReactModules(cacheDir) {
|
|
8
8
|
const prebuilds = {
|
|
9
9
|
reactJSX: join(cacheDir, "react-jsx-runtime.js"),
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { readFile } from "node:fs/promises";
|
|
2
|
-
import { dirname, join, resolve } from "node:path";
|
|
3
1
|
import { buildReact, buildReactJSX, buildReactNative } from "@vxrn/react-native-prebuilt";
|
|
4
|
-
import { resolveFile } from "./resolveFile";
|
|
5
2
|
import FSExtra from "fs-extra";
|
|
3
|
+
import { readFile } from "node:fs/promises";
|
|
4
|
+
import { dirname, join, resolve } from "node:path";
|
|
6
5
|
import { isBuildingNativeBundle } from "./isBuildingNativeBundle";
|
|
6
|
+
import { resolveFile } from "./resolveFile";
|
|
7
7
|
function asyncGeneratorStep(gen, resolve2, reject, _next, _throw, key, arg) {
|
|
8
8
|
try {
|
|
9
9
|
var info = gen[key](arg), value = info.value;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/utils/Users/n8/vxrn/packages/vxrn/src/utils/swapPrebuiltReactModules.ts"],
|
|
4
|
-
"mappings": "AAAA,SAASA,gBAAgB;AACzB,SAASC,SAASC,MAAMC,eAAe;
|
|
5
|
-
"names": ["
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["buildReact", "buildReactJSX", "buildReactNative", "FSExtra", "readFile", "dirname", "join", "resolve", "isBuildingNativeBundle", "resolveFile", "swapPrebuiltReactModules", "cacheDir", "prebuilds", "jsxRuntime", "virtualModules", "reactJSX", "react", "reactNative", "pathExists", "console", "info", "Promise", "all", "entryPoints", "outfile", "alias", "contents", "name", "enforce", "resolveId", "id", "importer", "startsWith", "targetId", "includes", "absolutePath", "nativePath", "replace", "directoryPath", "directoryNonNativePath", "pathExistsSync", "err", "warn", "load", "idOut", "out"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "vxrn",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.53",
|
|
4
4
|
"source": "src/index.ts",
|
|
5
5
|
"types": "./types/index.d.ts",
|
|
6
6
|
"type": "module",
|
|
@@ -29,13 +29,13 @@
|
|
|
29
29
|
"@babel/code-frame": "^7.21.4",
|
|
30
30
|
"@vitejs/plugin-react": "^4.2.1",
|
|
31
31
|
"@vitejs/plugin-react-swc": "^3.6.0",
|
|
32
|
-
"@vxrn/react-native-prebuilt": "0.1.
|
|
33
|
-
"@vxrn/router": "0.1.
|
|
34
|
-
"@vxrn/safe-area": "0.1.
|
|
35
|
-
"@vxrn/vite-flow": "0.1.
|
|
36
|
-
"@vxrn/vite-native-client": "0.1.
|
|
37
|
-
"@vxrn/vite-native-hmr": "0.1.
|
|
38
|
-
"@vxrn/vite-native-swc": "0.1.
|
|
32
|
+
"@vxrn/react-native-prebuilt": "0.1.53",
|
|
33
|
+
"@vxrn/router": "0.1.53",
|
|
34
|
+
"@vxrn/safe-area": "0.1.53",
|
|
35
|
+
"@vxrn/vite-flow": "0.1.53",
|
|
36
|
+
"@vxrn/vite-native-client": "0.1.53",
|
|
37
|
+
"@vxrn/vite-native-hmr": "0.1.53",
|
|
38
|
+
"@vxrn/vite-native-swc": "0.1.53",
|
|
39
39
|
"citty": "^0.1.6",
|
|
40
40
|
"crossws": "^0.2.4",
|
|
41
41
|
"es-module-lexer": "^1.3.0",
|
|
@@ -60,7 +60,7 @@
|
|
|
60
60
|
"sirv": "^2.0.4",
|
|
61
61
|
"source-map": "^0.7.3",
|
|
62
62
|
"url": "^0.11.0",
|
|
63
|
-
"vite": "
|
|
63
|
+
"vite": "alpha",
|
|
64
64
|
"ws": "^8.7.0"
|
|
65
65
|
},
|
|
66
66
|
"devDependencies": {
|
|
@@ -7,7 +7,7 @@ import { coerceToArray } from './coerceToArray'
|
|
|
7
7
|
import { reactNativeHMRPlugin } from '../plugins/reactNativeHMRPlugin'
|
|
8
8
|
|
|
9
9
|
export async function getViteServerConfig(config: VXRNConfigFilled) {
|
|
10
|
-
const { root, host
|
|
10
|
+
const { root, host } = config
|
|
11
11
|
const { optimizeDeps } = getOptimizeDeps('serve')
|
|
12
12
|
|
|
13
13
|
let serverConfig: UserConfig = mergeConfig(
|
|
@@ -47,6 +47,8 @@ export async function getViteServerConfig(config: VXRNConfigFilled) {
|
|
|
47
47
|
} satisfies UserConfig
|
|
48
48
|
) satisfies InlineConfig
|
|
49
49
|
|
|
50
|
+
let webConfig = config.webConfig || {}
|
|
51
|
+
|
|
50
52
|
if (webConfig) {
|
|
51
53
|
serverConfig = mergeConfig(serverConfig, webConfig) as any
|
|
52
54
|
}
|
|
@@ -56,41 +58,53 @@ export async function getViteServerConfig(config: VXRNConfigFilled) {
|
|
|
56
58
|
}
|
|
57
59
|
|
|
58
60
|
// vite doesnt merge arrays but we want that
|
|
61
|
+
|
|
59
62
|
serverConfig.ssr ||= {}
|
|
60
|
-
serverConfig.ssr.
|
|
63
|
+
serverConfig.ssr.optimizeDeps ||= {}
|
|
64
|
+
|
|
65
|
+
webConfig.ssr ||= {}
|
|
66
|
+
webConfig.ssr.optimizeDeps ||= {}
|
|
67
|
+
|
|
68
|
+
serverConfig.ssr.noExternal = uniq([
|
|
61
69
|
...coerceToArray((serverConfig.ssr?.noExternal as string[]) || []),
|
|
70
|
+
...(serverConfig.ssr?.optimizeDeps.include || []),
|
|
71
|
+
...(webConfig.ssr?.optimizeDeps.include || []),
|
|
72
|
+
...coerceToArray(webConfig.ssr?.noExternal || []),
|
|
62
73
|
...optimizeDeps.include,
|
|
63
74
|
'react',
|
|
64
75
|
'react-dom',
|
|
65
76
|
'react-dom/server',
|
|
66
77
|
'react-dom/client',
|
|
67
|
-
]
|
|
78
|
+
])
|
|
68
79
|
|
|
69
|
-
serverConfig.ssr.optimizeDeps = {}
|
|
70
80
|
serverConfig.ssr.optimizeDeps.exclude = uniq([
|
|
71
81
|
...(serverConfig.ssr?.optimizeDeps.exclude || []),
|
|
82
|
+
...(webConfig.ssr?.optimizeDeps.exclude || []),
|
|
72
83
|
...optimizeDeps.exclude,
|
|
73
84
|
])
|
|
74
85
|
|
|
75
86
|
serverConfig.ssr.optimizeDeps.include = uniq([
|
|
76
87
|
...(serverConfig.ssr?.optimizeDeps.include || []),
|
|
88
|
+
...(webConfig.ssr?.optimizeDeps.include || []),
|
|
77
89
|
...optimizeDeps.include,
|
|
78
90
|
])
|
|
79
91
|
|
|
80
92
|
serverConfig.ssr.optimizeDeps.needsInterop = uniq([
|
|
81
93
|
...(serverConfig.ssr?.optimizeDeps.needsInterop || []),
|
|
94
|
+
...(webConfig.ssr?.optimizeDeps.needsInterop || []),
|
|
82
95
|
...optimizeDeps.needsInterop,
|
|
83
96
|
])
|
|
84
97
|
|
|
85
98
|
serverConfig.ssr.optimizeDeps.esbuildOptions = {
|
|
86
99
|
...(serverConfig.ssr?.optimizeDeps.esbuildOptions || {}),
|
|
100
|
+
...(webConfig.ssr?.optimizeDeps.esbuildOptions || {}),
|
|
87
101
|
...optimizeDeps.esbuildOptions,
|
|
88
102
|
}
|
|
89
103
|
|
|
90
104
|
// manually merge
|
|
91
105
|
if (process.env.DEBUG) {
|
|
92
|
-
console.debug('
|
|
93
|
-
console.debug('server
|
|
106
|
+
console.debug('user config is', JSON.stringify(webConfig, null, 2))
|
|
107
|
+
console.debug('server config is', JSON.stringify(serverConfig, null, 2))
|
|
94
108
|
}
|
|
95
109
|
|
|
96
110
|
serverConfig = {
|
|
@@ -98,7 +112,5 @@ export async function getViteServerConfig(config: VXRNConfigFilled) {
|
|
|
98
112
|
plugins: [...serverConfig.plugins!],
|
|
99
113
|
}
|
|
100
114
|
|
|
101
|
-
console.log(`final server config ssr`, serverConfig.ssr)
|
|
102
|
-
|
|
103
115
|
return serverConfig
|
|
104
116
|
}
|
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
import { readFile } from 'node:fs/promises'
|
|
2
|
-
import { dirname, join, resolve } from 'node:path'
|
|
3
1
|
import { buildReact, buildReactJSX, buildReactNative } from '@vxrn/react-native-prebuilt'
|
|
4
|
-
import type { PluginOption } from 'vite'
|
|
5
|
-
import { resolveFile } from './resolveFile'
|
|
6
2
|
import FSExtra from 'fs-extra'
|
|
3
|
+
import { readFile } from 'node:fs/promises'
|
|
4
|
+
import { dirname, join, resolve } from 'node:path'
|
|
5
|
+
import type { Plugin } from 'vite'
|
|
7
6
|
import { isBuildingNativeBundle } from './isBuildingNativeBundle'
|
|
7
|
+
import { resolveFile } from './resolveFile'
|
|
8
8
|
|
|
9
9
|
// we should just detect or whitelist and use flow to convert instead of this but i did a
|
|
10
10
|
// few things to the prebuilts to make them work, we may need to account for
|
|
11
11
|
|
|
12
|
-
export async function swapPrebuiltReactModules(cacheDir: string) {
|
|
12
|
+
export async function swapPrebuiltReactModules(cacheDir: string): Promise<Plugin> {
|
|
13
13
|
const prebuilds = {
|
|
14
14
|
reactJSX: join(cacheDir, 'react-jsx-runtime.js'),
|
|
15
15
|
react: join(cacheDir, 'react.js'),
|
|
@@ -122,5 +122,5 @@ export async function swapPrebuiltReactModules(cacheDir: string) {
|
|
|
122
122
|
}
|
|
123
123
|
}
|
|
124
124
|
},
|
|
125
|
-
} satisfies
|
|
125
|
+
} satisfies Plugin
|
|
126
126
|
}
|
|
@@ -1,7 +1,3 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
enforce: "pre";
|
|
4
|
-
resolveId(this: import("rollup").PluginContext, id: string, importer?: string | undefined): any;
|
|
5
|
-
load(this: import("rollup").PluginContext, id: string): string | undefined;
|
|
6
|
-
}>;
|
|
1
|
+
import type { Plugin } from 'vite';
|
|
2
|
+
export declare function swapPrebuiltReactModules(cacheDir: string): Promise<Plugin>;
|
|
7
3
|
//# sourceMappingURL=swapPrebuiltReactModules.d.ts.map
|