wasm: Fix production API path. (#788)

Webpack is putting this in the static dir.
tidbyt · May 23, 2023 · c3e7744 · c3e7744
1 parent 71a6f77
commit c3e7744
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 23 deletions.
diff --git a/webpack.common.js b/webpack.common.js
@@ -1,25 +1,4 @@
-const webpack = require('webpack');
-
-let plugins = [];
-
-if (process.env.PIXLET_BACKEND === "wasm") {
-    plugins.push(
-        new webpack.DefinePlugin({
-            'PIXLET_WASM': JSON.stringify(true),
-            'PIXLET_API_BASE': JSON.stringify('pixlet'),
-        })
-    );
-} else {
-    plugins.push(
-        new webpack.DefinePlugin({
-            'PIXLET_WASM': JSON.stringify(false),
-            'PIXLET_API_BASE': JSON.stringify(''),
-        })
-    );
-}
-
 module.exports = {
-    plugins,
     resolve: {
         extensions: ['*', '.js', '.jsx'],
     },

diff --git a/webpack.dev.js b/webpack.dev.js
@@ -1,5 +1,7 @@
 const { merge } = require('webpack-merge');
 const common = require('./webpack.common.js');
+const webpack = require('webpack');
+
 const HtmlWebPackPlugin = require("html-webpack-plugin");
 
 const htmlPlugin = new HtmlWebPackPlugin({
@@ -8,6 +10,23 @@ const htmlPlugin = new HtmlWebPackPlugin({
     favicon: 'src/favicon.png'
 });
 
+let plugins = [htmlPlugin];
+if (process.env.PIXLET_BACKEND === "wasm") {
+    plugins.push(
+        new webpack.DefinePlugin({
+            'PIXLET_WASM': JSON.stringify(true),
+            'PIXLET_API_BASE': JSON.stringify('pixlet'),
+        })
+    );
+} else {
+    plugins.push(
+        new webpack.DefinePlugin({
+            'PIXLET_WASM': JSON.stringify(false),
+            'PIXLET_API_BASE': JSON.stringify(''),
+        })
+    );
+}
+
 module.exports = merge(common, {
     mode: 'development',
     devtool: 'source-map',
@@ -22,5 +41,5 @@ module.exports = merge(common, {
             },
         ],
     },
-    plugins: [htmlPlugin]
+    plugins: plugins,
 });
diff --git a/webpack.prod.js b/webpack.prod.js
@@ -1,5 +1,6 @@
 const { merge } = require('webpack-merge');
 const common = require('./webpack.common.js');
+const webpack = require('webpack');
 const path = require('path');
 const HtmlWebPackPlugin = require("html-webpack-plugin");
 
@@ -9,6 +10,23 @@ const htmlPlugin = new HtmlWebPackPlugin({
     favicon: 'src/favicon.png'
 });
 
+let plugins = [htmlPlugin];
+if (process.env.PIXLET_BACKEND === "wasm") {
+    plugins.push(
+        new webpack.DefinePlugin({
+            'PIXLET_WASM': JSON.stringify(true),
+            'PIXLET_API_BASE': JSON.stringify('static/pixlet'),
+        })
+    );
+} else {
+    plugins.push(
+        new webpack.DefinePlugin({
+            'PIXLET_WASM': JSON.stringify(false),
+            'PIXLET_API_BASE': JSON.stringify(''),
+        })
+    );
+}
+
 module.exports = merge(common, {
     mode: 'production',
     devtool: 'source-map',
@@ -19,5 +37,5 @@ module.exports = merge(common, {
         filename: '[name].[chunkhash].js',
         clean: true,
     },
-    plugins: [htmlPlugin]
+    plugins: plugins,
 });