From c1a95d112f84864707d3b58981ddfefdd26ae070 Mon Sep 17 00:00:00 2001 From: Sam Tolmay Date: Thu, 15 Oct 2020 16:01:01 +0200 Subject: [PATCH] chore: update webpack server config --- packages/blockTools/package.json | 9 +++++---- packages/express/webpack.dev.js | 8 +++++++- packages/express/webpack.prod.js | 6 ++++++ packages/layout/package.json | 9 +++++---- packages/renderer/package.json | 6 +++--- packages/renderer/src/utils/graphql/useGqlClient.js | 2 +- packages/renderer/webpack.dev.js | 11 ++++++++++- packages/renderer/webpack.prod.js | 7 +++++++ 8 files changed, 44 insertions(+), 14 deletions(-) diff --git a/packages/blockTools/package.json b/packages/blockTools/package.json index b17bc3244..a6e4a0cd2 100644 --- a/packages/blockTools/package.json +++ b/packages/blockTools/package.json @@ -26,12 +26,13 @@ "dist/*" ], "scripts": { - "start": "webpack serve", "build": "babel src --copy-files --out-dir dist", - "test": "jest --coverage", + "dev": "webpack serve", + "npm-publish": "npm publish --access public", "prepare": "yarn build", "prepublishOnly": "yarn build", - "npm-publish": "npm publish --access public" + "start": "webpack serve", + "test": "jest --coverage" }, "dependencies": { "@lowdefy/helpers": "1.0.0", @@ -70,4 +71,4 @@ "yaml-jest": "1.0.5", "yaml-loader": "0.6.0" } -} +} \ No newline at end of file diff --git a/packages/express/webpack.dev.js b/packages/express/webpack.dev.js index 1980db6d8..793892444 100644 --- a/packages/express/webpack.dev.js +++ b/packages/express/webpack.dev.js @@ -1,4 +1,5 @@ const { merge } = require('webpack-merge'); +const webpack = require('webpack'); const common = require('./webpack.common.js'); const path = require('path'); @@ -7,6 +8,11 @@ module.exports = merge(common, { devtool: 'eval-source-map', devServer: { contentBase: path.join(__dirname, 'dist'), - port: 3001, + port: 3000, }, + plugins: [ + new webpack.DefinePlugin({ + 'process.env.NODE_ENV': JSON.stringify('development'), + }), + ], }); diff --git a/packages/express/webpack.prod.js b/packages/express/webpack.prod.js index ed0670ee1..3ca67f4f3 100644 --- a/packages/express/webpack.prod.js +++ b/packages/express/webpack.prod.js @@ -1,6 +1,12 @@ const { merge } = require('webpack-merge'); +const webpack = require('webpack'); const common = require('./webpack.common.js'); module.exports = merge(common, { mode: 'production', + plugins: [ + new webpack.DefinePlugin({ + 'process.env.NODE_ENV': JSON.stringify('production'), + }), + ], }); diff --git a/packages/layout/package.json b/packages/layout/package.json index 1cf027b28..af81def06 100644 --- a/packages/layout/package.json +++ b/packages/layout/package.json @@ -26,12 +26,13 @@ "dist/*" ], "scripts": { - "start": "webpack serve", "build": "babel src --out-dir dist", - "test": "jest --coverage", + "dev": "webpack serve", + "npm-publish": "npm publish --access public", "prepare": "yarn build", "prepublishOnly": "yarn build", - "npm-publish": "npm publish --access public" + "start": "webpack serve", + "test": "jest --coverage" }, "dependencies": { "@lowdefy/type": "1.0.1", @@ -68,4 +69,4 @@ "yaml-jest": "1.0.5", "yaml-loader": "0.6.0" } -} +} \ No newline at end of file diff --git a/packages/renderer/package.json b/packages/renderer/package.json index f78bd844f..458b59c12 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json @@ -29,8 +29,8 @@ "build": "webpack --config webpack.prod.js", "clean": "rm -rf dist", "prepublishOnly": "yarn build", - "serve": "serve dist -p 3001", - "start": "webpack serve" + "start": "serve dist -p 3001", + "dev": "webpack serve --config webpack.dev.js" }, "dependencies": { "@apollo/client": "3.2.4", @@ -64,4 +64,4 @@ "webpack-dev-server": "3.11.0", "webpack-merge": "5.2.0" } -} +} \ No newline at end of file diff --git a/packages/renderer/src/utils/graphql/useGqlClient.js b/packages/renderer/src/utils/graphql/useGqlClient.js index 33dc76074..69408ca4b 100644 --- a/packages/renderer/src/utils/graphql/useGqlClient.js +++ b/packages/renderer/src/utils/graphql/useGqlClient.js @@ -31,7 +31,7 @@ const retryLink = new RetryLink(); // TODO: make uri configurable const httpLink = new HttpLink({ - uri: '/api/graphql', + uri: process.env.GRAPHQL_URI, }); // TODO: Handle errors diff --git a/packages/renderer/webpack.dev.js b/packages/renderer/webpack.dev.js index 1980db6d8..f230d125d 100644 --- a/packages/renderer/webpack.dev.js +++ b/packages/renderer/webpack.dev.js @@ -1,7 +1,9 @@ const { merge } = require('webpack-merge'); -const common = require('./webpack.common.js'); +const webpack = require('webpack'); const path = require('path'); +const common = require('./webpack.common.js'); + module.exports = merge(common, { mode: 'development', devtool: 'eval-source-map', @@ -9,4 +11,11 @@ module.exports = merge(common, { contentBase: path.join(__dirname, 'dist'), port: 3001, }, + + plugins: [ + new webpack.DefinePlugin({ + 'process.env.NODE_ENV': JSON.stringify('development'), + 'process.env.GRAPHQL_URI': JSON.stringify('http://localhost:3000/api/graphql'), + }), + ], }); diff --git a/packages/renderer/webpack.prod.js b/packages/renderer/webpack.prod.js index ed0670ee1..9ad3e01cc 100644 --- a/packages/renderer/webpack.prod.js +++ b/packages/renderer/webpack.prod.js @@ -1,6 +1,13 @@ const { merge } = require('webpack-merge'); +const webpack = require('webpack'); const common = require('./webpack.common.js'); module.exports = merge(common, { mode: 'production', + plugins: [ + new webpack.DefinePlugin({ + 'process.env.NODE_ENV': JSON.stringify('production'), + 'process.env.GRAPHQL_URI': JSON.stringify('/api/graphql'), + }), + ], });