From 716ac360313861d3c964c3bb9f859fed0683ff39 Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Mon, 30 Sep 2019 23:51:46 +0300 Subject: [PATCH 1/3] Add webpack-dev-server --- package.json | 13 +++++++------ webpack.config.js => webpack.common.js | 12 ------------ webpack.dev.js | 19 +++++++++++++++++++ webpack.prod.js | 19 +++++++++++++++++++ 4 files changed, 45 insertions(+), 18 deletions(-) rename webpack.config.js => webpack.common.js (62%) create mode 100644 webpack.dev.js create mode 100644 webpack.prod.js diff --git a/package.json b/package.json index 51b90f4ee8..a8a056043f 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,10 @@ "eslint": "^5.16.0", "file-loader": "^3.0.1", "style-loader": "^0.23.1", - "webpack": "^4.29.5", - "webpack-cli": "^3.2.3" + "webpack": "^4.41.0", + "webpack-cli": "^3.3.9", + "webpack-dev-server": "^3.8.1", + "webpack-merge": "^4.2.2" }, "dependencies": { "jstree": "^3.3.7", @@ -23,9 +25,8 @@ "libjass": "^0.11.0" }, "scripts": { - "dev": "webpack --mode development", - "build": "webpack --mode production", - "lint": "eslint \"src\"", - "prepare": "webpack --mode production" + "start": "webpack-dev-server --config webpack.dev.js --open", + "build": "webpack --config webpack.prod.js", + "lint": "eslint \"src\"" } } diff --git a/webpack.config.js b/webpack.common.js similarity index 62% rename from webpack.config.js rename to webpack.common.js index 9ce0a85b7a..ea5bd7ca81 100644 --- a/webpack.config.js +++ b/webpack.common.js @@ -1,14 +1,8 @@ const path = require('path'); -const CopyPlugin = require('copy-webpack-plugin'); module.exports = { context: path.resolve(__dirname, 'src'), entry: './bundle.js', - output: { - filename: 'bundle.js', - path: path.resolve(__dirname, 'dist'), - libraryTarget: 'amd-require' - }, resolve: { modules: [ path.resolve(__dirname, 'node_modules') @@ -26,10 +20,4 @@ module.exports = { } ] }, - plugins: [ - new CopyPlugin([{ - from: '**/*', - to: '.' - }]) - ] }; diff --git a/webpack.dev.js b/webpack.dev.js new file mode 100644 index 0000000000..27c954568d --- /dev/null +++ b/webpack.dev.js @@ -0,0 +1,19 @@ +const path = require("path"); +const common = require("./webpack.common"); +const merge = require("webpack-merge"); +const CopyPlugin = require('copy-webpack-plugin'); + +module.exports = merge(common, { + mode: "development", + output: { + filename: 'bundle.js', + path: path.resolve(__dirname, 'dist'), + libraryTarget: 'amd-require' + }, + plugins: [ + new CopyPlugin([{ + from: '**/*', + to: '.' + }]) + ] +}); diff --git a/webpack.prod.js b/webpack.prod.js new file mode 100644 index 0000000000..17469a1f7f --- /dev/null +++ b/webpack.prod.js @@ -0,0 +1,19 @@ +const path = require("path"); +const common = require("./webpack.common"); +const merge = require("webpack-merge"); +const CopyPlugin = require('copy-webpack-plugin'); + +module.exports = merge(common, { + mode: "production", + output: { + filename: 'bundle.js', + path: path.resolve(__dirname, 'dist'), + libraryTarget: 'amd-require' + }, + plugins: [ + new CopyPlugin([{ + from: '**/*', + to: '.' + }]) + ] +}); From 2572de460bbb2d7dfc9ad2b979a27b439777e282 Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Tue, 1 Oct 2019 02:58:05 +0300 Subject: [PATCH 2/3] move copyplugin to webpack.common --- webpack.common.js | 27 +++++++++++---------------- webpack.dev.js | 25 +++++++++++++++---------- webpack.prod.js | 25 +++++++++++++++---------- 3 files changed, 41 insertions(+), 36 deletions(-) diff --git a/webpack.common.js b/webpack.common.js index ea5bd7ca81..05b2b0cb46 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -1,23 +1,18 @@ -const path = require('path'); +const path = require("path"); +const CopyPlugin = require("copy-webpack-plugin"); module.exports = { - context: path.resolve(__dirname, 'src'), - entry: './bundle.js', + context: path.resolve(__dirname, "src"), + entry: "./bundle.js", resolve: { modules: [ - path.resolve(__dirname, 'node_modules') - ] - }, - module: { - rules: [ - { - test: /\.css$/i, - use: ['style-loader', 'css-loader'] - }, - { - test: /\.(png|jpg|gif)$/i, - use: ['file-loader'] - } + path.resolve(__dirname, "node_modules") ] }, + plugins: [ + new CopyPlugin([{ + from: "**/*", + to: "." + }]) + ] }; diff --git a/webpack.dev.js b/webpack.dev.js index 27c954568d..99d7bb1b4a 100644 --- a/webpack.dev.js +++ b/webpack.dev.js @@ -1,19 +1,24 @@ const path = require("path"); const common = require("./webpack.common"); const merge = require("webpack-merge"); -const CopyPlugin = require('copy-webpack-plugin'); module.exports = merge(common, { mode: "development", output: { - filename: 'bundle.js', - path: path.resolve(__dirname, 'dist'), - libraryTarget: 'amd-require' + filename: "bundle.js", + path: path.resolve(__dirname, "dist"), + libraryTarget: "amd-require" + }, + module: { + rules: [ + { + test: /\.css$/i, + use: ["style-loader", "css-loader"] + }, + { + test: /\.(png|jpg|gif)$/i, + use: ["file-loader"] + } + ] }, - plugins: [ - new CopyPlugin([{ - from: '**/*', - to: '.' - }]) - ] }); diff --git a/webpack.prod.js b/webpack.prod.js index 17469a1f7f..8880a2168c 100644 --- a/webpack.prod.js +++ b/webpack.prod.js @@ -1,19 +1,24 @@ const path = require("path"); const common = require("./webpack.common"); const merge = require("webpack-merge"); -const CopyPlugin = require('copy-webpack-plugin'); module.exports = merge(common, { mode: "production", output: { - filename: 'bundle.js', - path: path.resolve(__dirname, 'dist'), - libraryTarget: 'amd-require' + filename: "bundle.js", + path: path.resolve(__dirname, "dist"), + libraryTarget: "amd-require" + }, + module: { + rules: [ + { + test: /\.css$/i, + use: ["style-loader", "css-loader"] + }, + { + test: /\.(png|jpg|gif)$/i, + use: ["file-loader"] + } + ] }, - plugins: [ - new CopyPlugin([{ - from: '**/*', - to: '.' - }]) - ] }); From 0e752f0e45eff0df9a7e5273199702a0c8d7536c Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Wed, 2 Oct 2019 16:40:46 +0300 Subject: [PATCH 3/3] change start to serve --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a8a056043f..e9bafe874f 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "libjass": "^0.11.0" }, "scripts": { - "start": "webpack-dev-server --config webpack.dev.js --open", + "serve": "webpack-dev-server --config webpack.dev.js --open", "build": "webpack --config webpack.prod.js", "lint": "eslint \"src\"" }