diff --git a/.babelrc b/.babelrc index 002b4aa..1239897 100644 --- a/.babelrc +++ b/.babelrc @@ -1,3 +1,4 @@ { - "presets": ["env"] -} + "presets": ["@babel/preset-env"], + "plugins": ["@babel/plugin-proposal-optional-chaining"] +} \ No newline at end of file diff --git a/.eslintrc b/.eslintrc index 8241e85..991811a 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,9 +1,10 @@ { + "parser": "babel-eslint", "extends": [ - "plugin:vue/vue3-recommended", + "plugin:vue/vue3-recommended" ], "rules": { - "indent": ["error", 2] + "indent": ["error", 2], }, "parserOptions": { "ecmaVersion": 6, diff --git a/build/rules/javascript.js b/build/rules/javascript.js index d4e52a8..afa9326 100644 --- a/build/rules/javascript.js +++ b/build/rules/javascript.js @@ -7,5 +7,8 @@ const config = require('../app.config') module.exports = { test: /\.js$/, exclude: /node_modules/, - loader: 'eslint-loader', + loader: 'babel-loader', + options: { + presets: ['@babel/preset-env'], + }, } diff --git a/package.json b/package.json index 19fd091..ad4f9b0 100644 --- a/package.json +++ b/package.json @@ -10,20 +10,21 @@ "lint:sass": "stylelint resources/assets/sass/**/*.{scss,sass}", "lint": "npm run lint:js && npm run lint:sass" }, - "dependencies": {}, "devDependencies": { "@babel/core": "^7.12.10", + "@babel/plugin-proposal-optional-chaining": "^7.12.7", "@babel/preset-env": "^7.12.11", "autoprefixer": "^6.7.7", "babel-core": "^6.24.1", - "babel-loader": "^7.1.5", + "babel-eslint": "^10.1.0", + "babel-loader": "^8.2.2", "babel-preset-env": "^1.3.3", "browser-sync": "^2.18.8", "browser-sync-webpack-plugin": "^2.3.0", "clean-webpack-plugin": "^0.1.16", "copy-webpack-plugin": "^7.0.0", "cross-env": "^5.0.1", - "css-loader": "^0.28.0", + "css-loader": "^5.0.1", "dotenv": "^5.0.1", "eslint": "^7.19.0", "eslint-loader": "^4.0.2", @@ -32,8 +33,8 @@ "extract-text-webpack-plugin": "^3.0.0", "file-loader": "^0.11.1", "image-minimizer-webpack-plugin": "^2.2.0", - "imagemin-webpack-plugin": "^1.4.4", - "img-loader": "^2.0.0", + "imagemin-webpack-plugin": "^2.4.2", + "img-loader": "^3.0.2", "isdev": "^1.0.1", "mini-css-extract-plugin": "^1.3.5", "node-sass": "^4.5.2",