From 39eb13b4fa2b5f959f4fc252b812f038e5508202 Mon Sep 17 00:00:00 2001 From: Christian Fehmer Date: Tue, 17 Oct 2023 13:40:41 +0200 Subject: [PATCH] build: fix development mode detection on windows (fehmer) (#4724) * fix: development mode detection on windows * fix: development mode detection on windows --- frontend/package.json | 2 +- frontend/webpack/config.base.js | 15 --------------- frontend/webpack/config.dev.js | 8 ++++++++ frontend/webpack/config.prod.js | 5 +++++ 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 305ce43cb..28aa0ea45 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -8,7 +8,7 @@ "dep-graph": "madge -c -i \"dep-graph.png\" ./src/ts", "build": "npx gulp build", "build-live": "export COMMIT_HASH=`git rev-parse --short HEAD` && npx gulp build-production", - "dev": "concurrently \"NODE_ENV=development webpack serve --config=./webpack/config.dev.js\" \"npx gulp watch\"", + "dev": "concurrently \"webpack serve --config=./webpack/config.dev.js\" \"npx gulp watch\"", "deploy-live": "npm run build-live && firebase deploy -P live --only hosting", "deploy-preview": "npm run build-live && firebase hosting:channel:deploy preview -P live --expires 2h", "tsc": "tsc", diff --git a/frontend/webpack/config.base.js b/frontend/webpack/config.base.js index ad39c4245..4b9d4534c 100644 --- a/frontend/webpack/config.base.js +++ b/frontend/webpack/config.base.js @@ -3,8 +3,6 @@ const CopyPlugin = require("copy-webpack-plugin"); const CircularDependencyPlugin = require("circular-dependency-plugin"); const MiniCssExtractPlugin = require("mini-css-extract-plugin"); const HtmlWebpackPlugin = require("html-webpack-plugin"); -const webpack = require("webpack"); -require("dotenv").config(); let circularImports = 0; @@ -21,15 +19,6 @@ const htmlWebpackPlugins = [ }); }); -let BACKEND_URL = "https://api.monkeytype.com"; -if (process.env.NODE_ENV === "development") { - if (process.env.BACKEND_URL) { - BACKEND_URL = process.env.BACKEND_URL; - } else { - BACKEND_URL = "http://localhost:5005"; - } -} - /** @type { import('webpack').Configuration } */ const BASE_CONFIG = { entry: { @@ -88,10 +77,6 @@ const BASE_CONFIG = { }, }, plugins: [ - new webpack.DefinePlugin({ - BACKEND_URL: JSON.stringify(BACKEND_URL), - IS_DEVELOPMENT: JSON.stringify(process.env.NODE_ENV === "development"), - }), new CircularDependencyPlugin({ exclude: /node_modules/, include: /./, diff --git a/frontend/webpack/config.dev.js b/frontend/webpack/config.dev.js index e24ce819c..b5355d69e 100644 --- a/frontend/webpack/config.dev.js +++ b/frontend/webpack/config.dev.js @@ -2,6 +2,8 @@ const { resolve } = require("path"); const { merge } = require("webpack-merge"); const BASE_CONFIG = require("./config.base"); const ExtraWatchWebpackPlugin = require("extra-watch-webpack-plugin"); +const webpack = require("webpack"); +require("dotenv").config(); /** @type { import('webpack').Configuration } */ const DEV_CONFIG = { @@ -21,6 +23,12 @@ const DEV_CONFIG = { new ExtraWatchWebpackPlugin({ dirs: [resolve(__dirname, "../static/html")], }), + new webpack.DefinePlugin({ + BACKEND_URL: JSON.stringify( + process.env.BACKEND_URL || "http://localhost:5005" + ), + IS_DEVELOPMENT: JSON.stringify(true), + }), ], }; diff --git a/frontend/webpack/config.prod.js b/frontend/webpack/config.prod.js index c9df6fa7e..05622e79f 100644 --- a/frontend/webpack/config.prod.js +++ b/frontend/webpack/config.prod.js @@ -7,6 +7,7 @@ const JsonMinimizerPlugin = require("json-minimizer-webpack-plugin"); const WorkboxPlugin = require("workbox-webpack-plugin"); const BASE_CONFIG = require("./config.base"); +const webpack = require("webpack"); function pad(numbers, maxLength, fillString) { return numbers.map((number) => @@ -160,6 +161,10 @@ const PRODUCTION_CONFIG = { // }, ], }), + new webpack.DefinePlugin({ + BACKEND_URL: JSON.stringify("https://api.monkeytype.com"), + IS_DEVELOPMENT: JSON.stringify(false), + }), ], };