@timber-js/app 0.2.0-alpha.80 → 0.2.0-alpha.82
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/_chunks/{stale-reload-C2plcNtG.js → stale-reload-BX5gL1r-.js} +1 -1
- package/dist/_chunks/{stale-reload-C2plcNtG.js.map → stale-reload-BX5gL1r-.js.map} +1 -1
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +2 -2
- package/dist/cli.js.map +1 -1
- package/dist/client/form.d.ts +2 -2
- package/dist/client/form.d.ts.map +1 -1
- package/dist/client/index.js.map +1 -1
- package/dist/client/internal.js +1 -1
- package/dist/config-types.d.ts +17 -0
- package/dist/config-types.d.ts.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +40 -3
- package/dist/index.js.map +1 -1
- package/dist/plugin-context.d.ts +23 -0
- package/dist/plugin-context.d.ts.map +1 -1
- package/dist/search-params/index.js +62 -1
- package/dist/search-params/index.js.map +1 -0
- package/dist/segment-params/index.d.ts +0 -3
- package/dist/segment-params/index.d.ts.map +1 -1
- package/dist/segment-params/index.js +1 -3
- package/dist/server/action-client.d.ts +14 -6
- package/dist/server/action-client.d.ts.map +1 -1
- package/dist/server/index.d.ts +0 -1
- package/dist/server/index.d.ts.map +1 -1
- package/dist/server/index.js +1 -2
- package/dist/server/index.js.map +1 -1
- package/package.json +5 -1
- package/src/cli.ts +10 -5
- package/src/client/form.tsx +8 -6
- package/src/config-types.ts +17 -0
- package/src/index.ts +37 -0
- package/src/plugin-context.ts +40 -0
- package/src/plugins/adapter-build.ts +1 -1
- package/src/segment-params/index.ts +3 -23
- package/src/server/action-client.ts +26 -10
- package/src/server/index.ts +2 -3
- package/dist/_chunks/wrappers-_DTmImGt.js +0 -63
- package/dist/_chunks/wrappers-_DTmImGt.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-types.d.ts","sourceRoot":"","sources":["../src/config-types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,uDAAuD;AACvD,MAAM,WAAW,sBAAsB;IACrC,yEAAyE;IACzE,QAAQ,EAAE,OAAO,CAAC;IAClB;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC7B;;;;;;;;;;OAUG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;;;;;;;;;;OAaG;IACH,gBAAgB,CAAC,EAAE,OAAO,GAAG,sBAAsB,CAAC;IACpD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE;QACP,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B;;;;;OAKG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;;;;;;;OAUG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;;;;;;;;;;;OAaG;IACH,cAAc,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IACpD,mEAAmE;IACnE,GAAG,CAAC,EAAE;QACJ,oFAAoF;QACpF,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;IACF;;;;;;;;;;;;;;OAcG;IACH,YAAY,CAAC,EAAE,UAAU,GAAG,OAAO,GAAG,KAAK,CAAC;IAC5C;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,8FAA8F;IAC9F,GAAG,CAAC,EAAE;QACJ,aAAa,CAAC,EAAE,OAAO,EAAE,CAAC;QAC1B,aAAa,CAAC,EAAE,OAAO,EAAE,CAAC;QAC1B,YAAY,CAAC,EAAE,OAAO,EAAE,CAAC;QACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAC/C,CAAC;IACF;;;;;;;;;;;;;OAaG;IACH,gBAAgB,CAAC,EAAE;QACjB;;;;WAIG;QACH,YAAY,CAAC,EAAE,OAAO,CAAC;KACxB,CAAC;IACF;;;;;;;;;;;;;;;;OAgBG;IACH,aAAa,CAAC,EAAE,OAAO,GAAG;QAAE,eAAe,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACxE;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,EAAE;QACR,2EAA2E;QAC3E,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,oGAAoG;QACpG,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,wDAAwD;QACxD,sBAAsB,CAAC,EAAE,MAAM,CAAC;QAChC,gEAAgE;QAChE,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,+DAA+D;QAC/D,gBAAgB,CAAC,EAAE,OAAO,CAAC;KAC5B,CAAC;IACF,SAAS,CAAC,EAAE;QACV,wDAAwD;QACxD,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,qCAAqC;QACrC,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,wCAAwC;QACxC,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,qDAAqD;QACrD,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,kFAAkF;QAClF,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,kCAAkC;QAClC,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;CACH"}
|
|
1
|
+
{"version":3,"file":"config-types.d.ts","sourceRoot":"","sources":["../src/config-types.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAU,YAAY,EAAE,MAAM,MAAM,CAAC;AAyBjD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAU,YAAY,EAAE,MAAM,MAAM,CAAC;AAyBjD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAc1D,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D;;;;;;;;;GASG;AAEH,MAAM,WAAW,MAAM;CAAG;AAE1B;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,gBAAgB,GAAG,gBAAgB,CAEvE;AAgGD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,MAAM,CAAC,MAAM,CAAC,EAAE,gBAAgB,GAAG,YAAY,EAAE,CA0OhE;AAED,eAAe,MAAM,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -14571,7 +14571,7 @@ function timberAdapterBuild(ctx) {
|
|
|
14571
14571
|
if (ctx.dev) return;
|
|
14572
14572
|
const adapter = ctx.config.adapter;
|
|
14573
14573
|
if (!adapter || typeof adapter.buildOutput !== "function") return;
|
|
14574
|
-
const buildDir =
|
|
14574
|
+
const buildDir = ctx.buildDir;
|
|
14575
14575
|
let manifestInit;
|
|
14576
14576
|
if (ctx.buildManifest) {
|
|
14577
14577
|
const manifest = ctx.clientJavascript.disabled ? {
|
|
@@ -15215,9 +15215,27 @@ function createPluginContext(config, root) {
|
|
|
15215
15215
|
buildManifest: null,
|
|
15216
15216
|
deploymentId: null,
|
|
15217
15217
|
timer: createStartupTimer(),
|
|
15218
|
-
holdingServer: null
|
|
15218
|
+
holdingServer: null,
|
|
15219
|
+
buildDir: resolveBuildDir(projectRoot, resolvedConfig.buildDir)
|
|
15219
15220
|
};
|
|
15220
15221
|
}
|
|
15222
|
+
/** Default build output directory (relative to root). */
|
|
15223
|
+
var DEFAULT_BUILD_DIR = join(".timber", "dist");
|
|
15224
|
+
/**
|
|
15225
|
+
* Resolve the build output directory.
|
|
15226
|
+
*
|
|
15227
|
+
* Priority:
|
|
15228
|
+
* 1. Explicit `timberBuildDir` from timber.config.ts
|
|
15229
|
+
* 2. Explicit `viteBuildOutDir` from Vite's build.outDir (if not the default 'dist')
|
|
15230
|
+
* 3. Default: `.timber/dist`
|
|
15231
|
+
*
|
|
15232
|
+
* Returns an absolute path.
|
|
15233
|
+
*/
|
|
15234
|
+
function resolveBuildDir(root, timberBuildDir, viteBuildOutDir) {
|
|
15235
|
+
if (timberBuildDir) return join(root, timberBuildDir);
|
|
15236
|
+
if (viteBuildOutDir && viteBuildOutDir !== "dist") return join(root, viteBuildOutDir);
|
|
15237
|
+
return join(root, DEFAULT_BUILD_DIR);
|
|
15238
|
+
}
|
|
15221
15239
|
/**
|
|
15222
15240
|
* Load timber.config.ts (or .js, .mjs) from the project root.
|
|
15223
15241
|
* Returns the config object or null if no config file is found.
|
|
@@ -15386,6 +15404,9 @@ function timber(config) {
|
|
|
15386
15404
|
}
|
|
15387
15405
|
ctx.config.output ??= "server";
|
|
15388
15406
|
ctx.timer.end("config-load");
|
|
15407
|
+
const viteOutDir = userConfig.build?.outDir;
|
|
15408
|
+
const timberBuildDir = ctx.config.buildDir;
|
|
15409
|
+
ctx.buildDir = resolveBuildDir(resolve(userConfig.root ?? process.cwd()), timberBuildDir, viteOutDir);
|
|
15389
15410
|
if (viteRoot !== process.cwd()) {
|
|
15390
15411
|
const hasCompilerInReloaded = !config?.reactCompiler && ctx.config.reactCompiler;
|
|
15391
15412
|
const hadCompilerInEarly = !config?.reactCompiler && earlyFileConfig?.reactCompiler;
|
|
@@ -15405,12 +15426,28 @@ function timber(config) {
|
|
|
15405
15426
|
ctx.holdingServer = null;
|
|
15406
15427
|
}
|
|
15407
15428
|
}
|
|
15408
|
-
|
|
15429
|
+
const buildOutDir = timberBuildDir ? timberBuildDir : viteOutDir && viteOutDir !== "dist" ? viteOutDir : DEFAULT_BUILD_DIR;
|
|
15430
|
+
const envOutDirs = {};
|
|
15431
|
+
for (const envName of [
|
|
15432
|
+
"rsc",
|
|
15433
|
+
"ssr",
|
|
15434
|
+
"client"
|
|
15435
|
+
]) envOutDirs[envName] = { build: { outDir: join(buildOutDir, envName) } };
|
|
15436
|
+
if (command === "build") return {
|
|
15437
|
+
build: { outDir: buildOutDir },
|
|
15438
|
+
environments: envOutDirs,
|
|
15439
|
+
oxc: { jsx: { development: false } }
|
|
15440
|
+
};
|
|
15441
|
+
return {
|
|
15442
|
+
build: { outDir: buildOutDir },
|
|
15443
|
+
environments: envOutDirs
|
|
15444
|
+
};
|
|
15409
15445
|
},
|
|
15410
15446
|
configResolved(resolved) {
|
|
15411
15447
|
ctx.root = resolved.root;
|
|
15412
15448
|
ctx.appDir = resolveAppDir(resolved.root, ctx.config.appDir);
|
|
15413
15449
|
ctx.dev = resolved.command === "serve";
|
|
15450
|
+
ctx.buildDir = resolve(resolved.root, resolved.build.outDir);
|
|
15414
15451
|
if (!ctx.dev) ctx.timer = createNoopTimer();
|
|
15415
15452
|
else ctx.timer.start("dev-server-setup");
|
|
15416
15453
|
}
|