one 1.17.1 → 1.17.3
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/babel-preset/index.native.js.map +1 -1
- package/dist/cjs/babel-preset/index.test.native.js.map +1 -1
- package/dist/cjs/babel-preset/integration.test.native.js.map +1 -1
- package/dist/cjs/cli/build.cjs +18 -12
- package/dist/cjs/cli/build.native.js +18 -12
- package/dist/cjs/cli/build.native.js.map +1 -1
- package/dist/cjs/cli/generateBundlerConfig.native.js.map +1 -1
- package/dist/cjs/cli/generateBundlerConfig.test.native.js.map +1 -1
- package/dist/cjs/cli/patch.test.native.js.map +1 -1
- package/dist/cjs/metro-config/withOne.native.js.map +1 -1
- package/dist/cjs/metro-config/withOne.test.native.js.map +1 -1
- package/dist/esm/babel-preset/index.mjs.map +1 -1
- package/dist/esm/babel-preset/index.native.js.map +1 -1
- package/dist/esm/babel-preset/index.test.mjs.map +1 -1
- package/dist/esm/babel-preset/index.test.native.js.map +1 -1
- package/dist/esm/babel-preset/integration.test.mjs.map +1 -1
- package/dist/esm/babel-preset/integration.test.native.js.map +1 -1
- package/dist/esm/cli/build.mjs +18 -12
- package/dist/esm/cli/build.mjs.map +1 -1
- package/dist/esm/cli/build.native.js +18 -12
- package/dist/esm/cli/build.native.js.map +1 -1
- package/dist/esm/cli/generateBundlerConfig.mjs.map +1 -1
- package/dist/esm/cli/generateBundlerConfig.native.js.map +1 -1
- package/dist/esm/cli/generateBundlerConfig.test.mjs.map +1 -1
- package/dist/esm/cli/generateBundlerConfig.test.native.js.map +1 -1
- package/dist/esm/cli/patch.test.mjs.map +1 -1
- package/dist/esm/cli/patch.test.native.js.map +1 -1
- package/dist/esm/fork/useLinking.mjs.map +1 -1
- package/dist/esm/metro-config/withOne.mjs.map +1 -1
- package/dist/esm/metro-config/withOne.native.js.map +1 -1
- package/dist/esm/metro-config/withOne.test.mjs.map +1 -1
- package/dist/esm/metro-config/withOne.test.native.js.map +1 -1
- package/package.json +10 -10
- package/src/babel-preset/index.test.ts +3 -1
- package/src/babel-preset/index.ts +9 -2
- package/src/babel-preset/integration.test.ts +3 -1
- package/src/cli/build.ts +25 -15
- package/src/cli/generateBundlerConfig.test.ts +4 -3
- package/src/cli/generateBundlerConfig.ts +11 -13
- package/src/cli/patch.test.ts +3 -1
- package/src/fork/useLinking.ts +2 -9
- package/src/metro-config/withOne.test.ts +1 -3
- package/src/metro-config/withOne.ts +4 -7
- package/types/babel-preset/index.d.ts.map +1 -1
- package/types/cli/build.d.ts.map +1 -1
- package/types/cli/generateBundlerConfig.d.ts.map +1 -1
- package/types/fork/useLinking.d.ts.map +1 -1
- package/types/metro-config/withOne.d.ts.map +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["path","fs","afterAll","describe","expect","it","withOne","_type_of","obj","Symbol","constructor","projectRoot","resolve","__dirname","tmpDirs","createOneFixtureProject","workspaceRoot","tmpDir","mkdtempSync","join","push","writeFileSync","JSON","stringify","name","private","compilerOptions","paths","mkdirSync","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","iterator","_step","next","done","value","rmSync","recursive","force","err","return","config","loadViteConfig","toBeTruthy","resolver"
|
|
1
|
+
{"version":3,"names":["path","fs","afterAll","describe","expect","it","withOne","_type_of","obj","Symbol","constructor","projectRoot","resolve","__dirname","tmpDirs","createOneFixtureProject","workspaceRoot","tmpDir","mkdtempSync","join","push","writeFileSync","JSON","stringify","name","private","compilerOptions","paths","mkdirSync","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","iterator","_step","next","done","value","rmSync","recursive","force","err","return","config","loadViteConfig","toBeTruthy","resolver"],"sources":["../../../src/metro-config/withOne.test.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "one",
|
|
3
|
-
"version": "1.17.
|
|
3
|
+
"version": "1.17.3",
|
|
4
4
|
"license": "BSD-3-Clause",
|
|
5
5
|
"sideEffects": [
|
|
6
6
|
"setup.mjs",
|
|
@@ -180,18 +180,18 @@
|
|
|
180
180
|
"@cloudflare/vite-plugin": "^1.33.1",
|
|
181
181
|
"@swc/core": "^1.14.0",
|
|
182
182
|
"@ungap/structured-clone": "^1.2.0",
|
|
183
|
-
"@vxrn/color-scheme": "1.17.
|
|
184
|
-
"@vxrn/compiler": "1.17.
|
|
185
|
-
"@vxrn/resolve": "1.17.
|
|
186
|
-
"@vxrn/tslib-lite": "1.17.
|
|
187
|
-
"@vxrn/use-isomorphic-layout-effect": "1.17.
|
|
188
|
-
"@vxrn/vite-plugin-metro": "1.17.
|
|
183
|
+
"@vxrn/color-scheme": "1.17.3",
|
|
184
|
+
"@vxrn/compiler": "1.17.3",
|
|
185
|
+
"@vxrn/resolve": "1.17.3",
|
|
186
|
+
"@vxrn/tslib-lite": "1.17.3",
|
|
187
|
+
"@vxrn/use-isomorphic-layout-effect": "1.17.3",
|
|
188
|
+
"@vxrn/vite-plugin-metro": "1.17.3",
|
|
189
189
|
"babel-dead-code-elimination": "1.0.10",
|
|
190
190
|
"babel-plugin-module-resolver": "^5.0.2",
|
|
191
191
|
"babel-preset-expo": "*",
|
|
192
192
|
"citty": "^0.1.6",
|
|
193
193
|
"core-js": "^3.38.1",
|
|
194
|
-
"create-vxrn": "1.17.
|
|
194
|
+
"create-vxrn": "1.17.3",
|
|
195
195
|
"escape-string-regexp": "^5.0.0",
|
|
196
196
|
"expo-linking": "~55.0.7",
|
|
197
197
|
"expo-modules-core": "~55.0.16",
|
|
@@ -211,7 +211,7 @@
|
|
|
211
211
|
"tsconfig-paths": "^4",
|
|
212
212
|
"use-latest-callback": "^0.2.3",
|
|
213
213
|
"vite": "^8.0.0",
|
|
214
|
-
"vxrn": "1.17.
|
|
214
|
+
"vxrn": "1.17.3",
|
|
215
215
|
"ws": "^8.18.0",
|
|
216
216
|
"xxhashjs": "^0.2.2"
|
|
217
217
|
},
|
|
@@ -266,7 +266,7 @@
|
|
|
266
266
|
"react": "19.2.0",
|
|
267
267
|
"react-dom": "19.2.0",
|
|
268
268
|
"react-native": "0.83.2",
|
|
269
|
-
"rolldown": "^1.0.
|
|
269
|
+
"rolldown": "^1.0.1",
|
|
270
270
|
"sharp": "^0.34.5",
|
|
271
271
|
"typescript": "^5.7.3",
|
|
272
272
|
"vitest": "^4.1.0"
|
|
@@ -116,7 +116,9 @@ describe('buildOneBabelPlugins', () => {
|
|
|
116
116
|
ONE_SETUP_FILE_NATIVE: undefined,
|
|
117
117
|
})
|
|
118
118
|
expect(typeof oneRouterMetro[1].ONE_ROUTER_APP_ROOT_RELATIVE_TO_ENTRY).toBe('string')
|
|
119
|
-
expect(typeof oneRouterMetro[1].ONE_ROUTER_REQUIRE_CONTEXT_REGEX_STRING).toBe(
|
|
119
|
+
expect(typeof oneRouterMetro[1].ONE_ROUTER_REQUIRE_CONTEXT_REGEX_STRING).toBe(
|
|
120
|
+
'string'
|
|
121
|
+
)
|
|
120
122
|
|
|
121
123
|
expect(plugins[4]).toBe('one/babel-plugin-inline-one-server-url')
|
|
122
124
|
})
|
|
@@ -203,7 +203,11 @@ function buildStandaloneImportMetaEnv(): Record<string, unknown> {
|
|
|
203
203
|
SSR: false,
|
|
204
204
|
}
|
|
205
205
|
for (const [key, value] of Object.entries(process.env)) {
|
|
206
|
-
if (
|
|
206
|
+
if (
|
|
207
|
+
key.startsWith('EXPO_PUBLIC_') ||
|
|
208
|
+
key.startsWith('ONE_') ||
|
|
209
|
+
key.startsWith('VITE_')
|
|
210
|
+
) {
|
|
207
211
|
env[key] = value
|
|
208
212
|
}
|
|
209
213
|
}
|
|
@@ -241,7 +245,10 @@ export function buildRouterRequireContextRegexString(
|
|
|
241
245
|
: `Unsupported regex "${reSource}" in "ignoredRouteFiles".`
|
|
242
246
|
)
|
|
243
247
|
}
|
|
244
|
-
const inner = reSource.slice(
|
|
248
|
+
const inner = reSource.slice(
|
|
249
|
+
mustStartWith.length,
|
|
250
|
+
reSource.length - mustEndWith.length
|
|
251
|
+
)
|
|
245
252
|
// biome-ignore lint/complexity/noUselessStringRaw: keep original code
|
|
246
253
|
return String.raw`(?:.*${inner})`
|
|
247
254
|
})
|
|
@@ -63,7 +63,9 @@ describe('one/babel-preset integration', () => {
|
|
|
63
63
|
|
|
64
64
|
expect(result?.code).toBeTruthy()
|
|
65
65
|
// placeholders must be replaced
|
|
66
|
-
expect(result?.code).not.toContain(
|
|
66
|
+
expect(result?.code).not.toContain(
|
|
67
|
+
'process.env.ONE_ROUTER_APP_ROOT_RELATIVE_TO_ENTRY'
|
|
68
|
+
)
|
|
67
69
|
expect(result?.code).not.toContain('process.env.ONE_ROUTER_ROOT_FOLDER_NAME')
|
|
68
70
|
expect(result?.code).not.toContain(
|
|
69
71
|
'process.env.ONE_ROUTER_REQUIRE_CONTEXT_REGEX_STRING'
|
package/src/cli/build.ts
CHANGED
|
@@ -272,21 +272,30 @@ import {
|
|
|
272
272
|
|
|
273
273
|
installPrepareStackTraceGuard()
|
|
274
274
|
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
})
|
|
275
|
+
// these handlers must only attach when `build` is actually invoked. attaching
|
|
276
|
+
// them at module load leaks into `one dev`, because `one/vite` re-exports from
|
|
277
|
+
// this file — and dev intentionally does NOT exit on unhandled rejection (see
|
|
278
|
+
// dev.ts). a stray rejection from expo's manifest middleware (client closing
|
|
279
|
+
// the connection mid-stream) was killing the dev server.
|
|
280
|
+
let buildErrorHandlersInstalled = false
|
|
281
|
+
function installBuildErrorHandlers() {
|
|
282
|
+
if (buildErrorHandlersInstalled) return
|
|
283
|
+
buildErrorHandlersInstalled = true
|
|
284
|
+
process.on('uncaughtException', (err) => {
|
|
285
|
+
try {
|
|
286
|
+
process.stderr.write(`[one build] uncaught exception\n${formatErrorSafely(err)}\n`)
|
|
287
|
+
} catch {}
|
|
288
|
+
process.exit(1)
|
|
289
|
+
})
|
|
290
|
+
process.on('unhandledRejection', (reason) => {
|
|
291
|
+
try {
|
|
292
|
+
process.stderr.write(
|
|
293
|
+
`[one build] unhandled rejection\n${formatErrorSafely(reason)}\n`
|
|
294
|
+
)
|
|
295
|
+
} catch {}
|
|
296
|
+
process.exit(1)
|
|
297
|
+
})
|
|
298
|
+
}
|
|
290
299
|
|
|
291
300
|
const HOOK_KEYS = [
|
|
292
301
|
'resolveId',
|
|
@@ -327,6 +336,7 @@ export async function build(args: {
|
|
|
327
336
|
platform?: 'ios' | 'web' | 'android'
|
|
328
337
|
skipEnv?: boolean
|
|
329
338
|
}) {
|
|
339
|
+
installBuildErrorHandlers()
|
|
330
340
|
process.env.IS_VXRN_CLI = 'true'
|
|
331
341
|
|
|
332
342
|
// set NODE_ENV, do before loading vite.config (see loadConfigFromFile)
|
|
@@ -51,7 +51,7 @@ describe('generateBundlerConfig', () => {
|
|
|
51
51
|
it('refuses to overwrite a customized file without --force', () => {
|
|
52
52
|
fs.writeFileSync(
|
|
53
53
|
path.join(tmpDir, 'babel.config.cjs'),
|
|
54
|
-
|
|
54
|
+
'// hand-written\nmodule.exports = { presets: [] }\n'
|
|
55
55
|
)
|
|
56
56
|
|
|
57
57
|
const { ok, results } = generateBundlerConfig({ cwd: tmpDir, quiet: true })
|
|
@@ -68,7 +68,7 @@ describe('generateBundlerConfig', () => {
|
|
|
68
68
|
it('overwrites a customized file when --force is set', () => {
|
|
69
69
|
fs.writeFileSync(
|
|
70
70
|
path.join(tmpDir, 'babel.config.cjs'),
|
|
71
|
-
|
|
71
|
+
'// hand-written\nmodule.exports = { presets: [] }\n'
|
|
72
72
|
)
|
|
73
73
|
|
|
74
74
|
const { results } = generateBundlerConfig({
|
|
@@ -181,7 +181,8 @@ describe('generateBundlerConfig', () => {
|
|
|
181
181
|
|
|
182
182
|
const { results } = generateBundlerConfig({ cwd: tmpDir, quiet: true })
|
|
183
183
|
const babelResult = results.find(
|
|
184
|
-
(r) =>
|
|
184
|
+
(r) =>
|
|
185
|
+
r.filePath.endsWith('babel.config.js') || r.filePath.endsWith('babel.config.cjs')
|
|
185
186
|
)!
|
|
186
187
|
|
|
187
188
|
expect(babelResult.action).toBe('skipped-other-format')
|
|
@@ -83,10 +83,7 @@ module.exports = withOne(__dirname, oneBundlerOptions)
|
|
|
83
83
|
|
|
84
84
|
type FileSpec = {
|
|
85
85
|
name: string
|
|
86
|
-
getContent: (args: {
|
|
87
|
-
eject: boolean
|
|
88
|
-
options: OneBundlerConfigOptions
|
|
89
|
-
}) => string
|
|
86
|
+
getContent: (args: { eject: boolean; options: OneBundlerConfigOptions }) => string
|
|
90
87
|
conflicting: readonly string[]
|
|
91
88
|
}
|
|
92
89
|
|
|
@@ -180,7 +177,13 @@ export type GenerateBundlerConfigArgs = {
|
|
|
180
177
|
|
|
181
178
|
export type FileResult = {
|
|
182
179
|
filePath: string
|
|
183
|
-
action:
|
|
180
|
+
action:
|
|
181
|
+
| 'wrote'
|
|
182
|
+
| 'kept'
|
|
183
|
+
| 'skipped-customized'
|
|
184
|
+
| 'skipped-other-format'
|
|
185
|
+
| 'would-write'
|
|
186
|
+
| 'would-overwrite'
|
|
184
187
|
reason?: string
|
|
185
188
|
}
|
|
186
189
|
|
|
@@ -288,9 +291,7 @@ export function generateBundlerConfig(args: GenerateBundlerConfigArgs = {}): {
|
|
|
288
291
|
'skipped-customized',
|
|
289
292
|
])
|
|
290
293
|
const ok = (check ? acceptableInCheck : acceptableAlways).size
|
|
291
|
-
? results.every((r) =>
|
|
292
|
-
(check ? acceptableInCheck : acceptableAlways).has(r.action)
|
|
293
|
-
)
|
|
294
|
+
? results.every((r) => (check ? acceptableInCheck : acceptableAlways).has(r.action))
|
|
294
295
|
: false
|
|
295
296
|
|
|
296
297
|
return { results, ok }
|
|
@@ -307,8 +308,7 @@ export function generateBundlerConfig(args: GenerateBundlerConfigArgs = {}): {
|
|
|
307
308
|
* publish from a local machine.
|
|
308
309
|
*/
|
|
309
310
|
export function isCiEnvironment(): boolean {
|
|
310
|
-
const truthy = (v: string | undefined) =>
|
|
311
|
-
!!v && v !== 'false' && v !== '0'
|
|
311
|
+
const truthy = (v: string | undefined) => !!v && v !== 'false' && v !== '0'
|
|
312
312
|
return truthy(process.env.EAS_BUILD) || truthy(process.env.CI)
|
|
313
313
|
}
|
|
314
314
|
|
|
@@ -328,9 +328,7 @@ export function maybeGenerateBundlerConfigOnInstall(
|
|
|
328
328
|
// detect expo-updates via the project's own resolver — same check used
|
|
329
329
|
// by the vxrn expo-plugin and one prebuild
|
|
330
330
|
try {
|
|
331
|
-
nodeModule
|
|
332
|
-
.createRequire(cwd + '/')
|
|
333
|
-
.resolve('expo-updates/package.json')
|
|
331
|
+
nodeModule.createRequire(cwd + '/').resolve('expo-updates/package.json')
|
|
334
332
|
} catch {
|
|
335
333
|
return
|
|
336
334
|
}
|
package/src/cli/patch.test.ts
CHANGED
|
@@ -22,7 +22,9 @@ describe('one patch', () => {
|
|
|
22
22
|
|
|
23
23
|
it('applies built-in patches when a native-only app has no vite config', async () => {
|
|
24
24
|
loadUserOneOptionsMock.mockRejectedValueOnce(
|
|
25
|
-
new Error(
|
|
25
|
+
new Error(
|
|
26
|
+
'No config config in /tmp/native-only-app. Is this the correct directory?'
|
|
27
|
+
)
|
|
26
28
|
)
|
|
27
29
|
|
|
28
30
|
await run({})
|
package/src/fork/useLinking.ts
CHANGED
|
@@ -96,10 +96,7 @@ function currentUrlHasDynamicParams(
|
|
|
96
96
|
const currentPath = window.location.pathname + window.location.search
|
|
97
97
|
const currentState = getStateFromPath(currentPath, config)
|
|
98
98
|
const currentRoute = currentState ? findFocusedRoute(currentState) : undefined
|
|
99
|
-
return (
|
|
100
|
-
currentRoute?.name === route.name &&
|
|
101
|
-
!hasMissingDynamicParams(currentRoute)
|
|
102
|
-
)
|
|
99
|
+
return currentRoute?.name === route.name && !hasMissingDynamicParams(currentRoute)
|
|
103
100
|
}
|
|
104
101
|
|
|
105
102
|
/**
|
|
@@ -655,11 +652,7 @@ export function useLinking(
|
|
|
655
652
|
if (
|
|
656
653
|
route &&
|
|
657
654
|
hasMissingDynamicParams(route) &&
|
|
658
|
-
currentUrlHasDynamicParams(
|
|
659
|
-
route,
|
|
660
|
-
getStateFromPathRef.current,
|
|
661
|
-
configRef.current
|
|
662
|
-
)
|
|
655
|
+
currentUrlHasDynamicParams(route, getStateFromPathRef.current, configRef.current)
|
|
663
656
|
) {
|
|
664
657
|
if (process.env.ONE_DEBUG_ROUTER) {
|
|
665
658
|
console.info(
|
|
@@ -112,9 +112,7 @@ describe('withOne', () => {
|
|
|
112
112
|
const fixtureRoot = createOneFixtureProject()
|
|
113
113
|
const config = (await withOne(fixtureRoot)) as any
|
|
114
114
|
|
|
115
|
-
expect(config.resolver.extraNodeModules['fixture-singleton']).toBe(
|
|
116
|
-
fixtureRoot
|
|
117
|
-
)
|
|
115
|
+
expect(config.resolver.extraNodeModules['fixture-singleton']).toBe(fixtureRoot)
|
|
118
116
|
expect(config.watchFolders).toContain(path.join(fixtureRoot, 'shared'))
|
|
119
117
|
})
|
|
120
118
|
})
|
|
@@ -98,13 +98,10 @@ export async function withOne(
|
|
|
98
98
|
root: path.resolve(loaded?.config?.config?.root ?? projectRoot),
|
|
99
99
|
} as any
|
|
100
100
|
|
|
101
|
-
const { defaultConfig } = await buildMetroConfigInputFromViteConfig(
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
mainModuleName: 'one/metro-entry',
|
|
106
|
-
}
|
|
107
|
-
)
|
|
101
|
+
const { defaultConfig } = await buildMetroConfigInputFromViteConfig(viteConfig, {
|
|
102
|
+
...metroPluginOptions,
|
|
103
|
+
mainModuleName: 'one/metro-entry',
|
|
104
|
+
})
|
|
108
105
|
|
|
109
106
|
return defaultConfig
|
|
110
107
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/babel-preset/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAU/D,KAAK,cAAc,GAAG;IACpB,KAAK,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC,GAAG;QACtC,OAAO,CAAC,EAAE,MAAM,IAAI,CAAA;QACpB,KAAK,CAAC,EAAE,MAAM,IAAI,CAAA;QAClB,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,OAAO,KAAK,IAAI,CAAA;QACnC,UAAU,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,OAAO,KAAK,IAAI,CAAA;KACzC,CAAA;IACD,GAAG,CAAC,EAAE,MAAM,MAAM,CAAA;IAClB,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,MAAM,GAAG,SAAS,CAAA;IAChD,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,CAAC,KAAK,CAAC,CAAA;CAC9C,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,sEAAsE;IACtE,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,4EAA4E;IAC5E,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,+FAA+F;IAC/F,iBAAiB,CAAC,EAAE,KAAK,CAAC,OAAO,MAAM,EAAE,CAAC,CAAA;IAC1C,sEAAsE;IACtE,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,iEAAiE;IACjE,SAAS,CAAC,EAAE,MAAM,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IACxE,mFAAmF;IACnF,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B;;;;;OAKG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B,CAAA;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,OAAO,UAAU,cAAc,CACpC,GAAG,EAAE,cAAc,EACnB,OAAO,GAAE,qBAA0B,GAClC,gBAAgB,CA2ClB;AAED,MAAM,MAAM,2BAA2B,GAAG;IACxC,WAAW,EAAE,MAAM,CAAA;IACnB,kBAAkB,EAAE,MAAM,CAAA;IAC1B,iBAAiB,CAAC,EAAE,KAAK,CAAC,OAAO,MAAM,EAAE,CAAC,CAAA;IAC1C,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IACxE,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B,CAAA;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,EACnC,WAAW,EACX,kBAAkB,EAClB,iBAAiB,EACjB,OAAO,EACP,SAAS,EACT,oBAA2B,GAC5B,EAAE,2BAA2B,GAAG,UAAU,EAAE,CAgE5C;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/babel-preset/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAU/D,KAAK,cAAc,GAAG;IACpB,KAAK,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC,GAAG;QACtC,OAAO,CAAC,EAAE,MAAM,IAAI,CAAA;QACpB,KAAK,CAAC,EAAE,MAAM,IAAI,CAAA;QAClB,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,OAAO,KAAK,IAAI,CAAA;QACnC,UAAU,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,OAAO,KAAK,IAAI,CAAA;KACzC,CAAA;IACD,GAAG,CAAC,EAAE,MAAM,MAAM,CAAA;IAClB,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,MAAM,GAAG,SAAS,CAAA;IAChD,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,CAAC,KAAK,CAAC,CAAA;CAC9C,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,sEAAsE;IACtE,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,4EAA4E;IAC5E,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,+FAA+F;IAC/F,iBAAiB,CAAC,EAAE,KAAK,CAAC,OAAO,MAAM,EAAE,CAAC,CAAA;IAC1C,sEAAsE;IACtE,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,iEAAiE;IACjE,SAAS,CAAC,EAAE,MAAM,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IACxE,mFAAmF;IACnF,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B;;;;;OAKG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B,CAAA;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,OAAO,UAAU,cAAc,CACpC,GAAG,EAAE,cAAc,EACnB,OAAO,GAAE,qBAA0B,GAClC,gBAAgB,CA2ClB;AAED,MAAM,MAAM,2BAA2B,GAAG;IACxC,WAAW,EAAE,MAAM,CAAA;IACnB,kBAAkB,EAAE,MAAM,CAAA;IAC1B,iBAAiB,CAAC,EAAE,KAAK,CAAC,OAAO,MAAM,EAAE,CAAC,CAAA;IAC1C,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IACxE,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B,CAAA;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,EACnC,WAAW,EACX,kBAAkB,EAClB,iBAAiB,EACjB,OAAO,EACP,SAAS,EACT,oBAA2B,GAC5B,EAAE,2BAA2B,GAAG,UAAU,EAAE,CAgE5C;AAoCD,wBAAgB,oCAAoC,CAClD,iBAAiB,CAAC,EAAE,KAAK,CAAC,OAAO,MAAM,EAAE,CAAC,GACzC,MAAM,CA8BR"}
|
package/types/cli/build.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/cli/build.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/cli/build.ts"],"names":[],"mappings":"AA4UA,wBAAsB,KAAK,CAAC,IAAI,EAAE;IAChC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,SAAS,CAAA;IACpC,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB,iBA2uCA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateBundlerConfig.d.ts","sourceRoot":"","sources":["../../src/cli/generateBundlerConfig.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAExC;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,kCAAkC,CAAA;AAEnE,MAAM,MAAM,uBAAuB,GAAG;IACpC,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,iBAAiB,CAAC,EAAE,KAAK,CAAC,OAAO,MAAM,EAAE,CAAC,CAAA;IAC1C,OAAO,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;IAC7D,SAAS,CAAC,EAAE,GAAG,CAAC,aAAa,CAAC,WAAW,CAAC,CAAA;CAC3C,CAAA;
|
|
1
|
+
{"version":3,"file":"generateBundlerConfig.d.ts","sourceRoot":"","sources":["../../src/cli/generateBundlerConfig.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAExC;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,kCAAkC,CAAA;AAEnE,MAAM,MAAM,uBAAuB,GAAG;IACpC,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,iBAAiB,CAAC,EAAE,KAAK,CAAC,OAAO,MAAM,EAAE,CAAC,CAAA;IAC1C,OAAO,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;IAC7D,SAAS,CAAC,EAAE,GAAG,CAAC,aAAa,CAAC,WAAW,CAAC,CAAA;CAC3C,CAAA;AAgID,wBAAgB,qCAAqC,CACnD,UAAU,GAAE,GAAG,CAAC,aAAkB,GACjC,uBAAuB,CAOzB;AAED,MAAM,MAAM,yBAAyB,GAAG;IACtC,iDAAiD;IACjD,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,kDAAkD;IAClD,UAAU,CAAC,EAAE,GAAG,CAAC,aAAa,CAAA;IAC9B,yEAAyE;IACzE,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,2EAA2E;IAC3E,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,wBAAwB;IACxB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EACF,OAAO,GACP,MAAM,GACN,oBAAoB,GACpB,sBAAsB,GACtB,aAAa,GACb,iBAAiB,CAAA;IACrB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,wBAAgB,qBAAqB,CAAC,IAAI,GAAE,yBAA8B,GAAG;IAC3E,OAAO,EAAE,UAAU,EAAE,CAAA;IACrB,EAAE,EAAE,OAAO,CAAA;CACZ,CAyGA;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,IAAI,OAAO,CAGzC;AAED;;;;;;GAMG;AACH,wBAAgB,mCAAmC,CACjD,GAAG,GAAE,MAAsB,EAC3B,UAAU,CAAC,EAAE,GAAG,CAAC,aAAa,GAC7B,IAAI,CAYN"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useLinking.d.ts","sourceRoot":"","sources":["../../src/fork/useLinking.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAML,KAAK,sBAAsB,EAE3B,KAAK,aAAa,EAEnB,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EAAE,gBAAgB,IAAI,uBAAuB,EAAE,MAAM,oBAAoB,CAAA;AAEhF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAE9D,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAmB9B,KAAK,WAAW,GAAG,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"useLinking.d.ts","sourceRoot":"","sources":["../../src/fork/useLinking.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAML,KAAK,sBAAsB,EAE3B,KAAK,aAAa,EAEnB,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EAAE,gBAAgB,IAAI,uBAAuB,EAAE,MAAM,oBAAoB,CAAA;AAEhF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAE9D,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAmB9B,KAAK,WAAW,GAAG,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAA;AAkG7D;;GAEG;AACH,eAAO,MAAM,MAAM,GAAI,IAAI,MAAM,OAAO,CAAC,IAAI,CAAC,eAO7C,CAAA;AAID,KAAK,OAAO,GAAG,cAAc,CAAC,aAAa,CAAC,CAAA;AAE5C,wBAAgB,UAAU,CACxB,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,sBAAsB,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,EAClE,EACE,OAAc,EACd,MAAM,EACN,gBAA0C,EAC1C,gBAA0C,EAC1C,kBAA8C,GAC/C,EAAE,OAAO,EACV,kBAAkB,EAAE,CAAC,mBAAmB,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI;2BAe5D,WAAW,CAAC,WAAW,GAAG,SAAS,CAAC;EA6lB9C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withOne.d.ts","sourceRoot":"","sources":["../../src/metro-config/withOne.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,cAAc,GAAG;IAC3B,sEAAsE;IACtE,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,4EAA4E;IAC5E,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,uDAAuD;IACvD,iBAAiB,CAAC,EAAE,KAAK,CAAC,OAAO,MAAM,EAAE,CAAC,CAAA;IAC1C,uEAAuE;IACvE,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,2DAA2D;IAC3D,SAAS,CAAC,EAAE,MAAM,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IACxE;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB,CAAA;AAoBD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,OAAO,CAC3B,uBAAuB,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,EACpD,OAAO,GAAE,cAAmB,GAC3B,OAAO,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"withOne.d.ts","sourceRoot":"","sources":["../../src/metro-config/withOne.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,cAAc,GAAG;IAC3B,sEAAsE;IACtE,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,4EAA4E;IAC5E,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,uDAAuD;IACvD,iBAAiB,CAAC,EAAE,KAAK,CAAC,OAAO,MAAM,EAAE,CAAC,CAAA;IAC1C,uEAAuE;IACvE,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,2DAA2D;IAC3D,SAAS,CAAC,EAAE,MAAM,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IACxE;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB,CAAA;AAoBD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,OAAO,CAC3B,uBAAuB,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,EACpD,OAAO,GAAE,cAAmB,GAC3B,OAAO,CAAC,OAAO,CAAC,CA0ClB;AAED,eAAe,OAAO,CAAA"}
|