@timber-js/app 0.2.0-alpha.213 → 0.2.0-alpha.215
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/{actions-CEootpB1.js → actions-CUh3cClk.js} +2 -2
- package/dist/_chunks/{actions-CEootpB1.js.map → actions-CUh3cClk.js.map} +1 -1
- package/dist/_chunks/{canonicalize-CgHoscYO.js → canonicalize-BAWkWiKK.js} +28 -2
- package/dist/_chunks/{canonicalize-CgHoscYO.js.map → canonicalize-BAWkWiKK.js.map} +1 -1
- package/dist/_chunks/{chains-BfoPFraI.js → chains-CjK1Eu6a.js} +2 -2
- package/dist/_chunks/{chains-BfoPFraI.js.map → chains-CjK1Eu6a.js.map} +1 -1
- package/dist/_chunks/{classify-BT66U83D.js → classify-GAdt6aiA.js} +2 -2
- package/dist/_chunks/{classify-BT66U83D.js.map → classify-GAdt6aiA.js.map} +1 -1
- package/dist/_chunks/{cli-check-BfQ54-UJ.js → cli-check-DOzjlycg.js} +3 -3
- package/dist/_chunks/{cli-check-BfQ54-UJ.js.map → cli-check-DOzjlycg.js.map} +1 -1
- package/dist/_chunks/{cli-schema-sync-czh2dsLs.js → cli-schema-sync-B9wDaQvW.js} +2 -2
- package/dist/_chunks/{cli-schema-sync-czh2dsLs.js.map → cli-schema-sync-B9wDaQvW.js.map} +1 -1
- package/dist/_chunks/{client-dep-entries-CQwpb8dI.js → client-dep-entries-DEp8ZHce.js} +47 -3
- package/dist/_chunks/client-dep-entries-DEp8ZHce.js.map +1 -0
- package/dist/_chunks/{convention-lint-BEVW4EID.js → convention-lint-B3QEGJX7.js} +2 -2
- package/dist/_chunks/{convention-lint-BEVW4EID.js.map → convention-lint-B3QEGJX7.js.map} +1 -1
- package/dist/_chunks/{dev-server-FKxptbnI.js → dev-server-_9L4KWC-.js} +3 -3
- package/dist/_chunks/{dev-server-FKxptbnI.js.map → dev-server-_9L4KWC-.js.map} +1 -1
- package/dist/_chunks/{error-boundary-9g_Lb2na.js → error-boundary-xxxLtXt6.js} +38 -5
- package/dist/_chunks/{error-boundary-9g_Lb2na.js.map → error-boundary-xxxLtXt6.js.map} +1 -1
- package/dist/_chunks/{live-graph-C_4v-fHv.js → live-graph-Cd3YHvrH.js} +4 -4
- package/dist/_chunks/{live-graph-C_4v-fHv.js.map → live-graph-Cd3YHvrH.js.map} +1 -1
- package/dist/_chunks/{poison-scan-C92liMAr.js → poison-scan-BnJjBOkn.js} +2 -2
- package/dist/_chunks/{poison-scan-C92liMAr.js.map → poison-scan-BnJjBOkn.js.map} +1 -1
- package/dist/_chunks/{scanner-CQt12vE2.js → scanner-CKAT5gRx.js} +2 -2
- package/dist/_chunks/{scanner-CQt12vE2.js.map → scanner-CKAT5gRx.js.map} +1 -1
- package/dist/_chunks/{walkers-DAT4avhZ.js → walkers-DwCXEyRu.js} +3 -3
- package/dist/_chunks/{walkers-DAT4avhZ.js.map → walkers-DwCXEyRu.js.map} +1 -1
- package/dist/adapters/nitro-preview.d.ts.map +1 -1
- package/dist/adapters/nitro.js +11 -2
- package/dist/adapters/nitro.js.map +1 -1
- package/dist/adapters/types.d.ts +3 -1
- package/dist/adapters/types.d.ts.map +1 -1
- package/dist/analyze/crawl-entry.js +3 -3
- package/dist/analyze/graph-command.js +2 -2
- package/dist/cli.d.ts +5 -5
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +15 -14
- package/dist/cli.js.map +1 -1
- package/dist/client/error-boundary.js +1 -1
- package/dist/client/internal.js +22 -7
- package/dist/client/internal.js.map +1 -1
- package/dist/client/router-effects.d.ts +70 -12
- package/dist/client/router-effects.d.ts.map +1 -1
- package/dist/client/router.d.ts.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +27 -52
- package/dist/index.js.map +1 -1
- package/dist/plugins/client-dep-entries.d.ts +36 -0
- package/dist/plugins/client-dep-entries.d.ts.map +1 -1
- package/dist/routing/index.js +2 -2
- package/dist/server/canonicalize.d.ts +22 -0
- package/dist/server/canonicalize.d.ts.map +1 -1
- package/dist/server/index.js +1 -1
- package/dist/server/internal.js +54 -3
- package/dist/server/internal.js.map +1 -1
- package/dist/server/pipeline-helpers.d.ts +31 -0
- package/dist/server/pipeline-helpers.d.ts.map +1 -1
- package/dist/server/pipeline.d.ts.map +1 -1
- package/dist/server/port-resolution.d.ts +3 -12
- package/dist/server/port-resolution.d.ts.map +1 -1
- package/docs/api/36-cli.mdx +8 -4
- package/docs/learn/13-deploying.mdx +2 -0
- package/package.json +1 -1
- package/src/adapters/nitro-preview.ts +10 -1
- package/src/adapters/types.ts +3 -1
- package/src/cli.ts +18 -16
- package/src/client/router-effects.ts +99 -14
- package/src/client/router.ts +29 -13
- package/src/index.ts +48 -71
- package/src/plugins/client-dep-entries.ts +46 -0
- package/src/server/canonicalize.ts +29 -0
- package/src/server/pipeline-helpers.ts +61 -0
- package/src/server/pipeline.ts +13 -1
- package/src/server/port-resolution.ts +6 -16
- package/dist/_chunks/client-dep-entries-CQwpb8dI.js.map +0 -1
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;AA0CjD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAa1D,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAQ1D,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAElG;;;;;;;;;;;;GAYG;AAEH,MAAM,WAAW,MAAM;CAAG;AAE1B;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,gBAAgB,GAAG,gBAAgB,CAEvE;AAyGD,wBAAgB,MAAM,CAAC,MAAM,CAAC,EAAE,gBAAgB,GAAG,YAAY,EAAE,
|
|
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;AA0CjD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAa1D,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAQ1D,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAElG;;;;;;;;;;;;GAYG;AAEH,MAAM,WAAW,MAAM;CAAG;AAE1B;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,gBAAgB,GAAG,gBAAgB,CAEvE;AAyGD,wBAAgB,MAAM,CAAC,MAAM,CAAC,EAAE,gBAAgB,GAAG,YAAY,EAAE,CAqXhE;eAEc,MAAM"}
|
package/dist/index.js
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import { a as reportConfigErrors, i as formatMissingPeers, n as timberDevServer, o as validateConfig, r as checkPeerDependencies } from "./_chunks/dev-server-
|
|
1
|
+
import { a as reportConfigErrors, i as formatMissingPeers, n as timberDevServer, o as validateConfig, r as checkPeerDependencies } from "./_chunks/dev-server-_9L4KWC-.js";
|
|
2
2
|
import { i as resolveRenderTimeoutMs } from "./_chunks/render-timeout-DOf_BBcO.js";
|
|
3
3
|
import { t as writeFileAtomic } from "./_chunks/write-file-atomic-D1qWqHb4.js";
|
|
4
|
-
import { d as collectInterceptionRewrites, l as getPrerenderExport, n as scanRoutes } from "./_chunks/scanner-
|
|
4
|
+
import { d as collectInterceptionRewrites, l as getPrerenderExport, n as scanRoutes } from "./_chunks/scanner-CKAT5gRx.js";
|
|
5
5
|
import { a as isDynamicMetadataExtension } from "./_chunks/metadata-routes-DSDjM_hJ.js";
|
|
6
6
|
import { v as swallow } from "./_chunks/logger-CbLdcy-W.js";
|
|
7
|
-
import { c as buildDirToRouteMap, n as formatConventionWarnings, o as flushCodegenWrites, r as lintConventions, s as writeRouteCodegen, t as checkAppDirExists } from "./_chunks/convention-lint-
|
|
7
|
+
import { c as buildDirToRouteMap, n as formatConventionWarnings, o as flushCodegenWrites, r as lintConventions, s as writeRouteCodegen, t as checkAppDirExists } from "./_chunks/convention-lint-B3QEGJX7.js";
|
|
8
8
|
import { a as loadTimberConfigFile, c as resolveAppDir, d as createNoopTimer, l as resolveBuildDir, n as contextAdapter, o as mergeFileConfig, r as createPluginContext, t as adapterConfig, u as resolveClientJavascript } from "./_chunks/plugin-context-BPBPc3lL.js";
|
|
9
9
|
import { i as withBasePath, n as normalizeBasePath, t as isRelativeBase } from "./_chunks/base-path-DaQrzbez.js";
|
|
10
|
-
import { r as validateSchemaAgainstRoutes, t as collectLeafRoutes } from "./_chunks/walkers-
|
|
10
|
+
import { r as validateSchemaAgainstRoutes, t as collectLeafRoutes } from "./_chunks/walkers-DwCXEyRu.js";
|
|
11
11
|
import { i as poisonPillSource, r as markerFor, t as EXPLICIT_MARKERS } from "./_chunks/poison-rules-DoEhbqaY.js";
|
|
12
12
|
import { n as rscPayloadPath, t as RSC_PAYLOAD_DIR } from "./_chunks/rsc-payload-path-dffcs4jp.js";
|
|
13
13
|
import { a as REDIRECTS_FILE, n as detectFsIdentity, o as RESERVED_OUTPUT_PATHS, r as fsKey, t as EXACT_FS_IDENTITY } from "./_chunks/fs-identity-BRKuL215.js";
|
|
@@ -9442,21 +9442,12 @@ function createHoldingServer() {
|
|
|
9442
9442
|
*/
|
|
9443
9443
|
function resolveStartPort(input) {
|
|
9444
9444
|
const defaultPort = input.defaultPort ?? 3e3;
|
|
9445
|
-
if (typeof input.configPort === "number" && Number.isFinite(input.configPort)) return
|
|
9446
|
-
port: input.configPort,
|
|
9447
|
-
explicit: true
|
|
9448
|
-
};
|
|
9445
|
+
if (typeof input.configPort === "number" && Number.isFinite(input.configPort)) return input.configPort;
|
|
9449
9446
|
if (input.envPort != null && input.envPort !== "") {
|
|
9450
9447
|
const parsed = Number(input.envPort);
|
|
9451
|
-
if (Number.isFinite(parsed) && parsed > 0) return
|
|
9452
|
-
port: parsed,
|
|
9453
|
-
explicit: true
|
|
9454
|
-
};
|
|
9448
|
+
if (Number.isFinite(parsed) && parsed > 0) return parsed;
|
|
9455
9449
|
}
|
|
9456
|
-
return
|
|
9457
|
-
port: defaultPort,
|
|
9458
|
-
explicit: false
|
|
9459
|
-
};
|
|
9450
|
+
return defaultPort;
|
|
9460
9451
|
}
|
|
9461
9452
|
//#endregion
|
|
9462
9453
|
//#region src/index.ts
|
|
@@ -9555,6 +9546,7 @@ function timber(config) {
|
|
|
9555
9546
|
name: "timber-root-sync",
|
|
9556
9547
|
api: { getContext: () => ctx },
|
|
9557
9548
|
async config(userConfig, { command, isPreview }) {
|
|
9549
|
+
if (isPreview) throw new Error("[timber] `vite preview` cannot serve a timber build: it would serve the build directory, server bundles included, as static files. Run `timber preview`, which runs your adapter's preview().");
|
|
9558
9550
|
const viteRoot = resolve(userConfig.root ?? process.cwd());
|
|
9559
9551
|
ctx.timer.start("config-load");
|
|
9560
9552
|
const fileConfig = loadTimberConfigFile(viteRoot);
|
|
@@ -9572,29 +9564,19 @@ function timber(config) {
|
|
|
9572
9564
|
if (hasCompilerInReloaded && !hadCompilerInEarly) console.warn("[timber] reactCompiler is set in timber.config.ts but could not be registered because the config file is in a non-cwd root directory. Move reactCompiler to the inline timber() config in vite.config.ts, or run vite from the project root directory.");
|
|
9573
9565
|
}
|
|
9574
9566
|
let resolvedDevPort = null;
|
|
9575
|
-
let resolvedDevPortExplicit = false;
|
|
9576
9567
|
const isMiddlewareMode = Boolean(userConfig.server?.middlewareMode);
|
|
9577
9568
|
const resolvedHost = typeof userConfig.server?.host === "string" ? userConfig.server.host : userConfig.server?.host === true ? void 0 : "localhost";
|
|
9578
|
-
if (command === "serve" && !
|
|
9579
|
-
|
|
9569
|
+
if (command === "serve" && !isMiddlewareMode) {
|
|
9570
|
+
resolvedDevPort = resolveStartPort({
|
|
9580
9571
|
configPort: userConfig.server?.port,
|
|
9581
9572
|
envPort: process.env.PORT
|
|
9582
9573
|
});
|
|
9583
|
-
resolvedDevPort
|
|
9584
|
-
resolvedDevPortExplicit = userConfig.server?.strictPort ?? false;
|
|
9585
|
-
if (start.port !== 0) {
|
|
9574
|
+
if (resolvedDevPort !== 0) {
|
|
9586
9575
|
ctx.holdingServer = createHoldingServer();
|
|
9587
|
-
await ctx.holdingServer.listen(
|
|
9576
|
+
await ctx.holdingServer.listen(resolvedDevPort, resolvedHost).catch(() => {
|
|
9588
9577
|
ctx.holdingServer = null;
|
|
9589
9578
|
});
|
|
9590
9579
|
}
|
|
9591
|
-
} else if (command === "serve" && isPreview) {
|
|
9592
|
-
const start = resolveStartPort({
|
|
9593
|
-
configPort: typeof userConfig.preview?.port === "number" ? userConfig.preview.port : typeof userConfig.server?.port === "number" ? userConfig.server.port : void 0,
|
|
9594
|
-
envPort: process.env.PORT
|
|
9595
|
-
});
|
|
9596
|
-
resolvedDevPort = start.port;
|
|
9597
|
-
resolvedDevPortExplicit = start.explicit;
|
|
9598
9580
|
}
|
|
9599
9581
|
const buildOutDir = relative(resolvedRoot, buildDir);
|
|
9600
9582
|
const envOutDirs = {};
|
|
@@ -9620,41 +9602,34 @@ function timber(config) {
|
|
|
9620
9602
|
oxc: { jsx: { development: false } }
|
|
9621
9603
|
};
|
|
9622
9604
|
const serverConfig = {};
|
|
9623
|
-
const previewConfig = {};
|
|
9624
9605
|
if (resolvedDevPort != null) {
|
|
9625
|
-
|
|
9626
|
-
|
|
9627
|
-
serverConfig.strictPort = resolvedDevPortExplicit;
|
|
9628
|
-
}
|
|
9629
|
-
previewConfig.port = resolvedDevPort;
|
|
9630
|
-
previewConfig.strictPort = resolvedDevPortExplicit;
|
|
9606
|
+
serverConfig.port = resolvedDevPort;
|
|
9607
|
+
serverConfig.strictPort = userConfig.server?.strictPort ?? false;
|
|
9631
9608
|
}
|
|
9632
9609
|
serverConfig.forwardConsole = resolveForwardConsole(ctx.config.devBrowserLogs);
|
|
9633
9610
|
const customLogger = userConfig.customLogger ? wrapLoggerWithOriginalConsole(userConfig.customLogger) : createLogger(userConfig.logLevel ?? "info", {
|
|
9634
9611
|
allowClearScreen: userConfig.clearScreen ?? true,
|
|
9635
9612
|
console: originalConsole
|
|
9636
9613
|
});
|
|
9637
|
-
|
|
9638
|
-
|
|
9639
|
-
|
|
9640
|
-
|
|
9641
|
-
|
|
9642
|
-
|
|
9643
|
-
environments
|
|
9614
|
+
ctx.timer.start("client-deps-scan");
|
|
9615
|
+
const { clientOptimizeDepsEntries, skipUseServerScanPlugin } = await import("./_chunks/client-dep-entries-DEp8ZHce.js");
|
|
9616
|
+
const entries = await clientOptimizeDepsEntries(resolvedRoot, BROWSER_ENTRY_FILE, buildDir);
|
|
9617
|
+
ctx.timer.end("client-deps-scan");
|
|
9618
|
+
return {
|
|
9619
|
+
build: { outDir: buildOutDir },
|
|
9620
|
+
environments: {
|
|
9644
9621
|
...envOutDirs,
|
|
9645
9622
|
client: {
|
|
9646
9623
|
...envOutDirs.client,
|
|
9647
|
-
optimizeDeps: {
|
|
9624
|
+
optimizeDeps: {
|
|
9625
|
+
entries,
|
|
9626
|
+
rolldownOptions: { plugins: [skipUseServerScanPlugin()] }
|
|
9627
|
+
}
|
|
9648
9628
|
}
|
|
9649
|
-
}
|
|
9650
|
-
}
|
|
9651
|
-
return {
|
|
9652
|
-
build: { outDir: buildOutDir },
|
|
9653
|
-
environments,
|
|
9629
|
+
},
|
|
9654
9630
|
optimizeDeps: { exclude: timberOptimizeDepsExclude },
|
|
9655
9631
|
customLogger,
|
|
9656
|
-
server: serverConfig
|
|
9657
|
-
preview: previewConfig
|
|
9632
|
+
server: serverConfig
|
|
9658
9633
|
};
|
|
9659
9634
|
},
|
|
9660
9635
|
configResolved(resolved) {
|