From 626a63ddd91a9612cf6901484119054e60acb4d3 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sat, 9 Feb 2019 19:15:18 -0800 Subject: [PATCH] Some code cleanup --- package.json | 1 - .../pterodactyl/templates/wrapper.blade.php | 1 - webpack.config.js | 13 +--- yarn.lock | 68 +------------------ 4 files changed, 2 insertions(+), 81 deletions(-) diff --git a/package.json b/package.json index 808b8040..b39c5f65 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,6 @@ "uglifyjs-webpack-plugin": "^2.1.1", "vue-devtools": "^3.1.9", "vue-feather-icons": "^4.7.1", - "vue-loader": "^15.6.2", "vue-mc": "^0.2.4", "vue-template-compiler": "^2.5.16", "vueify-insert-css": "^1.0.0", diff --git a/resources/themes/pterodactyl/templates/wrapper.blade.php b/resources/themes/pterodactyl/templates/wrapper.blade.php index f84e243c..35930d63 100644 --- a/resources/themes/pterodactyl/templates/wrapper.blade.php +++ b/resources/themes/pterodactyl/templates/wrapper.blade.php @@ -42,7 +42,6 @@ @show @section('scripts') {!! $asset->js('main.js') !!} - {!! $asset->js('vue.js') !!} {!! $asset->js('vendor.js') !!} {!! $asset->js('locales.js') !!} @show diff --git a/webpack.config.js b/webpack.config.js index 9f71b883..8071c731 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -9,7 +9,6 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const ShellPlugin = require('webpack-shell-plugin'); const PurgeCssPlugin = require('purgecss-webpack-plugin'); const UglifyJsPlugin = require('uglifyjs-webpack-plugin'); -const VueLoaderPlugin = require('vue-loader/lib/plugin'); const isProduction = process.env.NODE_ENV === 'production'; @@ -28,7 +27,6 @@ let plugins = [ integrity: true, integrityHashes: ['sha384'], }), - new VueLoaderPlugin(), ]; if (isProduction) { @@ -122,10 +120,6 @@ module.exports = { }, module: { rules: [ - { - test: /\.vue$/, - loader: 'vue-loader', - }, { test: /\.js$/, loader: 'babel-loader', @@ -184,18 +178,13 @@ module.exports = { ], splitChunks: { cacheGroups: { - vue: { - test: /[\\/]node_modules[\\/](vue\w?)[\\/]/, - name: 'vue', - chunks: 'initial', - }, locales: { test: /locales/, name: 'locales', chunks: 'initial', }, vendors: { - test: /[\\/]node_modules[\\/](?!vue)(.*)[\\/]/, + test: /[\\/]node_modules[\\/]/, name: 'vendor', chunks: 'initial', }, diff --git a/yarn.lock b/yarn.lock index cdb46f42..3a912a87 100644 --- a/yarn.lock +++ b/yarn.lock @@ -725,20 +725,6 @@ version "1.13.6" resolved "http://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.13.6.tgz#128d1685a7c34d31ed17010fc87d6a12c1de6976" -"@vue/component-compiler-utils@^2.5.1": - version "2.5.2" - resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-2.5.2.tgz#a8d57e773354ab10e4742c7d6a8dd86184d4d7be" - dependencies: - consolidate "^0.15.1" - hash-sum "^1.0.2" - lru-cache "^4.1.2" - merge-source-map "^1.1.0" - postcss "^7.0.14" - postcss-selector-parser "^5.0.0" - prettier "1.16.3" - source-map "~0.6.1" - vue-template-es2015-compiler "^1.8.2" - "@webassemblyjs/ast@1.5.9": version "1.5.9" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.5.9.tgz#b2770182678691ab4949d593105c15d4074fedb6" @@ -1375,7 +1361,7 @@ blob@0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.4.tgz#bcf13052ca54463f30f9fc7e95b9a47630a94921" -bluebird@^3.1.1, bluebird@^3.5.1: +bluebird@^3.5.1: version "3.5.1" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9" @@ -1993,12 +1979,6 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" -consolidate@^0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7" - dependencies: - bluebird "^3.1.1" - constants-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" @@ -3309,10 +3289,6 @@ hash-base@^3.0.0: inherits "^2.0.1" safe-buffer "^5.0.1" -hash-sum@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04" - hash.js@^1.0.0, hash.js@^1.0.3: version "1.1.3" resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.3.tgz#340dedbe6290187151c1ea1d777a3448935df846" @@ -4165,13 +4141,6 @@ lru-cache@^4.0.1, lru-cache@^4.1.1: pseudomap "^1.0.2" yallist "^2.1.2" -lru-cache@^4.1.2: - version "4.1.5" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" - dependencies: - pseudomap "^1.0.2" - yallist "^2.1.2" - lru-cache@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" @@ -4244,12 +4213,6 @@ merge-descriptors@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" -merge-source-map@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646" - dependencies: - source-map "^0.6.1" - methods@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" @@ -5576,10 +5539,6 @@ precss@^3.1.2: postcss-preset-env "^3.2.2" postcss-property-lookup "^2.0.0" -prettier@1.16.3: - version "1.16.3" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.3.tgz#8c62168453badef702f34b45b6ee899574a6a65d" - pretty-error@^2.0.2: version "2.1.1" resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3" @@ -7052,24 +7011,10 @@ vue-feather-icons@^4.7.1: dependencies: babel-helper-vue-jsx-merge-props "^2.0.2" -vue-hot-reload-api@^2.3.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.1.tgz#b2d3d95402a811602380783ea4f566eb875569a2" - vue-i18n@^8.6.0: version "8.6.0" resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.6.0.tgz#63848b183cf6f100436bcdd84382416e43b07188" -vue-loader@^15.6.2: - version "15.6.2" - resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.6.2.tgz#892741d96260936ff69e892f72ec361ba4d100d2" - dependencies: - "@vue/component-compiler-utils" "^2.5.1" - hash-sum "^1.0.2" - loader-utils "^1.1.0" - vue-hot-reload-api "^2.3.0" - vue-style-loader "^4.1.0" - vue-mc@^0.2.4: version "0.2.4" resolved "https://registry.yarnpkg.com/vue-mc/-/vue-mc-0.2.4.tgz#93569cb6e08e2d1c52968a74cce8a6b2c9bda66a" @@ -7084,13 +7029,6 @@ vue-router@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.1.tgz#d9b05ad9c7420ba0f626d6500d693e60092cc1e9" -vue-style-loader@^4.1.0: - version "4.1.2" - resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.2.tgz#dedf349806f25ceb4e64f3ad7c0a44fba735fcf8" - dependencies: - hash-sum "^1.0.2" - loader-utils "^1.0.2" - vue-template-compiler@^2.5.16: version "2.5.16" resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.16.tgz#93b48570e56c720cdf3f051cc15287c26fbd04cb" @@ -7098,10 +7036,6 @@ vue-template-compiler@^2.5.16: de-indent "^1.0.2" he "^1.1.0" -vue-template-es2015-compiler@^1.8.2: - version "1.8.2" - resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.8.2.tgz#dd73e80ba58bb65dd7a8aa2aeef6089cf6116f2a" - vue@^2.2, vue@^2.5.7: version "2.5.16" resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.16.tgz#07edb75e8412aaeed871ebafa99f4672584a0085"