@parcel/packager-react-static 2.15.3-canary.3473 → 2.15.3

package/lib/ReactStaticPackager.js

@@ -118,11 +118,40 @@ var _default = exports.default = new (_plugin().Packager)({
       parcelRequireName: 'parcelRequire' + (0, _rust().hashString)(name).slice(-4)
     };
   },
+  loadBundleConfig({
+    bundle,
+    bundleGraph
+  }) {
+    let pages = [];
+    for (let b of bundleGraph.getEntryBundles()) {
+      let main = b.getMainEntry();
+      if (main && b.type === 'js' && b.needsStableName) {
+        let meta = pageMeta(main.meta);
+        pages.push({
+          url: (0, _utils().urlJoin)(b.target.publicUrl, b.name),
+          name: b.name,
+          ...meta
+        });
+      }
+    }
+    let referencedBundles = [];
+    for (let b of bundleGraph.getReferencedBundles(bundle, {
+      includeInline: false,
+      includeIsolated: false
+    })) {
+      referencedBundles.push(b.getContentHash());
+    }
+    return {
+      pages,
+      referencedBundles
+    };
+  },
   async package({
     bundle,
     bundleGraph,
     getInlineBundleContents,
-    config
+    config,
+    bundleConfig
   }) {
     if (bundle.env.shouldScopeHoist) {
       throw new Error('Scope hoisting is not supported with SSG');
@@ -145,18 +174,7 @@ var _default = exports.default = new (_plugin().Packager)({
     let {
       injectRSCPayload
     } = await import('rsc-html-stream/server');
-    let pages = [];
-    for (let b of bundleGraph.getEntryBundles()) {
-      let main = b.getMainEntry();
-      if (main && b.type === 'js' && b.needsStableName) {
-        let meta = pageMeta(main.meta);
-        pages.push({
-          url: (0, _utils().urlJoin)(b.target.publicUrl, b.name),
-          name: b.name,
-          ...meta
-        });
-      }
-    }
+    let pages = bundleConfig.pages;
     let meta = pageMeta((0, _nullthrows().default)(bundle.getMainEntry()).meta);
     let props = {
       key: 'page',
@@ -216,7 +234,28 @@ var _default = exports.default = new (_plugin().Packager)({
     } = await prerender(React.createElement(Content), {
       bootstrapScriptContent
     });
-    let response = prelude.pipeThrough(injectRSCPayload(injectStream));
+
+    // Buffer into a single chunk so hash reference replacement works correctly.
+    // There could potentially be a more optimal way of doing this in the future.
+    let buffers = [];
+    let len = 0;
+    // $FlowFixMe
+    let bufferedStream = new TransformStream({
+      transform(chunk) {
+        len += chunk.length;
+        buffers.push(chunk);
+      },
+      flush(controller) {
+        let concated = new Uint8Array(len);
+        let offset = 0;
+        for (let buf of buffers) {
+          concated.set(buf, offset);
+          offset += buf.length;
+        }
+        controller.enqueue(concated);
+      }
+    });
+    let response = prelude.pipeThrough(injectRSCPayload(injectStream.pipeThrough(bufferedStream)));
     return [{
       type: 'html',
       contents: _stream().Readable.from(response)
@@ -349,9 +388,13 @@ async function loadBundleUncached(bundle, bundleGraph, getInlineBundleContents)
     return loadAsset((0, _nullthrows().default)(assetsByPublicId.get(publicId)));
   };
   parcelRequire.root = parcelRequire;
+  let publicUrl = bundle.target.publicUrl;
+  if (!publicUrl.endsWith('/')) {
+    publicUrl += '/';
+  }
   parcelRequire.meta = {
     distDir: bundle.target.distDir,
-    publicUrl: bundle.target.publicUrl
+    publicUrl
   };
   parcelRequire.load = async filePath => {
     let bundle = bundleGraph.getBundles().find(b => b.publicId === filePath || b.name === filePath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/packager-react-static",
-  "version": "2.15.3-canary.3473+a6945b6ed",
+  "version": "2.15.3",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,16 +17,16 @@
   "source": "src/ReactStaticPackager.js",
   "engines": {
     "node": ">= 16.0.0",
-    "parcel": "^2.0.0-canary.1848+a6945b6ed"
+    "parcel": "^2.15.3"
   },
   "dependencies": {
-    "@parcel/node-resolver-core": "3.6.3-canary.3473+a6945b6ed",
-    "@parcel/plugin": "2.0.0-canary.1850+a6945b6ed",
-    "@parcel/rust": "2.15.3-canary.3473+a6945b6ed",
-    "@parcel/types": "2.0.0-canary.1850+a6945b6ed",
-    "@parcel/utils": "2.0.0-canary.1850+a6945b6ed",
+    "@parcel/node-resolver-core": "3.6.3",
+    "@parcel/plugin": "2.15.3",
+    "@parcel/rust": "2.15.3",
+    "@parcel/types": "2.15.3",
+    "@parcel/utils": "2.15.3",
     "nullthrows": "^1.1.1",
     "rsc-html-stream": "^0.0.6"
   },
-  "gitHead": "a6945b6ed6cb73c8dde72e9ebc7c25420fe84cdd"
+  "gitHead": "75aa6319c8037ecfbe3dab4ea9b35d10a9a696e3"
 }

package/src/ReactStaticPackager.js

@@ -78,7 +78,37 @@ export default (new Packager({
       parcelRequireName: 'parcelRequire' + hashString(name).slice(-4),
     };
   },
-  async package({bundle, bundleGraph, getInlineBundleContents, config}) {
+  loadBundleConfig({bundle, bundleGraph}) {
+    let pages: Page[] = [];
+    for (let b of bundleGraph.getEntryBundles()) {
+      let main = b.getMainEntry();
+      if (main && b.type === 'js' && b.needsStableName) {
+        let meta = pageMeta(main.meta);
+        pages.push({
+          url: urlJoin(b.target.publicUrl, b.name),
+          name: b.name,
+          ...meta,
+        });
+      }
+    }
+
+    let referencedBundles = [];
+    for (let b of bundleGraph.getReferencedBundles(bundle, {
+      includeInline: false,
+      includeIsolated: false,
+    })) {
+      referencedBundles.push(b.getContentHash());
+    }
+
+    return {pages, referencedBundles};
+  },
+  async package({
+    bundle,
+    bundleGraph,
+    getInlineBundleContents,
+    config,
+    bundleConfig,
+  }) {
     if (bundle.env.shouldScopeHoist) {
       throw new Error('Scope hoisting is not supported with SSG');
     }
@@ -108,19 +138,7 @@ export default (new Packager({
     );
     let {injectRSCPayload} = await import('rsc-html-stream/server');
 
-    let pages: Page[] = [];
-    for (let b of bundleGraph.getEntryBundles()) {
-      let main = b.getMainEntry();
-      if (main && b.type === 'js' && b.needsStableName) {
-        let meta = pageMeta(main.meta);
-        pages.push({
-          url: urlJoin(b.target.publicUrl, b.name),
-          name: b.name,
-          ...meta,
-        });
-      }
-    }
-
+    let pages: Page[] = bundleConfig.pages;
     let meta = pageMeta(nullthrows(bundle.getMainEntry()).meta);
     let props: PageProps = {
       key: 'page',
@@ -197,7 +215,31 @@ export default (new Packager({
     let {prelude} = await prerender(React.createElement(Content), {
       bootstrapScriptContent,
     });
-    let response = prelude.pipeThrough(injectRSCPayload(injectStream));
+
+    // Buffer into a single chunk so hash reference replacement works correctly.
+    // There could potentially be a more optimal way of doing this in the future.
+    let buffers = [];
+    let len = 0;
+    // $FlowFixMe
+    let bufferedStream = new TransformStream({
+      transform(chunk) {
+        len += chunk.length;
+        buffers.push(chunk);
+      },
+      flush(controller) {
+        let concated = new Uint8Array(len);
+        let offset = 0;
+        for (let buf of buffers) {
+          concated.set(buf, offset);
+          offset += buf.length;
+        }
+        controller.enqueue(concated);
+      },
+    });
+
+    let response = prelude.pipeThrough(
+      injectRSCPayload(injectStream.pipeThrough(bufferedStream)),
+    );
 
     return [
       {
@@ -374,9 +416,13 @@ async function loadBundleUncached(
 
   parcelRequire.root = parcelRequire;
 
+  let publicUrl = bundle.target.publicUrl;
+  if (!publicUrl.endsWith('/')) {
+    publicUrl += '/';
+  }
   parcelRequire.meta = {
     distDir: bundle.target.distDir,
-    publicUrl: bundle.target.publicUrl,
+    publicUrl,
   };
 
   parcelRequire.load = async (filePath: string) => {