@cpp.js/plugin-webpack 2.0.0-beta.29 → 2.0.0-beta.30

package/index.js

@@ -44,11 +44,17 @@ export default class CppjsWebpackPlugin {
         const buildTarget = isDev ? buildTargetDebug : buildTargetRelease;
         await buildDependencies({ targetParams: { ...targetParams, buildType: [buildTarget.buildType] } });
         const force = isSourceNewer(buildTarget);
-        createLib(buildTarget, 'Source', { force, buildSource: true });
-        createLib(buildTarget, 'Bridge', { force, buildSource: false, nativeGlob: [`${state.config.paths.cli}/assets/cpp-runtime/commonBridges.cpp`, ...this.bridges] });
-        await buildWasm(buildTarget, { force });
+        const sourceBuilt = createLib(buildTarget, 'Source', { force, buildSource: true });
+        // Bridge cache is keyed on the nativeGlob fingerprint: a changed bridge
+        // set rebuilds the lib even without source changes, and a rebuilt lib
+        // must force the final link too.
+        const bridgeBuilt = createLib(buildTarget, 'Bridge', { force, buildSource: false, nativeGlob: [`${state.config.paths.cli}/assets/cpp-runtime/commonBridges.cpp`, ...this.bridges] });
+        await buildWasm(buildTarget, { force: force || Boolean(sourceBuilt) || Boolean(bridgeBuilt) });
         if (!isDev) {
             const output = state.config.paths.output === state.config.paths.build ? compilation.options.output.path : state.config.paths.output;
+            // On a first-ever build the output dir may not exist yet when this
+            // hook runs; copyFileSync reports that as ENOENT too.
+            fs.mkdirSync(output, { recursive: true });
             fs.copyFileSync(`${state.config.paths.build}/${buildTarget.jsName}`, `${output}/cpp.js`);
             fs.copyFileSync(`${state.config.paths.build}/${buildTarget.wasmName}`, `${output}/cpp.wasm`);
 
@@ -112,6 +118,22 @@ export default class CppjsWebpackPlugin {
             },
         });
 
+        middlewares.unshift({
+            name: '/cpp.data.txt',
+            path: '/cpp.data.txt',
+            middleware: (req, res) => {
+                const filePath = `${state.config.paths.build}/${buildTargetDebug.dataTxtName}`;
+                res.setHeader('Cross-Origin-Opener-Policy', 'same-origin');
+                res.setHeader('Cross-Origin-Embedder-Policy', 'require-corp');
+                if (!fs.existsSync(filePath)) {
+                    res.statusCode = 404;
+                    res.end();
+                    return;
+                }
+                fs.createReadStream(filePath).pipe(res);
+            },
+        });
+
         return middlewares;
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cpp.js/plugin-webpack",
-  "version": "2.0.0-beta.29",
+  "version": "2.0.0-beta.30",
   "description": "Cpp.js Webpack plugin: A tool for seamless C++ integration with the Webpack bundler.",
   "homepage": "https://github.com/bugra9/cpp.js/tree/main/packages/cppjs-plugin-webpack#readme",
   "repository": "https://github.com/bugra9/cpp.js.git",
@@ -8,7 +8,7 @@
   "type": "module",
   "main": "index.js",
   "dependencies": {
-    "cpp.js": "^2.0.0-beta.29"
+    "cpp.js": "^2.0.0-beta.30"
   },
   "peerDependencies": {
     "webpack": ">=5"