Merge branch 'master' of https://github.com/mizok/webpack-template

mizok · Apr 17, 2022 · 17ce5cd · 17ce5cd
2 parents bc14fb6 + 694d8e1
commit 17ce5cd
Show file tree

Hide file tree

Showing 3 changed files with 180 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,11 @@
 title: webpack-template
 date: 
 author: Mizok
+<<<<<<< HEAD
 version: 0.9.0
+=======
+version: 0.9.3
+>>>>>>> 694d8e1816d745e2a5576d5c8f017ed5263ad53d
 tags: 
 ---
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "npx cross-env TS_NODE_PROJECT=\"tsconfig-for-webpack-config.json\" webpack --config webpack.config.ts --mode production",
     "dev": "npx cross-env TS_NODE_PROJECT=\"tsconfig-for-webpack-config.json\" webpack serve --config webpack.config.ts  --mode development",
-    "gh-deploy": "npm run build && git add dist -f && git commit -m 'dist subtree commit' && git subtree push --prefix dist origin gh-pages"
+    "deploy": "npm run build && npx gh-pages -d dist"
   },
   "repository": {
     "type": "git",
@@ -25,6 +25,7 @@
     "cross-env": "^7.0.3",
     "css-loader": "^5.2.1",
     "ejs": "^3.1.6",
+    "gh-pages": "^3.2.3",
     "html-loader": "^3.0.1",
     "html-webpack-plugin": "^5.3.1",
     "mini-css-extract-plugin": "^1.5.0",
@@ -52,4 +53,4 @@
     "> 1%",
     "IE 10"
   ]
-}
+}