Merge pull request #61 from unstubbable/restructure-core

Restructure core files for easier layer matching

apps/aws-app/webpack.config.js

@@ -142,13 +142,12 @@ export default function createConfigs(_env, argv) {
     module: {
       rules: [
         {
-          resource: [/rsc\.ts$/, /\/app\.tsx$/],
+          resource: [/\/server\/rsc\//, /\/app\.tsx$/],
           layer: webpackRscLayerName,
         },
         {
-          // AsyncLocalStorage module instances must be in a shared layer.
+          resource: /\/server\/shared\//,
           layer: `shared`,
-          test: /(router-location-async-local-storage|use-router-location)/,
         },
         {
           issuerLayer: webpackRscLayerName,

apps/cloudflare-app/webpack.config.js

@@ -121,13 +121,12 @@ export default function createConfigs(_env, argv) {
     module: {
       rules: [
         {
-          resource: [/rsc\.ts$/, /\/app\.tsx$/],
+          resource: [/\/server\/rsc\//, /\/app\.tsx$/],
           layer: webpackRscLayerName,
         },
         {
-          // AsyncLocalStorage module instances must be in a shared layer.
+          resource: /\/server\/shared\//,
           layer: `shared`,
-          test: /(router-location-async-local-storage|use-router-location)/,
         },
         {
           issuerLayer: webpackRscLayerName,

apps/vercel-app/webpack.config.js

@@ -148,13 +148,12 @@ export default function createConfigs(_env, argv) {
     module: {
       rules: [
         {
-          resource: [/rsc\.ts$/, /\/app\.tsx$/],
+          resource: [/\/server\/rsc\//, /\/app\.tsx$/],
           layer: webpackRscLayerName,
         },
         {
-          // AsyncLocalStorage module instances must be in a shared layer.
+          resource: /\/server\/shared\//,
           layer: `shared`,
-          test: /(router-location-async-local-storage|use-router-location)/,
         },
         {
           issuerLayer: webpackRscLayerName,

packages/core/package.json

@@ -20,23 +20,23 @@
       "default": "./lib/client/browser.js"
     },
     "./server/rsc": {
-      "@mfng:internal": "./src/server/rsc.ts",
-      "default": "./lib/server/rsc.js"
+      "@mfng:internal": "./src/server/rsc/index.ts",
+      "default": "./lib/server/rsc/index.js"
     },
     "./server/ssr": {
-      "@mfng:internal": "./src/server/ssr.ts",
-      "default": "./lib/server/ssr.js"
+      "@mfng:internal": "./src/server/ssr/index.ts",
+      "default": "./lib/server/ssr/index.js"
     },
     "./use-router-location": {
-      "@mfng:internal:node": "./src/server/use-router-location.ts",
+      "@mfng:internal:node": "./src/server/shared/use-router-location.ts",
       "@mfng:internal": "./src/client/use-router-location.ts",
       "types": "./lib/use-router-location.d.ts",
-      "node": "./lib/server/use-router-location.js",
+      "node": "./lib/server/shared/use-router-location.js",
       "default": "./lib/client/use-router-location.js"
     },
     "./router-location-async-local-storage": {
-      "@mfng:internal": "./src/server/router-location-async-local-storage.ts",
-      "default": "./lib/server/router-location-async-local-storage.js"
+      "@mfng:internal": "./src/server/shared/router-location-async-local-storage.ts",
+      "default": "./lib/server/shared/router-location-async-local-storage.js"
     }
   },
   "files": [

packages/core/src/server/router-location-async-local-storage.ts → packages/core/src/server/shared/router-location-async-local-storage.ts

@@ -1,5 +1,5 @@
 import {AsyncLocalStorage} from 'node:async_hooks';
-import type {RouterLocation} from '../use-router-location.js';
+import type {RouterLocation} from '../../use-router-location.js';
 
 export const routerLocationAsyncLocalStorage =
   new AsyncLocalStorage<RouterLocation>();

packages/core/src/server/use-router-location.ts → packages/core/src/server/shared/use-router-location.ts

@@ -1,4 +1,4 @@
-import type {RouterLocation} from '../use-router-location.js';
+import type {RouterLocation} from '../../use-router-location.js';
 import {routerLocationAsyncLocalStorage} from './router-location-async-local-storage.js';
 
 export function useRouterLocation(): RouterLocation {

packages/core/src/server/create-html-stream.tsx → packages/core/src/server/ssr/create-html-stream.tsx

@@ -6,9 +6,9 @@ import type {ReactFormState} from 'react-dom/server';
 import ReactDOMServer from 'react-dom/server.edge';
 import type {SSRManifest} from 'react-server-dom-webpack';
 import ReactServerDOMClient from 'react-server-dom-webpack/client.edge';
+import type {RscAppResult} from '../rsc/create-rsc-app-stream.js';
 import {createBufferedTransformStream} from './create-buffered-transform-stream.js';
 import {createInitialRscResponseTransformStream} from './create-initial-rsc-response-transform-stream.js';
-import type {RscAppResult} from './create-rsc-app-stream.js';
 
 export interface CreateHtmlStreamOptions {
   readonly reactSsrManifest: SSRManifest;

packages/webpack-rsc/README.md

@@ -63,10 +63,15 @@ const serverConfig = {
   module: {
     rules: [
       {
-        // Match the resource path of the modules that create RSC streams, e.g.:
-        resource: (value) => /create-rsc-\w+-stream\.tsx?$/.test(value),
+        // Match the entry modules that should end up in the RSC layer:
+        resource: [/\/server\/rsc\//, /\/app\.tsx$/],
         layer: webpackRscLayerName,
       },
+      {
+        // Match the modules that should end up in a shared layer (RSC & SSR):
+        resource: /\/server\/shared\//,
+        layer: 'shared',
+      },
       {
         issuerLayer: webpackRscLayerName,
         resolve: {conditionNames: ['react-server', '...']},