one 1.14.3 → 1.14.4
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/cli/dev.cjs +5 -6
- package/dist/cjs/cli/dev.native.js +7 -7
- package/dist/cjs/cli/dev.native.js.map +1 -1
- package/dist/esm/cli/dev.mjs +5 -6
- package/dist/esm/cli/dev.mjs.map +1 -1
- package/dist/esm/cli/dev.native.js +5 -5
- package/dist/esm/cli/dev.native.js.map +1 -1
- package/env.d.ts +6 -0
- package/package.json +9 -9
- package/src/cli/dev.ts +7 -9
- package/types/cli/dev.d.ts.map +1 -1
package/dist/cjs/cli/dev.cjs
CHANGED
|
@@ -45,8 +45,10 @@ async function dev(args) {
|
|
|
45
45
|
(0, import_label_process.labelProcess)("dev"), (0, import_checkNodeVersion.checkNodeVersion)(), (0, import_setServerGlobals.setServerGlobals)();
|
|
46
46
|
const root = process.cwd();
|
|
47
47
|
let daemonServerId,
|
|
48
|
-
useDaemon = !1
|
|
49
|
-
|
|
48
|
+
useDaemon = !1;
|
|
49
|
+
const forcePort = process.env.ONE_FORCE_PORT ? +process.env.ONE_FORCE_PORT : void 0,
|
|
50
|
+
envPort = process.env.ONE_PORT ? +process.env.ONE_PORT : void 0;
|
|
51
|
+
let effectivePort = forcePort ?? (args.port ? +args.port : void 0) ?? envPort;
|
|
50
52
|
const {
|
|
51
53
|
isDaemonRunning,
|
|
52
54
|
registerWithDaemon,
|
|
@@ -60,10 +62,7 @@ async function dev(args) {
|
|
|
60
62
|
} = await import("../daemon/utils"),
|
|
61
63
|
daemonRunning = await isDaemonRunning(),
|
|
62
64
|
bundleId = getBundleIdFromConfig(root) || path.basename(root);
|
|
63
|
-
|
|
64
|
-
const requestedPort = args.port ? +args.port : null;
|
|
65
|
-
!requestedPort || requestedPort === DAEMON_PORT ? (effectivePort = await getAvailablePort(8082, DAEMON_PORT), console.log(import_picocolors.default.cyan(`[daemon] Detected running daemon on :${DAEMON_PORT}`)), console.log(import_picocolors.default.cyan(`[daemon] Using port :${effectivePort} for this server`)), useDaemon = !0) : effectivePort = requestedPort;
|
|
66
|
-
}
|
|
65
|
+
daemonRunning && (!effectivePort || effectivePort === DAEMON_PORT) && (effectivePort = await getAvailablePort(8082, DAEMON_PORT), console.log(import_picocolors.default.cyan(`[daemon] Detected running daemon on :${DAEMON_PORT}`)), console.log(import_picocolors.default.cyan(`[daemon] Using port :${effectivePort} for this server`)), useDaemon = !0);
|
|
67
66
|
const {
|
|
68
67
|
dev: dev2
|
|
69
68
|
} = await import("vxrn/dev"),
|
|
@@ -41,14 +41,17 @@ var path = __toESM(require("path"), 1),
|
|
|
41
41
|
import_setServerGlobals = require("../server/setServerGlobals.native.js"),
|
|
42
42
|
import_virtualEntryConstants = require("../vite/plugins/virtualEntryConstants.native.js"),
|
|
43
43
|
import_checkNodeVersion = require("./checkNodeVersion.native.js"),
|
|
44
|
-
import_label_process = require("./label-process.native.js")
|
|
45
|
-
|
|
44
|
+
import_label_process = require("./label-process.native.js"),
|
|
45
|
+
DAEMON_PORT = 8081;
|
|
46
46
|
async function dev(args) {
|
|
47
|
+
var _ref;
|
|
47
48
|
(0, import_label_process.labelProcess)("dev"), (0, import_checkNodeVersion.checkNodeVersion)(), (0, import_setServerGlobals.setServerGlobals)();
|
|
48
49
|
var root = process.cwd(),
|
|
49
50
|
daemonServerId,
|
|
50
51
|
useDaemon = !1,
|
|
51
|
-
|
|
52
|
+
forcePort = process.env.ONE_FORCE_PORT ? +process.env.ONE_FORCE_PORT : void 0,
|
|
53
|
+
envPort = process.env.ONE_PORT ? +process.env.ONE_PORT : void 0,
|
|
54
|
+
effectivePort = (_ref = forcePort ?? (args.port ? +args.port : void 0)) !== null && _ref !== void 0 ? _ref : envPort,
|
|
52
55
|
{
|
|
53
56
|
isDaemonRunning,
|
|
54
57
|
registerWithDaemon,
|
|
@@ -62,10 +65,7 @@ async function dev(args) {
|
|
|
62
65
|
} = await import("../daemon/utils"),
|
|
63
66
|
daemonRunning = await isDaemonRunning(),
|
|
64
67
|
bundleId = getBundleIdFromConfig(root) || path.basename(root);
|
|
65
|
-
|
|
66
|
-
var requestedPort = args.port ? +args.port : null;
|
|
67
|
-
!requestedPort || requestedPort === DAEMON_PORT ? (effectivePort = await getAvailablePort(8082, DAEMON_PORT), console.log(import_picocolors.default.cyan(`[daemon] Detected running daemon on :${DAEMON_PORT}`)), console.log(import_picocolors.default.cyan(`[daemon] Using port :${effectivePort} for this server`)), useDaemon = !0) : effectivePort = requestedPort;
|
|
68
|
-
}
|
|
68
|
+
daemonRunning && (!effectivePort || effectivePort === DAEMON_PORT) && (effectivePort = await getAvailablePort(8082, DAEMON_PORT), console.log(import_picocolors.default.cyan(`[daemon] Detected running daemon on :${DAEMON_PORT}`)), console.log(import_picocolors.default.cyan(`[daemon] Using port :${effectivePort} for this server`)), useDaemon = !0);
|
|
69
69
|
var {
|
|
70
70
|
dev: dev2
|
|
71
71
|
} = await import("vxrn/dev"),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","dev_exports","__export","dev","module","exports","path","__toESM","require","import_picocolors","import_setServerGlobals","import_virtualEntryConstants","import_checkNodeVersion","import_label_process","DAEMON_PORT","args","labelProcess","checkNodeVersion","setServerGlobals","root","process","cwd","daemonServerId","useDaemon","effectivePort","port","isDaemonRunning","registerWithDaemon","unregisterFromDaemon","writeServerFile","removeServerFile","getBundleIdFromConfig","getAvailablePort","daemonRunning","bundleId","basename","
|
|
1
|
+
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","dev_exports","__export","dev","module","exports","path","__toESM","require","import_picocolors","import_setServerGlobals","import_virtualEntryConstants","import_checkNodeVersion","import_label_process","DAEMON_PORT","args","_ref","labelProcess","checkNodeVersion","setServerGlobals","root","process","cwd","daemonServerId","useDaemon","forcePort","env","ONE_FORCE_PORT","envPort","ONE_PORT","effectivePort","port","isDaemonRunning","registerWithDaemon","unregisterFromDaemon","writeServerFile","removeServerFile","getBundleIdFromConfig","getAvailablePort","daemonRunning","bundleId","basename","console","log","default","cyan","dev2","start","stop","mode","clean","debugBundle","debug","extraConfig","server","host","entries","native","virtualEntryIdNative","closePromise","green","pid","err","yellow","cleanup","on","exit","error","message"],"sources":["../../../src/cli/dev.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/dist/esm/cli/dev.mjs
CHANGED
|
@@ -9,8 +9,10 @@ async function dev(args) {
|
|
|
9
9
|
labelProcess("dev"), checkNodeVersion(), setServerGlobals();
|
|
10
10
|
const root = process.cwd();
|
|
11
11
|
let daemonServerId,
|
|
12
|
-
useDaemon = !1
|
|
13
|
-
|
|
12
|
+
useDaemon = !1;
|
|
13
|
+
const forcePort = process.env.ONE_FORCE_PORT ? +process.env.ONE_FORCE_PORT : void 0,
|
|
14
|
+
envPort = process.env.ONE_PORT ? +process.env.ONE_PORT : void 0;
|
|
15
|
+
let effectivePort = forcePort ?? (args.port ? +args.port : void 0) ?? envPort;
|
|
14
16
|
const {
|
|
15
17
|
isDaemonRunning,
|
|
16
18
|
registerWithDaemon,
|
|
@@ -24,10 +26,7 @@ async function dev(args) {
|
|
|
24
26
|
} = await import("../daemon/utils.mjs"),
|
|
25
27
|
daemonRunning = await isDaemonRunning(),
|
|
26
28
|
bundleId = getBundleIdFromConfig(root) || path.basename(root);
|
|
27
|
-
|
|
28
|
-
const requestedPort = args.port ? +args.port : null;
|
|
29
|
-
!requestedPort || requestedPort === DAEMON_PORT ? (effectivePort = await getAvailablePort(8082, DAEMON_PORT), console.log(colors.cyan(`[daemon] Detected running daemon on :${DAEMON_PORT}`)), console.log(colors.cyan(`[daemon] Using port :${effectivePort} for this server`)), useDaemon = !0) : effectivePort = requestedPort;
|
|
30
|
-
}
|
|
29
|
+
daemonRunning && (!effectivePort || effectivePort === DAEMON_PORT) && (effectivePort = await getAvailablePort(8082, DAEMON_PORT), console.log(colors.cyan(`[daemon] Detected running daemon on :${DAEMON_PORT}`)), console.log(colors.cyan(`[daemon] Using port :${effectivePort} for this server`)), useDaemon = !0);
|
|
31
30
|
const {
|
|
32
31
|
dev: dev2
|
|
33
32
|
} = await import("vxrn/dev"),
|
package/dist/esm/cli/dev.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["path","colors","setServerGlobals","virtualEntryIdNative","checkNodeVersion","labelProcess","DAEMON_PORT","dev","args","root","process","cwd","daemonServerId","useDaemon","effectivePort","port","isDaemonRunning","registerWithDaemon","unregisterFromDaemon","writeServerFile","removeServerFile","getBundleIdFromConfig","getAvailablePort","daemonRunning","bundleId","basename","
|
|
1
|
+
{"version":3,"names":["path","colors","setServerGlobals","virtualEntryIdNative","checkNodeVersion","labelProcess","DAEMON_PORT","dev","args","root","process","cwd","daemonServerId","useDaemon","forcePort","env","ONE_FORCE_PORT","envPort","ONE_PORT","effectivePort","port","isDaemonRunning","registerWithDaemon","unregisterFromDaemon","writeServerFile","removeServerFile","getBundleIdFromConfig","getAvailablePort","daemonRunning","bundleId","basename","console","log","cyan","dev2","start","stop","mode","clean","debugBundle","debug","extraConfig","server","host","entries","native","closePromise","green","pid","err","yellow","cleanup","on","exit","error","message"],"sources":["../../../src/cli/dev.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -6,11 +6,14 @@ import { checkNodeVersion } from "./checkNodeVersion.native.js";
|
|
|
6
6
|
import { labelProcess } from "./label-process.native.js";
|
|
7
7
|
var DAEMON_PORT = 8081;
|
|
8
8
|
async function dev(args) {
|
|
9
|
+
var _ref;
|
|
9
10
|
labelProcess("dev"), checkNodeVersion(), setServerGlobals();
|
|
10
11
|
var root = process.cwd(),
|
|
11
12
|
daemonServerId,
|
|
12
13
|
useDaemon = !1,
|
|
13
|
-
|
|
14
|
+
forcePort = process.env.ONE_FORCE_PORT ? +process.env.ONE_FORCE_PORT : void 0,
|
|
15
|
+
envPort = process.env.ONE_PORT ? +process.env.ONE_PORT : void 0,
|
|
16
|
+
effectivePort = (_ref = forcePort ?? (args.port ? +args.port : void 0)) !== null && _ref !== void 0 ? _ref : envPort,
|
|
14
17
|
{
|
|
15
18
|
isDaemonRunning,
|
|
16
19
|
registerWithDaemon,
|
|
@@ -24,10 +27,7 @@ async function dev(args) {
|
|
|
24
27
|
} = await import("../daemon/utils.native.js"),
|
|
25
28
|
daemonRunning = await isDaemonRunning(),
|
|
26
29
|
bundleId = getBundleIdFromConfig(root) || path.basename(root);
|
|
27
|
-
|
|
28
|
-
var requestedPort = args.port ? +args.port : null;
|
|
29
|
-
!requestedPort || requestedPort === DAEMON_PORT ? (effectivePort = await getAvailablePort(8082, DAEMON_PORT), console.log(colors.cyan(`[daemon] Detected running daemon on :${DAEMON_PORT}`)), console.log(colors.cyan(`[daemon] Using port :${effectivePort} for this server`)), useDaemon = !0) : effectivePort = requestedPort;
|
|
30
|
-
}
|
|
30
|
+
daemonRunning && (!effectivePort || effectivePort === DAEMON_PORT) && (effectivePort = await getAvailablePort(8082, DAEMON_PORT), console.log(colors.cyan(`[daemon] Detected running daemon on :${DAEMON_PORT}`)), console.log(colors.cyan(`[daemon] Using port :${effectivePort} for this server`)), useDaemon = !0);
|
|
31
31
|
var {
|
|
32
32
|
dev: dev2
|
|
33
33
|
} = await import("vxrn/dev"),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["path","colors","setServerGlobals","virtualEntryIdNative","checkNodeVersion","labelProcess","DAEMON_PORT","dev","args","root","process","cwd","daemonServerId","useDaemon","effectivePort","port","isDaemonRunning","registerWithDaemon","unregisterFromDaemon","writeServerFile","removeServerFile","getBundleIdFromConfig","getAvailablePort","daemonRunning","bundleId","basename","
|
|
1
|
+
{"version":3,"names":["path","colors","setServerGlobals","virtualEntryIdNative","checkNodeVersion","labelProcess","DAEMON_PORT","dev","args","_ref","root","process","cwd","daemonServerId","useDaemon","forcePort","env","ONE_FORCE_PORT","envPort","ONE_PORT","effectivePort","port","isDaemonRunning","registerWithDaemon","unregisterFromDaemon","writeServerFile","removeServerFile","getBundleIdFromConfig","getAvailablePort","daemonRunning","bundleId","basename","console","log","cyan","dev2","start","stop","mode","clean","debugBundle","debug","extraConfig","server","host","entries","native","closePromise","green","pid","err","yellow","cleanup","on","exit","error","message"],"sources":["../../../src/cli/dev.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/env.d.ts
CHANGED
|
@@ -1,6 +1,12 @@
|
|
|
1
1
|
/// <reference types="vite/client" />
|
|
2
2
|
|
|
3
3
|
interface OneEnvVariables {
|
|
4
|
+
// Server
|
|
5
|
+
/** Set the port for both dev and serve. Lower priority than --port CLI flag. */
|
|
6
|
+
ONE_PORT: string
|
|
7
|
+
/** Override the port for both dev and serve. Takes precedence over --port and ONE_PORT. */
|
|
8
|
+
ONE_FORCE_PORT: string
|
|
9
|
+
|
|
4
10
|
// Core One variables
|
|
5
11
|
/** Random number for each production build, or stable per dev server run. Useful for cache keys. */
|
|
6
12
|
ONE_CACHE_KEY: string
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "one",
|
|
3
|
-
"version": "1.14.
|
|
3
|
+
"version": "1.14.4",
|
|
4
4
|
"license": "BSD-3-Clause",
|
|
5
5
|
"sideEffects": [
|
|
6
6
|
"setup.mjs",
|
|
@@ -165,17 +165,17 @@
|
|
|
165
165
|
"@react-navigation/routers": "~7.5.3",
|
|
166
166
|
"@swc/core": "^1.14.0",
|
|
167
167
|
"@ungap/structured-clone": "^1.2.0",
|
|
168
|
-
"@vxrn/color-scheme": "1.14.
|
|
169
|
-
"@vxrn/compiler": "1.14.
|
|
170
|
-
"@vxrn/resolve": "1.14.
|
|
171
|
-
"@vxrn/tslib-lite": "1.14.
|
|
172
|
-
"@vxrn/use-isomorphic-layout-effect": "1.14.
|
|
173
|
-
"@vxrn/vite-plugin-metro": "1.14.
|
|
168
|
+
"@vxrn/color-scheme": "1.14.4",
|
|
169
|
+
"@vxrn/compiler": "1.14.4",
|
|
170
|
+
"@vxrn/resolve": "1.14.4",
|
|
171
|
+
"@vxrn/tslib-lite": "1.14.4",
|
|
172
|
+
"@vxrn/use-isomorphic-layout-effect": "1.14.4",
|
|
173
|
+
"@vxrn/vite-plugin-metro": "1.14.4",
|
|
174
174
|
"babel-dead-code-elimination": "1.0.10",
|
|
175
175
|
"babel-plugin-module-resolver": "^5.0.2",
|
|
176
176
|
"citty": "^0.1.6",
|
|
177
177
|
"core-js": "^3.38.1",
|
|
178
|
-
"create-vxrn": "1.14.
|
|
178
|
+
"create-vxrn": "1.14.4",
|
|
179
179
|
"escape-string-regexp": "^5.0.0",
|
|
180
180
|
"expo-linking": "~55.0.7",
|
|
181
181
|
"expo-modules-core": "~55.0.16",
|
|
@@ -195,7 +195,7 @@
|
|
|
195
195
|
"ts-pattern": "^5.6.2",
|
|
196
196
|
"use-latest-callback": "^0.2.3",
|
|
197
197
|
"vite": "^8.0.0",
|
|
198
|
-
"vxrn": "1.14.
|
|
198
|
+
"vxrn": "1.14.4",
|
|
199
199
|
"ws": "^8.18.0",
|
|
200
200
|
"xxhashjs": "^0.2.2"
|
|
201
201
|
},
|
package/src/cli/dev.ts
CHANGED
|
@@ -5,7 +5,6 @@ import { virtualEntryIdNative } from '../vite/plugins/virtualEntryConstants'
|
|
|
5
5
|
import { checkNodeVersion } from './checkNodeVersion'
|
|
6
6
|
import { labelProcess } from './label-process'
|
|
7
7
|
|
|
8
|
-
const DEFAULT_PORT = 8081
|
|
9
8
|
const DAEMON_PORT = 8081
|
|
10
9
|
|
|
11
10
|
export async function dev(args: {
|
|
@@ -25,8 +24,11 @@ export async function dev(args: {
|
|
|
25
24
|
const root = process.cwd()
|
|
26
25
|
let daemonServerId: string | undefined
|
|
27
26
|
let useDaemon = false
|
|
28
|
-
//
|
|
29
|
-
|
|
27
|
+
// port priority: ONE_FORCE_PORT > --port > ONE_PORT > default
|
|
28
|
+
const forcePort = process.env.ONE_FORCE_PORT ? +process.env.ONE_FORCE_PORT : undefined
|
|
29
|
+
const envPort = process.env.ONE_PORT ? +process.env.ONE_PORT : undefined
|
|
30
|
+
let effectivePort: number | undefined =
|
|
31
|
+
forcePort ?? (args.port ? +args.port : undefined) ?? envPort
|
|
30
32
|
|
|
31
33
|
// check if daemon is running
|
|
32
34
|
const {
|
|
@@ -43,19 +45,15 @@ export async function dev(args: {
|
|
|
43
45
|
const bundleId = getBundleIdFromConfig(root) || path.basename(root)
|
|
44
46
|
|
|
45
47
|
if (daemonRunning) {
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
if (!requestedPort || requestedPort === DAEMON_PORT) {
|
|
48
|
+
if (!effectivePort || effectivePort === DAEMON_PORT) {
|
|
49
49
|
// no port specified, or user requested the daemon port - use daemon mode
|
|
50
50
|
effectivePort = await getAvailablePort(8082, DAEMON_PORT)
|
|
51
51
|
|
|
52
52
|
console.log(colors.cyan(`[daemon] Detected running daemon on :${DAEMON_PORT}`))
|
|
53
53
|
console.log(colors.cyan(`[daemon] Using port :${effectivePort} for this server`))
|
|
54
54
|
useDaemon = true
|
|
55
|
-
} else {
|
|
56
|
-
// user requested a specific non-daemon port, use it directly without daemon
|
|
57
|
-
effectivePort = requestedPort
|
|
58
55
|
}
|
|
56
|
+
// otherwise, explicit port (CLI or env) takes precedence — skip daemon
|
|
59
57
|
}
|
|
60
58
|
|
|
61
59
|
const { dev } = await import('vxrn/dev')
|
package/types/cli/dev.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/cli/dev.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/cli/dev.ts"],"names":[],"mappings":"AASA,wBAAsB,GAAG,CAAC,IAAI,EAAE;IAC9B,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,IAAI,CAAC,EAAE,aAAa,GAAG,YAAY,CAAA;IACnC,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB,iBA6HA"}
|