@rsc-kit/core 0.22.3 → 0.22.4

package/dist/vite.d.ts

@@ -382,6 +382,20 @@ export interface KnownAction {
  * its own - is its character code, so no two paths share an alias.
  */
 export declare function toAlias(name: string): string;
+/**
+ * How the generated entry imports instrumentation.ts, as `__instrumentation`.
+ *
+ * The entry reads both hooks, and a file may export either, both or neither.
+ * Only the ones it exports are named: read off a namespace import, a hook the
+ * file does not have is a bundler warning on every build (IMPORT_IS_UNDEFINED,
+ * "Import `shutdown` will always be undefined") - the app told off for a file
+ * written exactly as documented. The rest are simply absent from the object.
+ */
+export declare function instrumentationImport(instrumentation: {
+    file: string;
+    hasRegister: boolean;
+    hasShutdown: boolean;
+} | null): string;
 /**
  * The worker the dev server serves at /sw.js: it removes the one a production
  * run left on this origin, and the caches with it, then reloads each page it

package/dist/vite.js

@@ -33,7 +33,6 @@ import { ownHosts } from "./hostRouting.js";
 import { unrollBarrelImports } from "./barrelImports.js";
 import { serverRendererMessage, SERVER_RENDERER, ssrProxyModule, UseSsrError, withoutSsrDirective } from "./useSsr.js";
 import { httpHostCalls } from "./hostCalls.js";
-import { bytecodeNote } from "./bytecodeCheck.js";
 import { clientPackages, importsServerRenderer, packageDir as installedPackageDir, packageEntryInGraph, polyfillsToTrace, traceableByName } from "./clientPackages.js";
 // Resolved once per rscKit() call. One build runs in one process, so these are
 // module state rather than threaded through every helper.
@@ -2486,6 +2485,30 @@ function instrumentationFile() {
     }
     return null;
 }
+/**
+ * How the generated entry imports instrumentation.ts, as `__instrumentation`.
+ *
+ * The entry reads both hooks, and a file may export either, both or neither.
+ * Only the ones it exports are named: read off a namespace import, a hook the
+ * file does not have is a bundler warning on every build (IMPORT_IS_UNDEFINED,
+ * "Import `shutdown` will always be undefined") - the app told off for a file
+ * written exactly as documented. The rest are simply absent from the object.
+ */
+export function instrumentationImport(instrumentation) {
+    const type = "{ register?: () => unknown; shutdown?: () => unknown }";
+    if (!instrumentation)
+        return `const __instrumentation: ${type} = {}`;
+    const hooks = [
+        ...(instrumentation.hasRegister ? ["register"] : []),
+        ...(instrumentation.hasShutdown ? ["shutdown"] : []),
+    ];
+    const from = JSON.stringify(instrumentation.file);
+    // No hooks: still imported, first, for what its import does.
+    if (hooks.length === 0)
+        return `import ${from}\nconst __instrumentation: ${type} = {}`;
+    return (`import { ${hooks.map((hook) => `${hook} as __instrumentation_${hook}`).join(", ")} } from ${from}\n` +
+        `const __instrumentation: ${type} = { ${hooks.map((hook) => `${hook}: __instrumentation_${hook}`).join(", ")} }`);
+}
 function generateEntryRsc(fallbackOrigin = "") {
     const instrumentation = instrumentationFile();
     // The 404 page, if the app has one, and the layouts it renders inside.
@@ -2552,11 +2575,7 @@ ${
     // First, before any page: an import's side effects run in import order,
     // and a package configured here has to be configured before a page module
     // that reads it at evaluation time.
-    instrumentation?.hasRegister || instrumentation?.hasShutdown
-        ? `import * as __instrumentation from ${JSON.stringify(instrumentation.file)}`
-        : instrumentation
-            ? `import ${JSON.stringify(instrumentation.file)}\nconst __instrumentation: { register?: () => unknown; shutdown?: () => unknown } = {}`
-            : "const __instrumentation: { register?: () => unknown; shutdown?: () => unknown } = {}"}
+    instrumentationImport(instrumentation)}
 import { SegmentBoundary } from ${JSON.stringify(join(packageDir, "js/SegmentBoundary"))}
 import { LoadingBoundary } from ${JSON.stringify(join(packageDir, "js/LoadingBoundary"))}
 import { DocumentTitle } from ${JSON.stringify(join(packageDir, "js/DocumentTitle"))}
@@ -6059,16 +6078,6 @@ export function rscKit(options = {}) {
                             log(`stored pages: ${copied} files uploaded as assets, read through the ASSETS binding`);
                     });
                 }
-                // Said at the end of a bun build, only when true: which module keeps
-                // `bun build --compile --bytecode` from applying, and where. Bun
-                // itself names no file and exits 0. See bytecodeCheck.ts.
-                if (nitro.options.preset === "bun") {
-                    nitro.hooks.hook("compiled", () => {
-                        const note = bytecodeNote(nitro.options.output.serverDir);
-                        if (note)
-                            log(note);
-                    });
-                }
                 // External at Nitro's layer too. The Vite build leaves these as
                 // imports, and Nitro would then bundle them into its own chunks -
                 // which for a native package fails at load, and for a polyfill like