vxrn 1.14.4 → 1.15.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.
- package/dist/cli.mjs +263 -248
- package/dist/cli.mjs.map +1 -1
- package/dist/cli.native.js +267 -252
- package/dist/cli.native.js.map +1 -1
- package/dist/config/getAdditionalViteConfig.mjs +8 -8
- package/dist/config/getAdditionalViteConfig.mjs.map +1 -1
- package/dist/config/getAdditionalViteConfig.native.js +8 -8
- package/dist/config/getAdditionalViteConfig.native.js.map +1 -1
- package/dist/config/getBaseViteConfigOnly.mjs +14 -12
- package/dist/config/getBaseViteConfigOnly.mjs.map +1 -1
- package/dist/config/getBaseViteConfigOnly.native.js +16 -14
- package/dist/config/getBaseViteConfigOnly.native.js.map +1 -1
- package/dist/config/getBaseVitePlugins.mjs +34 -19
- package/dist/config/getBaseVitePlugins.mjs.map +1 -1
- package/dist/config/getBaseVitePlugins.native.js +47 -32
- package/dist/config/getBaseVitePlugins.native.js.map +1 -1
- package/dist/config/getOptimizeDeps.mjs +12 -9
- package/dist/config/getOptimizeDeps.mjs.map +1 -1
- package/dist/config/getOptimizeDeps.native.js +12 -9
- package/dist/config/getOptimizeDeps.native.js.map +1 -1
- package/dist/config/getOptionsFilled.mjs +47 -41
- package/dist/config/getOptionsFilled.mjs.map +1 -1
- package/dist/config/getOptionsFilled.native.js +53 -50
- package/dist/config/getOptionsFilled.native.js.map +1 -1
- package/dist/config/getReactNativePlugins.mjs +5 -2
- package/dist/config/getReactNativePlugins.mjs.map +1 -1
- package/dist/config/getReactNativePlugins.native.js +8 -5
- package/dist/config/getReactNativePlugins.native.js.map +1 -1
- package/dist/config/getServerOptionsFilled.mjs +21 -14
- package/dist/config/getServerOptionsFilled.mjs.map +1 -1
- package/dist/config/getServerOptionsFilled.native.js +25 -21
- package/dist/config/getServerOptionsFilled.native.js.map +1 -1
- package/dist/config/getViteServerConfig.mjs +25 -16
- package/dist/config/getViteServerConfig.mjs.map +1 -1
- package/dist/config/getViteServerConfig.native.js +37 -28
- package/dist/config/getViteServerConfig.native.js.map +1 -1
- package/dist/config/mergeUserConfig.mjs +25 -7
- package/dist/config/mergeUserConfig.mjs.map +1 -1
- package/dist/config/mergeUserConfig.native.js +32 -14
- package/dist/config/mergeUserConfig.native.js.map +1 -1
- package/dist/config/mergeUserConfig.test.mjs +53 -26
- package/dist/config/mergeUserConfig.test.mjs.map +1 -1
- package/dist/config/mergeUserConfig.test.native.js +94 -74
- package/dist/config/mergeUserConfig.test.native.js.map +1 -1
- package/dist/constants.mjs +6 -6
- package/dist/constants.mjs.map +1 -1
- package/dist/constants.native.js +6 -6
- package/dist/constants.native.js.map +1 -1
- package/dist/exports/build.mjs +241 -191
- package/dist/exports/build.mjs.map +1 -1
- package/dist/exports/build.native.js +257 -221
- package/dist/exports/build.native.js.map +1 -1
- package/dist/exports/clean.mjs +17 -12
- package/dist/exports/clean.mjs.map +1 -1
- package/dist/exports/clean.native.js +22 -13
- package/dist/exports/clean.native.js.map +1 -1
- package/dist/exports/createServer.mjs +49 -35
- package/dist/exports/createServer.mjs.map +1 -1
- package/dist/exports/createServer.native.js +50 -34
- package/dist/exports/createServer.native.js.map +1 -1
- package/dist/exports/dev.mjs +119 -74
- package/dist/exports/dev.mjs.map +1 -1
- package/dist/exports/dev.native.js +131 -90
- package/dist/exports/dev.native.js.map +1 -1
- package/dist/exports/loadEnv.mjs +28 -19
- package/dist/exports/loadEnv.mjs.map +1 -1
- package/dist/exports/loadEnv.native.js +33 -28
- package/dist/exports/loadEnv.native.js.map +1 -1
- package/dist/exports/patch.mjs +4 -1
- package/dist/exports/patch.mjs.map +1 -1
- package/dist/exports/patch.native.js +4 -1
- package/dist/exports/patch.native.js.map +1 -1
- package/dist/exports/prebuild.mjs +106 -42
- package/dist/exports/prebuild.mjs.map +1 -1
- package/dist/exports/prebuild.native.js +116 -63
- package/dist/exports/prebuild.native.js.map +1 -1
- package/dist/exports/prebuildWithoutExpo.mjs +44 -39
- package/dist/exports/prebuildWithoutExpo.mjs.map +1 -1
- package/dist/exports/prebuildWithoutExpo.native.js +45 -42
- package/dist/exports/prebuildWithoutExpo.native.js.map +1 -1
- package/dist/exports/runAndroid.mjs +8 -5
- package/dist/exports/runAndroid.mjs.map +1 -1
- package/dist/exports/runAndroid.native.js +2 -1
- package/dist/exports/runAndroid.native.js.map +1 -1
- package/dist/exports/runIos.mjs +8 -5
- package/dist/exports/runIos.mjs.map +1 -1
- package/dist/exports/runIos.native.js +2 -1
- package/dist/exports/runIos.native.js.map +1 -1
- package/dist/exports/serve.mjs +14 -6
- package/dist/exports/serve.mjs.map +1 -1
- package/dist/exports/serve.native.js +21 -13
- package/dist/exports/serve.native.js.map +1 -1
- package/dist/exports/serveStaticAssets.mjs +37 -22
- package/dist/exports/serveStaticAssets.mjs.map +1 -1
- package/dist/exports/serveStaticAssets.native.js +65 -41
- package/dist/exports/serveStaticAssets.native.js.map +1 -1
- package/dist/patches/builtInDepPatches.mjs +145 -62
- package/dist/patches/builtInDepPatches.mjs.map +1 -1
- package/dist/patches/builtInDepPatches.native.js +116 -70
- package/dist/patches/builtInDepPatches.native.js.map +1 -1
- package/dist/plugins/autoDepOptimizePlugin.mjs +66 -42
- package/dist/plugins/autoDepOptimizePlugin.mjs.map +1 -1
- package/dist/plugins/autoDepOptimizePlugin.native.js +83 -63
- package/dist/plugins/autoDepOptimizePlugin.native.js.map +1 -1
- package/dist/plugins/autoDepOptimizePlugin.test.mjs +23 -17
- package/dist/plugins/autoDepOptimizePlugin.test.mjs.map +1 -1
- package/dist/plugins/autoDepOptimizePlugin.test.native.js +31 -27
- package/dist/plugins/autoDepOptimizePlugin.test.native.js.map +1 -1
- package/dist/plugins/defaultDepOptimizePlugin.mjs +6 -2
- package/dist/plugins/defaultDepOptimizePlugin.mjs.map +1 -1
- package/dist/plugins/defaultDepOptimizePlugin.native.js +6 -2
- package/dist/plugins/defaultDepOptimizePlugin.native.js.map +1 -1
- package/dist/plugins/expoManifestRequestHandlerPlugin.mjs +80 -36
- package/dist/plugins/expoManifestRequestHandlerPlugin.mjs.map +1 -1
- package/dist/plugins/expoManifestRequestHandlerPlugin.native.js +93 -46
- package/dist/plugins/expoManifestRequestHandlerPlugin.native.js.map +1 -1
- package/dist/plugins/getResolvedConfigSubset.mjs +3 -1
- package/dist/plugins/getResolvedConfigSubset.mjs.map +1 -1
- package/dist/plugins/getResolvedConfigSubset.native.js +3 -1
- package/dist/plugins/getResolvedConfigSubset.native.js.map +1 -1
- package/dist/plugins/reactNativeCommonJsPlugin.mjs +70 -46
- package/dist/plugins/reactNativeCommonJsPlugin.mjs.map +1 -1
- package/dist/plugins/reactNativeCommonJsPlugin.native.js +99 -68
- package/dist/plugins/reactNativeCommonJsPlugin.native.js.map +1 -1
- package/dist/plugins/reactNativeDevAssetPlugin.mjs +41 -27
- package/dist/plugins/reactNativeDevAssetPlugin.mjs.map +1 -1
- package/dist/plugins/reactNativeDevAssetPlugin.native.js +61 -48
- package/dist/plugins/reactNativeDevAssetPlugin.native.js.map +1 -1
- package/dist/plugins/reactNativeDevServer.mjs +126 -83
- package/dist/plugins/reactNativeDevServer.mjs.map +1 -1
- package/dist/plugins/reactNativeDevServer.native.js +156 -107
- package/dist/plugins/reactNativeDevServer.native.js.map +1 -1
- package/dist/plugins/resolveIdScan.test.mjs +22 -17
- package/dist/plugins/resolveIdScan.test.mjs.map +1 -1
- package/dist/plugins/resolveIdScan.test.native.js +25 -21
- package/dist/plugins/resolveIdScan.test.native.js.map +1 -1
- package/dist/plugins/serverExtensions.test.mjs +66 -38
- package/dist/plugins/serverExtensions.test.mjs.map +1 -1
- package/dist/plugins/serverExtensions.test.native.js +63 -49
- package/dist/plugins/serverExtensions.test.native.js.map +1 -1
- package/dist/rn-commands/bundle/buildBundle.mjs +48 -31
- package/dist/rn-commands/bundle/buildBundle.mjs.map +1 -1
- package/dist/rn-commands/bundle/buildBundle.native.js +52 -35
- package/dist/rn-commands/bundle/buildBundle.native.js.map +1 -1
- package/dist/runtime/hmr-client.mjs +59 -39
- package/dist/runtime/hmr-client.mjs.map +1 -1
- package/dist/runtime/hmr-client.native.js +132 -92
- package/dist/runtime/hmr-client.native.js.map +1 -1
- package/dist/runtime/hmr-runtime.mjs +65 -29
- package/dist/runtime/hmr-runtime.mjs.map +1 -1
- package/dist/runtime/hmr-runtime.native.js +361 -268
- package/dist/runtime/hmr-runtime.native.js.map +1 -1
- package/dist/runtime/react-refresh-utils.mjs +19 -9
- package/dist/runtime/react-refresh-utils.mjs.map +1 -1
- package/dist/runtime/react-refresh-utils.native.js +20 -10
- package/dist/runtime/react-refresh-utils.native.js.map +1 -1
- package/dist/serve/node.mjs +33 -19
- package/dist/serve/node.mjs.map +1 -1
- package/dist/serve/node.native.js +57 -39
- package/dist/serve/node.native.js.map +1 -1
- package/dist/user-interface/index.mjs +114 -61
- package/dist/user-interface/index.mjs.map +1 -1
- package/dist/user-interface/index.native.js +158 -111
- package/dist/user-interface/index.native.js.map +1 -1
- package/dist/utils/assert.mjs +6 -2
- package/dist/utils/assert.mjs.map +1 -1
- package/dist/utils/assert.native.js +12 -4
- package/dist/utils/assert.native.js.map +1 -1
- package/dist/utils/bindKeypressInput.mjs +38 -23
- package/dist/utils/bindKeypressInput.mjs.map +1 -1
- package/dist/utils/bindKeypressInput.native.js +38 -23
- package/dist/utils/bindKeypressInput.native.js.map +1 -1
- package/dist/utils/createNativeDevEngine.mjs +421 -319
- package/dist/utils/createNativeDevEngine.mjs.map +1 -1
- package/dist/utils/createNativeDevEngine.native.js +529 -425
- package/dist/utils/createNativeDevEngine.native.js.map +1 -1
- package/dist/utils/execSync.mjs +6 -4
- package/dist/utils/execSync.mjs.map +1 -1
- package/dist/utils/execSync.native.js.map +1 -1
- package/dist/utils/expoRun.mjs +5 -3
- package/dist/utils/expoRun.mjs.map +1 -1
- package/dist/utils/expoRun.native.js +13 -13
- package/dist/utils/expoRun.native.js.map +1 -1
- package/dist/utils/filterViteServerResolvedUrls.mjs +17 -5
- package/dist/utils/filterViteServerResolvedUrls.mjs.map +1 -1
- package/dist/utils/filterViteServerResolvedUrls.native.js +41 -23
- package/dist/utils/filterViteServerResolvedUrls.native.js.map +1 -1
- package/dist/utils/getServerEntry.mjs +6 -4
- package/dist/utils/getServerEntry.mjs.map +1 -1
- package/dist/utils/getServerEntry.native.js +9 -9
- package/dist/utils/getServerEntry.native.js.map +1 -1
- package/dist/utils/getVitePath.mjs +41 -17
- package/dist/utils/getVitePath.mjs.map +1 -1
- package/dist/utils/getVitePath.native.js +38 -16
- package/dist/utils/getVitePath.native.js.map +1 -1
- package/dist/utils/patches.mjs +143 -73
- package/dist/utils/patches.mjs.map +1 -1
- package/dist/utils/patches.native.js +299 -188
- package/dist/utils/patches.native.js.map +1 -1
- package/dist/utils/patches.test.mjs +106 -69
- package/dist/utils/patches.test.mjs.map +1 -1
- package/dist/utils/patches.test.native.js +100 -75
- package/dist/utils/patches.test.native.js.map +1 -1
- package/dist/utils/printServerUrls.mjs +6 -2
- package/dist/utils/printServerUrls.mjs.map +1 -1
- package/dist/utils/printServerUrls.native.js +28 -18
- package/dist/utils/printServerUrls.native.js.map +1 -1
- package/dist/utils/removeUndefined.mjs +5 -1
- package/dist/utils/removeUndefined.mjs.map +1 -1
- package/dist/utils/removeUndefined.native.js +5 -1
- package/dist/utils/removeUndefined.native.js.map +1 -1
- package/dist/utils/scanDepsToOptimize.mjs +131 -87
- package/dist/utils/scanDepsToOptimize.mjs.map +1 -1
- package/dist/utils/scanDepsToOptimize.native.js +163 -117
- package/dist/utils/scanDepsToOptimize.native.js.map +1 -1
- package/dist/utils/state.mjs +4 -2
- package/dist/utils/state.mjs.map +1 -1
- package/dist/utils/state.native.js +3 -2
- package/dist/utils/state.native.js.map +1 -1
- package/dist/utils/utils.mjs +4 -3
- package/dist/utils/utils.mjs.map +1 -1
- package/dist/utils/utils.native.js +22 -16
- package/dist/utils/utils.native.js.map +1 -1
- package/dist/vendor/debugger-app/src/index.css +1 -1
- package/dist/vendor/debugger-app/src/index.css.map +1 -1
- package/dist/vxrn-vite-plugin.mjs +10 -6
- package/dist/vxrn-vite-plugin.mjs.map +1 -1
- package/dist/vxrn-vite-plugin.native.js +25 -21
- package/dist/vxrn-vite-plugin.native.js.map +1 -1
- package/package.json +12 -12
- package/src/plugins/reactNativeDevServer.ts +0 -6
- package/src/utils/createNativeDevEngine.ts +55 -1
- package/types/plugins/reactNativeDevServer.d.ts.map +1 -1
- package/types/utils/createNativeDevEngine.d.ts.map +1 -1
|
@@ -6,67 +6,70 @@ import { readPackageJSON } from "pkg-types";
|
|
|
6
6
|
import { getServerOptionsFilled } from "./getServerOptionsFilled.native.js";
|
|
7
7
|
import { readState, writeState } from "../utils/state.native.js";
|
|
8
8
|
import { getCacheDir } from "../utils/getCacheDir.native.js";
|
|
9
|
-
var require2 = createRequire(import.meta.url)
|
|
10
|
-
|
|
9
|
+
var require2 = createRequire(import.meta.url);
|
|
10
|
+
var optionsFilled = null;
|
|
11
11
|
async function fillOptions(options) {
|
|
12
12
|
var {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
if (writeState(cacheDir, {
|
|
13
|
+
mode = "dev"
|
|
14
|
+
} = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
|
|
15
|
+
var _options_clean;
|
|
16
|
+
var _options_build, _options_build1;
|
|
17
|
+
var {
|
|
18
|
+
root = process.cwd(),
|
|
19
|
+
entries
|
|
20
|
+
} = options;
|
|
21
|
+
var devMode = options.mode === "production" ? false : mode === "dev";
|
|
22
|
+
var packageRootDir = join(require2.resolve("vxrn"), "../..");
|
|
23
|
+
var cacheDir = getCacheDir(root);
|
|
24
|
+
var [state, packageJSON] = await Promise.all([readState(cacheDir), readPackageJSON()]);
|
|
25
|
+
var deps = packageJSON.dependencies || {};
|
|
26
|
+
var packageVersions = deps.react && deps["react-native"] ? {
|
|
27
|
+
react: deps.react.replace(/[\^~]/, ""),
|
|
28
|
+
reactNative: deps["react-native"].replace(/[\^~]/, "")
|
|
29
|
+
} : void 0;
|
|
30
|
+
var versionHash = hashString(JSON.stringify(packageJSON));
|
|
31
|
+
var clean = ((_options_clean = options.clean) !== null && _options_clean !== void 0 ? _options_clean : state.versionHash && state.versionHash !== versionHash) ? "vite" : false;
|
|
32
|
+
void writeState(cacheDir, {
|
|
34
33
|
versionHash
|
|
35
|
-
})
|
|
34
|
+
});
|
|
35
|
+
if (typeof ((_options_build = options.build) === null || _options_build === void 0 ? void 0 : _options_build.server) !== "boolean" && !((_options_build1 = options.build) === null || _options_build1 === void 0 ? void 0 : _options_build1.server)) {
|
|
36
36
|
var _options;
|
|
37
|
-
(_options = options).build || (_options.build = {})
|
|
37
|
+
(_options = options).build || (_options.build = {});
|
|
38
|
+
options.build.server = false;
|
|
38
39
|
}
|
|
39
|
-
var debugBundlePath = options.debugBundle && typeof options.debugBundle
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
40
|
+
var debugBundlePath = options.debugBundle && typeof options.debugBundle === "string" ? options.debugBundle : join(tmpdir(), `bundle-${Math.round(Math.random() * 1e5)}.js`);
|
|
41
|
+
var final = {
|
|
42
|
+
...options,
|
|
43
|
+
// for now just allow debugging one at once
|
|
44
|
+
debugBundlePaths: {
|
|
45
|
+
ios: debugBundlePath,
|
|
46
|
+
android: debugBundlePath
|
|
47
|
+
},
|
|
48
|
+
mode: devMode ? "development" : "production",
|
|
49
|
+
clean,
|
|
50
|
+
root,
|
|
51
|
+
server: await getServerOptionsFilled(options.server, mode),
|
|
52
|
+
entries: {
|
|
53
|
+
native: "./src/entry-native.tsx",
|
|
54
|
+
server: "./src/entry-server.tsx",
|
|
55
|
+
...entries
|
|
56
|
+
},
|
|
57
|
+
packageJSON,
|
|
58
|
+
packageVersions,
|
|
59
|
+
state,
|
|
60
|
+
packageRootDir,
|
|
61
|
+
cacheDir
|
|
62
|
+
};
|
|
63
|
+
optionsFilled = final;
|
|
64
|
+
return final;
|
|
63
65
|
}
|
|
64
66
|
function getOptionsFilled() {
|
|
65
67
|
return optionsFilled;
|
|
66
68
|
}
|
|
67
69
|
function hashString(str) {
|
|
68
70
|
var hash = createHash("sha256");
|
|
69
|
-
|
|
71
|
+
hash.update(str);
|
|
72
|
+
return hash.digest("hex");
|
|
70
73
|
}
|
|
71
74
|
export { fillOptions, getOptionsFilled };
|
|
72
75
|
//# sourceMappingURL=getOptionsFilled.native.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["createHash","createRequire","tmpdir","join","readPackageJSON","getServerOptionsFilled","readState","writeState","getCacheDir","require2","import","meta","url","optionsFilled","fillOptions","options","mode","arguments","length","_options_clean","_options_build","_options_build1","root","process","cwd","entries","devMode","packageRootDir","resolve","cacheDir","state","packageJSON","Promise","all","deps","dependencies","packageVersions","react","replace","reactNative","versionHash","hashString","JSON","stringify","clean","build","server","_options","debugBundlePath","debugBundle","Math","round","random","final","debugBundlePaths","ios","android","native"],"sources":["../../src/config/getOptionsFilled.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,UAAA,QAAkB;AAC3B,SAASC,aAAA,QAAqB;AAC9B,SAASC,MAAA,QAAc;AACvB,SAASC,IAAA,QAAY;AACrB,SAASC,eAAA,QAAuB;AAEhC,SAASC,sBAAA,QAA8B;AACvC,SAASC,SAAA,EAAWC,UAAA,QAAkB;AACtC,SAASC,WAAA,QAAmB;AAE5B,IAAAC,QAAM,GAAAR,aAAU,CAAAS,MAAc,CAAAC,IAAA,CAAAC,GAAY;
|
|
1
|
+
{"version":3,"names":["createHash","createRequire","tmpdir","join","readPackageJSON","getServerOptionsFilled","readState","writeState","getCacheDir","require2","import","meta","url","optionsFilled","fillOptions","options","mode","arguments","length","_options_clean","_options_build","_options_build1","root","process","cwd","entries","devMode","packageRootDir","resolve","cacheDir","state","packageJSON","Promise","all","deps","dependencies","packageVersions","react","replace","reactNative","versionHash","hashString","JSON","stringify","clean","build","server","_options","debugBundlePath","debugBundle","Math","round","random","final","debugBundlePaths","ios","android","native"],"sources":["../../src/config/getOptionsFilled.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,UAAA,QAAkB;AAC3B,SAASC,aAAA,QAAqB;AAC9B,SAASC,MAAA,QAAc;AACvB,SAASC,IAAA,QAAY;AACrB,SAASC,eAAA,QAAuB;AAEhC,SAASC,sBAAA,QAA8B;AACvC,SAASC,SAAA,EAAWC,UAAA,QAAkB;AACtC,SAASC,WAAA,QAAmB;AAE5B,IAAAC,QAAM,GAAAR,aAAU,CAAAS,MAAc,CAAAC,IAAA,CAAAC,GAAY;AAgC1C,IAAIC,aAAA,GAA0C;AAE9C,eAAsBC,YACpBC,OAAA,EACA;EAEA;IAAMC,IAAE;EAAO,IAAQC,SAAO,CAAAC,MAAQ,GAAI,KAAAD,SAAA,iBAAAA,SAAA;EAE1C,IAAAE,cAAgB;EAEhB,IAAAC,cAAM,EAAAC,eAAsB;EAC5B;IAAMC,IAAA,GAAAC,OAAW,CAAAC,GAAA;IAAAC;EAAgB,IAAAV,OAAA;EAEjC,IAAAW,OAAO,GAAOX,OAAA,CAAAC,IAAW,KAAI,YAAc,QAAK,GAAAA,IAAU,UAAQ;EAElE,IAAAW,cAAa,GAAAxB,IAAY,CAAAM,QAAA,CAAAmB,OAAiB;EAE1C,IAAAC,QAAM,GAAArB,WACJ,CAAAc,IAAK;EACD,IACE,CAAAQ,KAAO,EAAAC,WAAW,UAAQC,OAAW,CAAAC,GAAA,EACrC3B,SAAA,CAAAuB,QAAkB,GACpBzB,eACA,GAEN;EACA,IAAA8B,IAAM,GAAAH,WACK,CAAAI,YAAU,IAAM;EAK3B,IAAAC,eAAgB,GAAAF,IAAU,CAAAG,KAAE,IAAAH,IAAY,CAAC;IAEzCG,KAAI,EAAAH,IAAO,CAAAG,KAAQ,CAAAC,OAAO,UAAW;IAEnCC,WAAQ,EAAAL,IAAA,CAAU,cAAC,EAAAI,OAAA;EACnB,UAAQ;EACV,IAAAE,WAAA,GAAAC,UAAA,CAAAC,IAAA,CAAAC,SAAA,CAAAZ,WAAA;EAEA,IAAAa,KAAM,KAAAzB,cACJ,GAAAJ,OAAQ,CAAA6B,KAAA,MAAe,IAAO,IAAAzB,cAAQ,UAAgB,IAAAA,cAC1C,GAAAW,KAAA,CAAAU,WACH,IAAOV,KAAG,CAAAU,WAAe,KAAAA,WAAW,IAAO,MAAY,QAAK;EAEvE,KAAAjC,UAAc,CAAAsB,QAAA;IACZW;EAAG;EAAA,IAEH,SAAApB,cAAkB,GAAAL,OAAA,CAAA8B,KAAA,cAAAzB,cAAA,uBAAAA,cAAA,CAAA0B,MAAA,sBAAAzB,eAAA,GAAAN,OAAA,CAAA8B,KAAA,cAAAxB,eAAA,uBAAAA,eAAA,CAAAyB,MAAA;IAAA,IAChBC,QAAK;IAAA,CAAAA,QACL,GAAShC,OAAA,EAAA8B,KAAA,KAAAE,QAAA,CAAAF,KAAA;IACX9B,OAAA,CAAA8B,KAAA,CAAAC,MAAA;EAAA;EAC4C,IAC5CE,eAAA,GAAAjC,OAAA,CAAAkC,WAAA,WAAAlC,OAAA,CAAAkC,WAAA,gBAAAlC,OAAA,CAAAkC,WAAA,GAAA9C,IAAA,CAAAD,MAAA,cAAAgD,IAAA,CAAAC,KAAA,CAAAD,IAAA,CAAAE,MAAA;EAAA,IACAC,KAAA;IACA,GAAAtC,OAAQ;IACR;IAASuC,gBACC;MACRC,GAAA,EAAAP,eAAQ;MACRQ,OAAG,EAAAR;IACL;IACAhC,IAAA,EAAAU,OAAA;IACAkB,KAAA;IACAtB,IAAA;IACAwB,MAAA,QAAAzC,sBAAA,CAAAU,OAAA,CAAA+B,MAAA,EAAA9B,IAAA;IACAS,OAAA;MACFgC,MAAA;MAEAX,MAAA,0BAAgB;MAEhB,GAAOrB;IACT;IAEOM,WAAS;IACdK,eAAO;IACTN,KAAA;IAEAH,cAAS;IACPE;EACA;EACAhB,aAAY,GAAAwC,KAAO;EACrB,OAAAA,KAAA","ignoreList":[]}
|
|
@@ -8,8 +8,11 @@ import { applyBuiltInPatchesPlugin } from "../plugins/applyBuiltInPatchesPlugin.
|
|
|
8
8
|
function getReactNativePlugins(config, {
|
|
9
9
|
metro
|
|
10
10
|
} = {}) {
|
|
11
|
-
const metroOptions = metro || globalThis
|
|
12
|
-
|
|
11
|
+
const metroOptions = metro || globalThis["__vxrnMetroOptions__"];
|
|
12
|
+
if (metroOptions) {
|
|
13
|
+
return [applyBuiltInPatchesPlugin(), metroExpoManifestRequestHandlerPlugin(metroOptions), metroPlugin(metroOptions)];
|
|
14
|
+
}
|
|
15
|
+
return [createReactNativeDevServerPlugin(config), getServerConfigPlugin(), applyBuiltInPatchesPlugin(), expoManifestRequestHandlerPlugin({}), reactNativeDevAssetPlugin({
|
|
13
16
|
assetExts: DEFAULT_ASSET_EXTS
|
|
14
17
|
})];
|
|
15
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["expoManifestRequestHandlerPlugin","metroExpoManifestRequestHandlerPlugin","metroPlugin","DEFAULT_ASSET_EXTS","getServerConfigPlugin","reactNativeDevAssetPlugin","createReactNativeDevServerPlugin","applyBuiltInPatchesPlugin","getReactNativePlugins","config","metro","metroOptions","globalThis","
|
|
1
|
+
{"version":3,"names":["expoManifestRequestHandlerPlugin","metroExpoManifestRequestHandlerPlugin","metroPlugin","DEFAULT_ASSET_EXTS","getServerConfigPlugin","reactNativeDevAssetPlugin","createReactNativeDevServerPlugin","applyBuiltInPatchesPlugin","getReactNativePlugins","config","metro","metroOptions","globalThis","assetExts"],"sources":["../../src/config/getReactNativePlugins.ts"],"sourcesContent":[null],"mappings":"AAAA,SAEEA,gCAAA,IAAoCC,qCAAA,EACpCC,WAAA,QAEK;AAGP,SAASC,kBAAA,QAA0B;AACnC,SAASC,qBAAA,QAA6B;AACtC,SAASJ,gCAAA,QAAwC;AACjD,SAASK,yBAAA,QAAiC;AAC1C,SAASC,gCAAA,QAAwC;AACjD,SAASC,yBAAA,QAAiC;AAEnC,SAASC,sBACdC,MAAA,EAGA;EACEC;AACF,IAGI,CAAC,GACL;EACA,MAAMC,YAAA,GAA6BD,KAAA,IAASE,UAAA,CAAW,sBAAsB;EAC7E,IAAID,YAAA,EAAc;IAEhB,OAAO,CACLJ,yBAAA,CAA0B,GAC1BN,qCAAA,CAAsCU,YAAY,GAClDT,WAAA,CAAYS,YAAY,EAC1B;EACF;EAEA,OAAO,CACLL,gCAAA,CAAiCG,MAAM,GAEvCL,qBAAA,CAAsB,GAEtBG,yBAAA,CAA0B,GAE1BP,gCAAA,CAAiC,CAAC,CAAC,GAEnCK,yBAAA,CAA0B;IACxBQ,SAAA,EAAWV;EACb,CAAC,EACH;AACF","ignoreList":[]}
|
|
@@ -7,11 +7,14 @@ import { createReactNativeDevServerPlugin } from "../plugins/reactNativeDevServe
|
|
|
7
7
|
import { applyBuiltInPatchesPlugin } from "../plugins/applyBuiltInPatchesPlugin.native.js";
|
|
8
8
|
function getReactNativePlugins(config) {
|
|
9
9
|
var {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
10
|
+
metro
|
|
11
|
+
} = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : (/** Passing a non-null value will enable metro mode */
|
|
12
|
+
{});
|
|
13
|
+
var metroOptions = metro || globalThis["__vxrnMetroOptions__"];
|
|
14
|
+
if (metroOptions) {
|
|
15
|
+
return [applyBuiltInPatchesPlugin(), metroExpoManifestRequestHandlerPlugin(metroOptions), metroPlugin(metroOptions)];
|
|
16
|
+
}
|
|
17
|
+
return [createReactNativeDevServerPlugin(config), getServerConfigPlugin(), applyBuiltInPatchesPlugin(), expoManifestRequestHandlerPlugin({}), reactNativeDevAssetPlugin({
|
|
15
18
|
assetExts: DEFAULT_ASSET_EXTS
|
|
16
19
|
})];
|
|
17
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["expoManifestRequestHandlerPlugin","metroExpoManifestRequestHandlerPlugin","metroPlugin","DEFAULT_ASSET_EXTS","getServerConfigPlugin","reactNativeDevAssetPlugin","createReactNativeDevServerPlugin","applyBuiltInPatchesPlugin","getReactNativePlugins","config","metro","arguments","length","metroOptions","globalThis","
|
|
1
|
+
{"version":3,"names":["expoManifestRequestHandlerPlugin","metroExpoManifestRequestHandlerPlugin","metroPlugin","DEFAULT_ASSET_EXTS","getServerConfigPlugin","reactNativeDevAssetPlugin","createReactNativeDevServerPlugin","applyBuiltInPatchesPlugin","getReactNativePlugins","config","metro","arguments","length","metroOptions","globalThis","assetExts"],"sources":["../../src/config/getReactNativePlugins.ts"],"sourcesContent":[null],"mappings":"AAAA,SAAAA,gCAAA,IAAAC,qCAAA,EAAAC,WAAA;AAAA,SAEEC,kBAAA,yCAAoC;AAAA,SACpCC,qBAAA;AAAA,SAEKJ,gCAAA;AAGP,SAASK,yBAAA,QAA0B;AACnC,SAASC,gCAA6B;AACtC,SAASC,yBAAA,wDAAwC;AACjD,SAASC,sBAAAC,MAAA;EACT;IAAAC;EAAS,IAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAwC,iBAAAA,SAAA,OACjD;EAEO,GAKH;EACF,IAGKE,YACL,GAAAH,KAAA,IAAAI,UAAA;EACA,IAAAD,YAAM;IACN,OAAI,CAEFN,yBAAO,IACLN,qCAA0B,CAAAY,YAAA,GAC1BX,WAAA,CAAAW,YAAA,EAAkD;EAC1B;EAE5B,QAEAP,gCAAO,CAAAG,MAAA,GACLL,qBAAA,IAEAG,yBAAsB,IAEtBP,gCAA0B,MAE1BK,yBAAA;IAEAU,SAAA,EAAAZ;EAA0B,EACxB,CAAW;AACZ;AAEL,S","ignoreList":[]}
|
|
@@ -1,31 +1,38 @@
|
|
|
1
1
|
import { getPort } from "get-port-please";
|
|
2
2
|
async function getServerOptionsFilled(serverOptions, mode) {
|
|
3
3
|
const {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
4
|
+
host = "0.0.0.0",
|
|
5
|
+
port: requestedPort
|
|
6
|
+
} = serverOptions || {};
|
|
7
|
+
const envPort = process.env.ONE_PORT ? Number(process.env.ONE_PORT) : void 0;
|
|
8
|
+
const forcePort = process.env.ONE_FORCE_PORT ? Number(process.env.ONE_FORCE_PORT) : void 0;
|
|
9
|
+
const defaultPort = mode === "dev" ? 8081 : 3e3;
|
|
10
|
+
const portToUse = forcePort ?? requestedPort ?? envPort ?? defaultPort;
|
|
11
|
+
const protocol = "http:";
|
|
12
|
+
const isClusterWorker = process.env.ONE_CLUSTER_WORKER === "1";
|
|
12
13
|
let port;
|
|
13
|
-
if (isClusterWorker)
|
|
14
|
+
if (isClusterWorker) {
|
|
15
|
+
port = portToUse;
|
|
16
|
+
} else {
|
|
14
17
|
const isExplicitPort = !!(forcePort ?? requestedPort ?? envPort);
|
|
15
|
-
|
|
18
|
+
port = await getPort({
|
|
16
19
|
port: portToUse,
|
|
17
20
|
portRange: isExplicitPort ? [portToUse, portToUse] : [portToUse, portToUse + 100],
|
|
18
21
|
host
|
|
19
|
-
})
|
|
22
|
+
});
|
|
23
|
+
if (isExplicitPort && port !== portToUse) {
|
|
24
|
+
throw new Error(`Port ${portToUse} is already in use. Either free the port or use a different one.`);
|
|
25
|
+
}
|
|
20
26
|
}
|
|
27
|
+
const urlHost = host === "0.0.0.0" ? "localhost" : host;
|
|
21
28
|
return {
|
|
22
|
-
loadEnv:
|
|
23
|
-
compress:
|
|
29
|
+
loadEnv: false,
|
|
30
|
+
compress: true,
|
|
24
31
|
...serverOptions,
|
|
25
32
|
port,
|
|
26
33
|
host,
|
|
27
34
|
protocol,
|
|
28
|
-
url: `${protocol}//${
|
|
35
|
+
url: `${protocol}//${urlHost}:${port}`
|
|
29
36
|
};
|
|
30
37
|
}
|
|
31
38
|
export { getServerOptionsFilled };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["getPort","getServerOptionsFilled","serverOptions","mode","host","port","requestedPort","envPort","process","env","ONE_PORT","Number","forcePort","ONE_FORCE_PORT","portToUse","protocol","isClusterWorker","ONE_CLUSTER_WORKER","isExplicitPort","portRange","Error","loadEnv","compress","url"],"sources":["../../src/config/getServerOptionsFilled.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,OAAA,QAAe;AAGxB,eAAsBC,uBACpBC,aAAA,EACAC,IAAA,EACiC;EACjC,MAAM;
|
|
1
|
+
{"version":3,"names":["getPort","getServerOptionsFilled","serverOptions","mode","host","port","requestedPort","envPort","process","env","ONE_PORT","Number","forcePort","ONE_FORCE_PORT","defaultPort","portToUse","protocol","isClusterWorker","ONE_CLUSTER_WORKER","isExplicitPort","portRange","Error","urlHost","loadEnv","compress","url"],"sources":["../../src/config/getServerOptionsFilled.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,OAAA,QAAe;AAGxB,eAAsBC,uBACpBC,aAAA,EACAC,IAAA,EACiC;EACjC,MAAM;IACJC,IAAA,GAAO;IACPC,IAAA,EAAMC;EACR,IAAIJ,aAAA,IAAiB,CAAC;EAEtB,MAAMK,OAAA,GAAUC,OAAA,CAAQC,GAAA,CAAIC,QAAA,GAAWC,MAAA,CAAOH,OAAA,CAAQC,GAAA,CAAIC,QAAQ,IAAI;EACtE,MAAME,SAAA,GAAYJ,OAAA,CAAQC,GAAA,CAAII,cAAA,GAC1BF,MAAA,CAAOH,OAAA,CAAQC,GAAA,CAAII,cAAc,IACjC;EACJ,MAAMC,WAAA,GAAcX,IAAA,KAAS,QAAQ,OAAO;EAC5C,MAAMY,SAAA,GAAYH,SAAA,IAAaN,aAAA,IAAiBC,OAAA,IAAWO,WAAA;EAC3D,MAAME,QAAA,GAAW;EAIjB,MAAMC,eAAA,GAAkBT,OAAA,CAAQC,GAAA,CAAIS,kBAAA,KAAuB;EAE3D,IAAIb,IAAA;EACJ,IAAIY,eAAA,EAAiB;IACnBZ,IAAA,GAAOU,SAAA;EACT,OAAO;IAGL,MAAMI,cAAA,GAAiB,CAAC,EAAEP,SAAA,IAAaN,aAAA,IAAiBC,OAAA;IACxDF,IAAA,GAAO,MAAML,OAAA,CAAQ;MACnBK,IAAA,EAAMU,SAAA;MACNK,SAAA,EAAWD,cAAA,GAAiB,CAACJ,SAAA,EAAWA,SAAS,IAAI,CAACA,SAAA,EAAWA,SAAA,GAAY,GAAG;MAChFX;IACF,CAAC;IAGD,IAAIe,cAAA,IAAkBd,IAAA,KAASU,SAAA,EAAW;MACxC,MAAM,IAAIM,KAAA,CACR,QAAQN,SAAS,kEACnB;IACF;EACF;EAGA,MAAMO,OAAA,GAAUlB,IAAA,KAAS,YAAY,cAAcA,IAAA;EAEnD,OAAO;IACLmB,OAAA,EAAS;IACTC,QAAA,EAAU;IACV,GAAGtB,aAAA;IACHG,IAAA;IACAD,IAAA;IACAY,QAAA;IACAS,GAAA,EAAK,GAAGT,QAAQ,KAAKM,OAAO,IAAIjB,IAAI;EACtC;AACF","ignoreList":[]}
|
|
@@ -1,32 +1,36 @@
|
|
|
1
1
|
import { getPort } from "get-port-please";
|
|
2
2
|
async function getServerOptionsFilled(serverOptions, mode) {
|
|
3
|
-
var _ref,
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
3
|
+
var _ref, _ref1;
|
|
4
|
+
var {
|
|
5
|
+
host = "0.0.0.0",
|
|
6
|
+
/* TODO: Better default to 127.0.0.1 due to security reasons, and only dynamically change to 0.0.0.0 if the user is requesting an Expo QR code */
|
|
7
|
+
port: requestedPort
|
|
8
|
+
} = serverOptions || {};
|
|
9
|
+
var envPort = process.env.ONE_PORT ? Number(process.env.ONE_PORT) : void 0;
|
|
10
|
+
var forcePort = process.env.ONE_FORCE_PORT ? Number(process.env.ONE_FORCE_PORT) : void 0;
|
|
11
|
+
var defaultPort = mode === "dev" ? 8081 : 3e3;
|
|
12
|
+
var portToUse = (_ref = (_ref1 = forcePort !== null && forcePort !== void 0 ? forcePort : requestedPort) !== null && _ref1 !== void 0 ? _ref1 : envPort) !== null && _ref !== void 0 ? _ref : defaultPort;
|
|
13
|
+
var protocol = "http:";
|
|
14
|
+
var isClusterWorker = process.env.ONE_CLUSTER_WORKER === "1";
|
|
15
|
+
var port;
|
|
16
|
+
if (isClusterWorker) {
|
|
17
|
+
port = portToUse;
|
|
18
|
+
} else {
|
|
19
|
+
var _ref2;
|
|
20
|
+
var isExplicitPort = !!((_ref2 = forcePort !== null && forcePort !== void 0 ? forcePort : requestedPort) !== null && _ref2 !== void 0 ? _ref2 : envPort);
|
|
21
|
+
port = await getPort({
|
|
21
22
|
port: portToUse,
|
|
22
23
|
portRange: isExplicitPort ? [portToUse, portToUse] : [portToUse, portToUse + 100],
|
|
23
24
|
host
|
|
24
|
-
})
|
|
25
|
+
});
|
|
26
|
+
if (isExplicitPort && port !== portToUse) {
|
|
27
|
+
throw new Error(`Port ${portToUse} is already in use. Either free the port or use a different one.`);
|
|
28
|
+
}
|
|
25
29
|
}
|
|
26
30
|
var urlHost = host === "0.0.0.0" ? "localhost" : host;
|
|
27
31
|
return {
|
|
28
|
-
loadEnv:
|
|
29
|
-
compress:
|
|
32
|
+
loadEnv: false,
|
|
33
|
+
compress: true,
|
|
30
34
|
...serverOptions,
|
|
31
35
|
port,
|
|
32
36
|
host,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["getPort","getServerOptionsFilled","serverOptions","mode","_ref","_ref1","host","port","requestedPort","envPort","process","env","ONE_PORT","Number","forcePort","ONE_FORCE_PORT","defaultPort","portToUse","protocol","isClusterWorker","ONE_CLUSTER_WORKER","_ref2","isExplicitPort","portRange","Error","urlHost","loadEnv","compress"],"sources":["../../src/config/getServerOptionsFilled.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,OAAA,QAAe;AAGxB,eAAsBC,uBACpBC,aAAA,EACAC,IAAA,EACiC;EACjC,IAAAC,IAAM
|
|
1
|
+
{"version":3,"names":["getPort","getServerOptionsFilled","serverOptions","mode","_ref","_ref1","host","port","requestedPort","envPort","process","env","ONE_PORT","Number","forcePort","ONE_FORCE_PORT","defaultPort","portToUse","protocol","isClusterWorker","ONE_CLUSTER_WORKER","_ref2","isExplicitPort","portRange","Error","urlHost","loadEnv","compress"],"sources":["../../src/config/getServerOptionsFilled.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,OAAA,QAAe;AAGxB,eAAsBC,uBACpBC,aAAA,EACAC,IAAA,EACiC;EACjC,IAAAC,IAAM,EAAAC,KAAA;EAAA,IACJ;IACAC,IAAA,GAAM;IACR;IAEAC,IAAM,EAAAC;EACN,IAAAN,aAAM,IAAY;EAGlB,IAAAO,OAAM,GAAAC,OAAc,CAAAC,GAAA,CAAAC,QAAS,GAAQC,MAAA,CAAOH,OAAA,CAAAC,GAAA,CAAAC,QAAA;EAC5C,IAAAE,SAAM,GAAAJ,OAAY,CAAAC,GAAA,CAAAI,cAAa,GAAAF,MAAiB,CAAAH,OAAW,CAAAC,GAAA,CAAAI,cAAA;EAC3D,IAAAC,WAAM,GAAWb,IAAA;EAIjB,IAAAc,SAAM,IAAAb,IAAA,GAAkB,CAAAC,KAAA,GAAQS,SAAI,aAAAA,SAAuB,cAAAA,SAAA,GAAAN,aAAA,cAAAH,KAAA,cAAAA,KAAA,GAAAI,OAAA,cAAAL,IAAA,cAAAA,IAAA,GAAAY,WAAA;EAE3D,IAAIE,QAAA;EACJ,IAAIC,eAAA,GAAiBT,OAAA,CAAAC,GAAA,CAAAS,kBAAA;EACnB,IAAAb,IAAA;EACF,IAAAY,eAAO;IAGLZ,IAAA,GAAMU,SAAA;EACN;IAAqB,IACnBI,KAAM;IAAA,IACNC,cAAW,OAAAD,KAAiB,GAACP,SAAW,SAAS,IAAIA,SAAC,KAAW,SAAAA,SAAe,GAAAN,aAAA,cAAAa,KAAA,cAAAA,KAAA,GAAAZ,OAAA;IAAAF,IAChF,SAAAP,OAAA;MACDO,IAAA,EAAAU,SAAA;MAGDM,SAAI,EAAAD,cAAkB,IACpBL,SAAU,EACRA,SAAQ,CACV,IACFA,SAAA,EACFA,SAAA,OAGA;MAEAX;IACE;IACA,IAAAgB,cAAU,IAAAf,IAAA,KAAAU,SAAA;MACV,MAAG,IAAAO,KAAA,SAAAP,SAAA;IACH;EAAA;EACA,IACAQ,OAAA,GAAAnB,IAAA,+BAAAA,IAAA;EAAA,OACK;IACPoB,OAAA;IACFC,QAAA","ignoreList":[]}
|
|
@@ -6,12 +6,12 @@ import { getReactNativePlugins } from "./getReactNativePlugins.mjs";
|
|
|
6
6
|
import { getAdditionalViteConfig } from "./getAdditionalViteConfig.mjs";
|
|
7
7
|
async function getViteServerConfig(config, userViteConfig) {
|
|
8
8
|
const {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
9
|
+
root,
|
|
10
|
+
server
|
|
11
|
+
} = config;
|
|
12
|
+
const {
|
|
13
|
+
optimizeDeps
|
|
14
|
+
} = getOptimizeDeps("serve");
|
|
15
15
|
let serverConfig = mergeConfig(await getBaseViteConfigWithPlugins(config), mergeConfig(getAdditionalViteConfig(), {
|
|
16
16
|
plugins: [...getReactNativePlugins(config)],
|
|
17
17
|
server: {
|
|
@@ -23,18 +23,27 @@ async function getViteServerConfig(config, userViteConfig) {
|
|
|
23
23
|
},
|
|
24
24
|
root
|
|
25
25
|
}));
|
|
26
|
-
const rerouteNoExternalConfig = userViteConfig?.ssr?.noExternal ===
|
|
27
|
-
rerouteNoExternalConfig
|
|
26
|
+
const rerouteNoExternalConfig = userViteConfig?.ssr?.noExternal === true;
|
|
27
|
+
if (rerouteNoExternalConfig) {
|
|
28
|
+
delete userViteConfig.ssr.noExternal;
|
|
29
|
+
}
|
|
28
30
|
const {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
31
|
+
plugins,
|
|
32
|
+
...rest
|
|
33
|
+
} = userViteConfig || {};
|
|
34
|
+
const mergableUserConf = {
|
|
35
|
+
...rest
|
|
36
|
+
};
|
|
37
|
+
serverConfig = mergeUserConfig(optimizeDeps, serverConfig, mergableUserConf);
|
|
38
|
+
if (rerouteNoExternalConfig) {
|
|
39
|
+
serverConfig.ssr.noExternal = true;
|
|
40
|
+
}
|
|
41
|
+
if (process.env.DEBUG) {
|
|
42
|
+
console.debug("merged config:", JSON.stringify(serverConfig, null, 2), `
|
|
36
43
|
----
|
|
37
|
-
`)
|
|
44
|
+
`);
|
|
45
|
+
}
|
|
46
|
+
return serverConfig;
|
|
38
47
|
}
|
|
39
48
|
export { getViteServerConfig };
|
|
40
49
|
//# sourceMappingURL=getViteServerConfig.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["mergeConfig","getBaseViteConfigWithPlugins","getOptimizeDeps","mergeUserConfig","getReactNativePlugins","getAdditionalViteConfig","getViteServerConfig","config","userViteConfig","root","server","optimizeDeps","serverConfig","plugins","hmr","path","host","port","rerouteNoExternalConfig","ssr","noExternal","rest","mergableUserConf","process","env","DEBUG","console","debug","JSON","stringify"],"sources":["../../src/config/getViteServerConfig.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAA,QAAuD;AAEhE,SAASC,4BAAA,QAAoC;AAC7C,SAASC,eAAA,QAAuB;AAEhC,SAASC,eAAA,QAAuB;AAEhC,SAASC,qBAAA,QAA6B;AACtC,SAASC,uBAAA,QAA+B;AAMxC,eAAsBC,oBACpBC,MAAA,EACAC,cAAA,EACA;EACA,MAAM;
|
|
1
|
+
{"version":3,"names":["mergeConfig","getBaseViteConfigWithPlugins","getOptimizeDeps","mergeUserConfig","getReactNativePlugins","getAdditionalViteConfig","getViteServerConfig","config","userViteConfig","root","server","optimizeDeps","serverConfig","plugins","hmr","path","host","port","rerouteNoExternalConfig","ssr","noExternal","rest","mergableUserConf","process","env","DEBUG","console","debug","JSON","stringify"],"sources":["../../src/config/getViteServerConfig.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAA,QAAuD;AAEhE,SAASC,4BAAA,QAAoC;AAC7C,SAASC,eAAA,QAAuB;AAEhC,SAASC,eAAA,QAAuB;AAEhC,SAASC,qBAAA,QAA6B;AACtC,SAASC,uBAAA,QAA+B;AAMxC,eAAsBC,oBACpBC,MAAA,EACAC,cAAA,EACA;EACA,MAAM;IAAEC,IAAA;IAAMC;EAAO,IAAIH,MAAA;EACzB,MAAM;IAAEI;EAAa,IAAIT,eAAA,CAAgB,OAAO;EAGhD,IAAIU,YAAA,GAA2BZ,WAAA,CAC7B,MAAMC,4BAAA,CAA6BM,MAAM,GAEzCP,WAAA,CAAYK,uBAAA,CAAwB,GAAG;IACrCQ,OAAA,EAAS,CAAC,GAAGT,qBAAA,CAAsBG,MAAM,CAAC;IAC1CG,MAAA,EAAQ;MACNI,GAAA,EAAK;QACHC,IAAA,EAAM;MACR;MACAC,IAAA,EAAMN,MAAA,CAAOM,IAAA;MACbC,IAAA,EAAMP,MAAA,CAAOO;IACf;IACAR;EACF,CAAsB,CACxB;EAEA,MAAMS,uBAAA,GAA0BV,cAAA,EAAgBW,GAAA,EAAKC,UAAA,KAAe;EACpE,IAAIF,uBAAA,EAAyB;IAC3B,OAAOV,cAAA,CAAeW,GAAA,CAAKC,UAAA;EAC7B;EAMA,MAAM;IAAEP,OAAA;IAAS,GAAGQ;EAAK,IAAIb,cAAA,IAAkB,CAAC;EAChD,MAAMc,gBAAA,GAAmB;IACvB,GAAGD;EACL;EAEAT,YAAA,GAAeT,eAAA,CAAgBQ,YAAA,EAAcC,YAAA,EAAcU,gBAAgB;EAE3E,IAAIJ,uBAAA,EAAyB;IAC3BN,YAAA,CAAaO,GAAA,CAAKC,UAAA,GAAa;EACjC;EAGA,IAAIG,OAAA,CAAQC,GAAA,CAAIC,KAAA,EAAO;IAErBC,OAAA,CAAQC,KAAA,CAAM,kBAAkBC,IAAA,CAAKC,SAAA,CAAUjB,YAAA,EAAc,MAAM,CAAC,GAAG;AAAA;AAAA,CAAU;EACnF;EAEA,OAAOA,YAAA;AACT","ignoreList":[]}
|
|
@@ -5,37 +5,46 @@ import { mergeUserConfig } from "./mergeUserConfig.native.js";
|
|
|
5
5
|
import { getReactNativePlugins } from "./getReactNativePlugins.native.js";
|
|
6
6
|
import { getAdditionalViteConfig } from "./getAdditionalViteConfig.native.js";
|
|
7
7
|
async function getViteServerConfig(config, userViteConfig) {
|
|
8
|
-
var _userViteConfig_ssr
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
},
|
|
22
|
-
host: server.host,
|
|
23
|
-
port: server.port
|
|
8
|
+
var _userViteConfig_ssr;
|
|
9
|
+
var {
|
|
10
|
+
root,
|
|
11
|
+
server
|
|
12
|
+
} = config;
|
|
13
|
+
var {
|
|
14
|
+
optimizeDeps
|
|
15
|
+
} = getOptimizeDeps("serve");
|
|
16
|
+
var serverConfig = mergeConfig(await getBaseViteConfigWithPlugins(config), mergeConfig(getAdditionalViteConfig(), {
|
|
17
|
+
plugins: [...getReactNativePlugins(config)],
|
|
18
|
+
server: {
|
|
19
|
+
hmr: {
|
|
20
|
+
path: "/__vxrnhmr"
|
|
24
21
|
},
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
22
|
+
host: server.host,
|
|
23
|
+
port: server.port
|
|
24
|
+
},
|
|
25
|
+
root
|
|
26
|
+
}));
|
|
27
|
+
var rerouteNoExternalConfig = (userViteConfig === null || userViteConfig === void 0 ? void 0 : (_userViteConfig_ssr = userViteConfig.ssr) === null || _userViteConfig_ssr === void 0 ? void 0 : _userViteConfig_ssr.noExternal) === true;
|
|
28
|
+
if (rerouteNoExternalConfig) {
|
|
29
|
+
delete userViteConfig.ssr.noExternal;
|
|
30
|
+
}
|
|
29
31
|
var {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
32
|
+
plugins,
|
|
33
|
+
...rest
|
|
34
|
+
} = userViteConfig || {};
|
|
35
|
+
var mergableUserConf = {
|
|
36
|
+
...rest
|
|
37
|
+
};
|
|
38
|
+
serverConfig = mergeUserConfig(optimizeDeps, serverConfig, mergableUserConf);
|
|
39
|
+
if (rerouteNoExternalConfig) {
|
|
40
|
+
serverConfig.ssr.noExternal = true;
|
|
41
|
+
}
|
|
42
|
+
if (process.env.DEBUG) {
|
|
43
|
+
console.debug("merged config:", JSON.stringify(serverConfig, null, 2), `
|
|
37
44
|
----
|
|
38
|
-
`)
|
|
45
|
+
`);
|
|
46
|
+
}
|
|
47
|
+
return serverConfig;
|
|
39
48
|
}
|
|
40
49
|
export { getViteServerConfig };
|
|
41
50
|
//# sourceMappingURL=getViteServerConfig.native.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["mergeConfig","getBaseViteConfigWithPlugins","getOptimizeDeps","mergeUserConfig","getReactNativePlugins","getAdditionalViteConfig","getViteServerConfig","config","userViteConfig","_userViteConfig_ssr","root","server","optimizeDeps","serverConfig","plugins","hmr","path","host","port","rerouteNoExternalConfig","ssr","noExternal","rest","mergableUserConf","process","env","DEBUG","console","debug","JSON","stringify"],"sources":["../../src/config/getViteServerConfig.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAA,QAAuD;AAEhE,SAASC,4BAAA,QAAoC;AAC7C,SAASC,eAAA,QAAuB;AAEhC,SAASC,eAAA,QAAuB;AAEhC,SAASC,qBAAA,QAA6B;AACtC,SAASC,uBAAA,QAA+B;AAMxC,eAAsBC,oBACpBC,MAAA,EACAC,cAAA,EACA;EACA,IAAAC,mBAAqB;
|
|
1
|
+
{"version":3,"names":["mergeConfig","getBaseViteConfigWithPlugins","getOptimizeDeps","mergeUserConfig","getReactNativePlugins","getAdditionalViteConfig","getViteServerConfig","config","userViteConfig","_userViteConfig_ssr","root","server","optimizeDeps","serverConfig","plugins","hmr","path","host","port","rerouteNoExternalConfig","ssr","noExternal","rest","mergableUserConf","process","env","DEBUG","console","debug","JSON","stringify"],"sources":["../../src/config/getViteServerConfig.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAA,QAAuD;AAEhE,SAASC,4BAAA,QAAoC;AAC7C,SAASC,eAAA,QAAuB;AAEhC,SAASC,eAAA,QAAuB;AAEhC,SAASC,qBAAA,QAA6B;AACtC,SAASC,uBAAA,QAA+B;AAMxC,eAAsBC,oBACpBC,MAAA,EACAC,cAAA,EACA;EACA,IAAAC,mBAAqB;EACrB;IAAMC,IAAE;IAAAC;EAAA,IAAaJ,MAAI;EAGzB,IAAI;IAAAK;EAA2B,IAAAV,eAAA;EAAA,IAC7BW,YAAM,GAAAb,WAAA,OAA6BC,4BAAM,CAAAM,MAAA,GAAAP,WAAA,CAAAK,uBAAA;IAEzCS,OAAA,GACE,GAAAV,qBAAa,CAAAG,MAAA,EAA6B;IAClCI,MACN;MAAKI,GAAA,EACH;QACFC,IAAA;MAAA;MACaC,IACb,EAAAN,MAAM,CAAAM,IAAO;MACfC,IAAA,EAAAP,MAAA,CAAAO;IAAA;IAEFR;EACF;EAEA,IAAAS,uBAAM,IAAAX,cAA0B,KAAgB,IAAK,IAAAA,cAAe,wBAAAC,mBAAA,GAAAD,cAAA,CAAAY,GAAA,cAAAX,mBAAA,uBAAAA,mBAAA,CAAAY,UAAA;EACpE,IAAIF,uBAAA,EAAyB;IAC3B,OAAOX,cAAA,CAAeY,GAAA,CAAKC,UAAA;EAC7B;EAMA;IAAMP,OAAE;IAAA,GAASQ;EAAG,IAAKd,cAAI,MAAkB;EAC/C,IAAAe,gBAAM;IACJ,GAAGD;EACL;EAEAT,YAAA,GAAeV,eAAA,CAAgBS,YAAA,EAAcC,YAAA,EAAcU,gBAAgB;EAE3E,IAAIJ,uBAAA,EAAyB;IAC3BN,YAAA,CAAaO,GAAA,CAAKC,UAAA,GAAa;EACjC;EAGA,IAAIG,OAAA,CAAQC,GAAA,CAAIC,KAAA,EAAO;IAErBC,OAAA,CAAQC,KAAA,CAAM,kBAAkBC,IAAA,CAAKC,SAAA,CAAUjB,YAAA,EAAc,MAAM,CAAC,GAAG;AAAA;AAAA,CAAU;EACnF;EAEA,OAAOA,YAAA;AACT","ignoreList":[]}
|
|
@@ -3,17 +3,35 @@ import { coerceToArray } from "../utils/coerceToArray.mjs";
|
|
|
3
3
|
import { uniq } from "../utils/uniq.mjs";
|
|
4
4
|
function mergeUserConfig(optimizeDeps, serverConfig, userViteConfig) {
|
|
5
5
|
if (userViteConfig) {
|
|
6
|
-
|
|
7
|
-
|
|
6
|
+
serverConfig = mergeConfig(serverConfig, userViteConfig);
|
|
7
|
+
if (userViteConfig.css) {
|
|
8
|
+
serverConfig.css = userViteConfig.css;
|
|
9
|
+
}
|
|
10
|
+
if (serverConfig.ssr?.noExternal && serverConfig.ssr.noExternal !== true && !Array.isArray(serverConfig.ssr.noExternal)) {
|
|
11
|
+
throw new Error(`ssr.noExternal must be true or an array`);
|
|
12
|
+
}
|
|
13
|
+
serverConfig.ssr ||= {};
|
|
14
|
+
userViteConfig.ssr ||= {};
|
|
15
|
+
deepMergeOptimizeDeps(serverConfig.ssr, userViteConfig.ssr, optimizeDeps);
|
|
8
16
|
}
|
|
9
17
|
return serverConfig;
|
|
10
18
|
}
|
|
11
|
-
function deepMergeOptimizeDeps(a, b, extraDepsOpt, avoidMergeExternal =
|
|
12
|
-
a.optimizeDeps ||= {}
|
|
19
|
+
function deepMergeOptimizeDeps(a, b, extraDepsOpt, avoidMergeExternal = false) {
|
|
20
|
+
a.optimizeDeps ||= {};
|
|
21
|
+
b.optimizeDeps ||= {};
|
|
13
22
|
const excludeSet = new Set(uniq([...(a.optimizeDeps.exclude || []), ...(b.optimizeDeps.exclude || []), ...(extraDepsOpt?.exclude || [])]));
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
23
|
+
if (!avoidMergeExternal) {
|
|
24
|
+
if (a.noExternal === true || b.noExternal === true) {
|
|
25
|
+
a.noExternal = true;
|
|
26
|
+
} else {
|
|
27
|
+
a.noExternal = uniq([...coerceToArray(a.noExternal || []), ...(a.optimizeDeps.include || []), ...(b.optimizeDeps.include || []), ...coerceToArray(b.noExternal || []), ...(extraDepsOpt?.include || []),
|
|
28
|
+
// TODO at least move to getOptimizeDeps
|
|
29
|
+
"react", "react-dom", "react-dom/server", "react-dom/client"]).filter(dep => typeof dep !== "string" || !excludeSet.has(dep));
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
a.optimizeDeps.exclude = [...excludeSet];
|
|
33
|
+
a.optimizeDeps.include = uniq([...(a.optimizeDeps.include || []), ...(b.optimizeDeps.include || []), ...(extraDepsOpt?.include || [])]).filter(dep => !excludeSet.has(dep));
|
|
34
|
+
a.optimizeDeps.needsInterop = uniq([...(a.optimizeDeps.needsInterop || []), ...(b.optimizeDeps.needsInterop || []), ...(extraDepsOpt?.needsInterop || [])]).filter(dep => !excludeSet.has(dep));
|
|
17
35
|
}
|
|
18
36
|
export { deepMergeOptimizeDeps, mergeUserConfig };
|
|
19
37
|
//# sourceMappingURL=mergeUserConfig.mjs.map
|
|
@@ -1 +1 @@
|
|
|
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"],"sources":["../../src/config/mergeUserConfig.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAA,QAAgE;AACzE,SAASC,aAAA,QAAqB;AAC9B,SAASC,IAAA,QAAY;AAmBd,SAASC,gBACdC,YAAA,EACAC,YAAA,EACAC,cAAA,EACA;EACA,IAAIA,cAAA,EAAgB;
|
|
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"],"sources":["../../src/config/mergeUserConfig.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|