fix reslve path, remove extra packages

mubaidr · Aug 27, 2019 · 65aebf9 · 65aebf9
1 parent 8dfbafe
commit 65aebf9
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 39 deletions.
diff --git a/_scripts/webpack.main.config.js b/_scripts/webpack.main.config.js
@@ -49,8 +49,8 @@ const config = {
   resolve: {
     extensions: ['.ts', '.js', '.json'],
     alias: {
-      '@': path.join(__dirname, './src/'),
-      src: path.join(__dirname, './src/'),
+      '@': path.join(__dirname, '../src/'),
+      src: path.join(__dirname, '../src/'),
     },
   },
   target: 'electron-main',

diff --git a/_scripts/webpack.renderer.config.js b/_scripts/webpack.renderer.config.js
@@ -1,5 +1,4 @@
 const path = require('path')
-const fg = require('fast-glob')
 const webpack = require('webpack')
 const HtmlWebpackPlugin = require('html-webpack-plugin')
 const ScriptExtHtmlWebpackPlugin = require('script-ext-html-webpack-plugin')
@@ -116,8 +115,8 @@ const config = {
   resolve: {
     alias: {
       vue$: 'vue/dist/vue.common.js',
-      '@': path.join(__dirname, './src/'),
-      src: path.join(__dirname, './src/'),
+      '@': path.join(__dirname, '../src/'),
+      src: path.join(__dirname, '../src/'),
       icons: path.join(__dirname, '../_icons/'),
     },
     extensions: ['.ts', '.js', '.vue', '.json'],

diff --git a/_scripts/webpack.workers.config.js b/_scripts/webpack.workers.config.js
@@ -48,8 +48,8 @@ const config = {
   ],
   resolve: {
     alias: {
-      '@': path.join(__dirname, './src/'),
-      src: path.join(__dirname, './src/'),
+      '@': path.join(__dirname, '../src/'),
+      src: path.join(__dirname, '../src/'),
     },
     extensions: ['.ts', '.js', '.json'],
   },

diff --git a/package.json b/package.json
@@ -19,59 +19,40 @@
     "@babel/plugin-proposal-object-rest-spread": "^7.5.5",
     "@babel/preset-env": "^7.5.5",
     "@babel/preset-typescript": "^7.3.3",
-    "@types/babel__core": "^7.1.2",
-    "@types/cheerio": "^0.22.13",
-    "@types/core-js": "^2.5.2",
-    "@types/csvtojson": "^1.1.5",
-    "@types/electron-debug": "^2.1.0",
-    "@types/electron-settings": "^3.1.1",
-    "@types/eslint": "^4.16.8",
-    "@types/eslint-plugin-prettier": "^2.2.0",
-    "@types/html-webpack-plugin": "^3.2.1",
-    "@types/node": "^12.7.1",
-    "@types/node-sass": "^4.11.0",
-    "@types/prettier": "^1.18.1",
-    "@types/sass": "^1.16.0",
-    "@types/script-ext-html-webpack-plugin": "^2.1.1",
-    "@types/sharp": "^0.22.2",
-    "@types/uuid": "^3.4.5",
-    "@types/webpack": "^4.32.1",
-    "@types/webpack-dev-server": "^3.1.7",
-    "@types/webpack-hot-middleware": "^2.16.5",
-    "@typescript-eslint/eslint-plugin": "^1.13.0",
-    "@typescript-eslint/parser": "^1.13.0",
-    "acorn": "^6.2.1",
-    "babel-eslint": "^10.0.2",
+    "@typescript-eslint/eslint-plugin": "^2.0.0",
+    "@typescript-eslint/parser": "^2.0.0",
+    "acorn": "^7.0.0",
+    "babel-eslint": "^10.0.3",
     "babel-loader": "^8.0.6",
     "css-loader": "^3.2.0",
     "devtron": "^1.4.0",
-    "electron": "^6.0.1",
+    "electron": "^6.0.4",
     "electron-builder": "^21.2.0",
     "electron-debug": "^3.0.1",
-    "eslint": "^6.1.0",
-    "eslint-config-prettier": "^6.0.0",
+    "eslint": "^6.2.2",
+    "eslint-config-prettier": "^6.1.0",
     "eslint-plugin-prettier": "^3.1.0",
     "eslint-plugin-vue": "^5.2.3",
     "fast-glob": "^3.0.4",
     "file-loader": "^4.2.0",
     "html-webpack-plugin": "^3.2.0",
     "node-loader": "^0.6.0",
     "prettier": "^1.18.2",
-    "sass": "^1.22.9",
-    "sass-loader": "^7.2.0",
+    "sass": "^1.22.10",
+    "sass-loader": "^7.3.1",
     "script-ext-html-webpack-plugin": "^2.1.4",
     "style-loader": "^1.0.0",
     "tree-kill": "1.2.1",
     "typescript": "^3.5.3",
-    "typesync": "^0.5.2",
+    "typesync": "^0.6.1",
     "url-loader": "^2.1.0",
     "vue-devtools": "^5.1.3",
     "vue-eslint-parser": "^6.0.4",
     "vue-loader": "^15.7.1",
     "vue-style-loader": "^4.1.2",
     "vue-template-compiler": "^2.6.10",
-    "webpack": "^4.39.1",
-    "webpack-cli": "^3.3.6",
+    "webpack": "^4.39.3",
+    "webpack-cli": "^3.3.7",
     "webpack-dev-server": "^3.8.0",
     "webpack-hot-middleware": "^2.25.0"
   },
@@ -96,7 +77,7 @@
     "postinstall": "electron-builder install-app-deps",
     "prettier": "prettier --write \"src/**/*.{js,ts,vue}\"",
     "release": "build",
-    "typesync": "typesync && npm install"
+    "typesync": "typesync --ignoredeps=dev && npm install"
   },
   "version": "0.0.1"
 }