Upgrade deps (#3004)

* Upgrade deps * Remove unused imports of yargs * Revert "Disable vue style loader (#2981)" This reverts commit eeb3dd8.
laravel-mix · Jun 10, 2021 · 4ea4635 · 4ea4635
1 parent 35c74ca
commit 4ea4635
Show file tree

Hide file tree

Showing 12 changed files with 91 additions and 92 deletions.
diff --git a/package.json b/package.json
@@ -43,114 +43,114 @@
         "types"
     ],
     "dependencies": {
-        "@babel/core": "^7.12.3",
-        "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
+        "@babel/core": "^7.14.5",
+        "@babel/plugin-proposal-object-rest-spread": "^7.14.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-transform-runtime": "^7.12.1",
-        "@babel/preset-env": "^7.12.1",
-        "@babel/runtime": "^7.12.1",
-        "@types/babel__core": "^7.1.12",
+        "@babel/plugin-transform-runtime": "^7.14.5",
+        "@babel/preset-env": "^7.14.5",
+        "@babel/runtime": "^7.14.5",
+        "@types/babel__core": "^7.1.14",
         "@types/browser-sync": "^2.26.1",
-        "@types/clean-css": "^4.2.2",
+        "@types/clean-css": "^4.2.4",
         "@types/imagemin-gifsicle": "^7.0.0",
         "@types/imagemin-mozjpeg": "^8.0.0",
         "@types/imagemin-optipng": "^5.2.0",
         "@types/imagemin-svgo": "^8.0.0",
-        "autoprefixer": "^10.0.1",
-        "babel-loader": "^8.1.0",
-        "chalk": "^4.1.0",
-        "chokidar": "^3.4.3",
-        "clean-css": "^4.2.3 || ^5.1.1",
+        "autoprefixer": "^10.2.6",
+        "babel-loader": "^8.2.2",
+        "chalk": "^4.1.1",
+        "chokidar": "^3.5.1",
+        "clean-css": "^4.2.3 || ^5.1.2",
         "cli-table3": "^0.6.0",
-        "collect.js": "^4.28.4",
-        "commander": "^7.1.0",
+        "collect.js": "^4.28.6",
+        "commander": "^7.2.0",
         "concat": "^1.0.3",
-        "css-loader": "^5.0.0",
-        "cssnano": "^5.0.2",
-        "dotenv": "^8.2.0",
+        "css-loader": "^5.2.6",
+        "cssnano": "^5.0.6",
+        "dotenv": "^10.0.0",
         "dotenv-expand": "^5.1.0",
-        "file-loader": "^6.1.1",
-        "fs-extra": "^9.0.1",
-        "glob": "^7.1.6",
+        "file-loader": "^6.2.0",
+        "fs-extra": "^10.0.0",
+        "glob": "^7.1.7",
         "html-loader": "^1.3.2",
         "imagemin": "^7.0.1",
-        "img-loader": "^3.0.2",
-        "lodash": "^4.17.20",
+        "img-loader": "^4.0.0",
+        "lodash": "^4.17.21",
         "md5": "^2.3.0",
-        "mini-css-extract-plugin": "^1.1.0",
+        "mini-css-extract-plugin": "^1.6.0",
         "node-libs-browser": "^2.2.1",
-        "postcss-load-config": "^3.0.0",
-        "postcss-loader": "^5.2.0",
-        "semver": "^7.3.4",
+        "postcss-load-config": "^3.0.1",
+        "postcss-loader": "^6.1.0",
+        "semver": "^7.3.5",
         "strip-ansi": "^6.0.0",
         "style-loader": "^2.0.0",
-        "terser": "^5.3.7",
-        "terser-webpack-plugin": "^5.0.0",
+        "terser": "^5.7.0",
+        "terser-webpack-plugin": "^5.1.3",
         "vue-style-loader": "^4.1.3",
-        "webpack": "^5.25.1",
-        "webpack-cli": "^4.1.0",
+        "webpack": "^5.38.1",
+        "webpack-cli": "^4.7.2",
         "webpack-dev-server": "4.0.0-beta.2",
-        "webpack-merge": "^5.2.0",
-        "webpack-notifier": "^1.8.0",
+        "webpack-merge": "^5.8.0",
+        "webpack-notifier": "^1.13.0",
         "webpackbar": "^5.0.0-3",
-        "yargs": "^16.1.0"
+        "yargs": "^17.0.1"
     },
     "devDependencies": {
-        "@babel/eslint-parser": "^7.12.1",
-        "@babel/plugin-proposal-class-properties": "^7.12.1",
-        "@babel/preset-react": "^7.12.1",
+        "@babel/eslint-parser": "^7.14.5",
+        "@babel/plugin-proposal-class-properties": "^7.14.5",
+        "@babel/preset-react": "^7.14.5",
         "@pmmmwh/react-refresh-webpack-plugin": "^0.5.0-beta.0",
-        "@types/fs-extra": "^9.0.8",
-        "@types/koa": "^2.13.1",
+        "@types/fs-extra": "^9.0.11",
+        "@types/koa": "^2.13.3",
         "@types/koa-static": "^4.0.1",
-        "@types/lodash": "^4.14.168",
+        "@types/lodash": "^4.14.170",
         "@types/mock-require": "^2.0.0",
-        "@types/react": "^17.0.0",
-        "@types/react-dom": "^17.0.0",
-        "@types/semver": "^7.3.4",
-        "@types/sinon": "^9.0.11",
-        "@vue/compiler-sfc": "^3.0.1",
-        "ava": "^3.13.0",
-        "browserslist": "^4.16.0",
-        "coffee-loader": "^2.0.0",
+        "@types/react": "^17.0.11",
+        "@types/react-dom": "^17.0.7",
+        "@types/semver": "^7.3.6",
+        "@types/sinon": "^10.0.2",
+        "@vue/compiler-sfc": "^3.1.1",
+        "ava": "^3.15.0",
+        "browserslist": "^4.16.6",
+        "coffee-loader": "^3.0.0",
         "coffeescript": "^2.5.1",
-        "core-js": "^3.6.5",
+        "core-js": "^3.14.0",
         "eol": "^0.9.1",
-        "eslint": "^7.11.0",
+        "eslint": "^7.28.0",
         "esm": "^3.2.25",
         "husky": "^4.3.0",
-        "koa": "^2.13.0",
+        "koa": "^2.13.1",
         "koa-static": "^5.0.0",
-        "less": "^3.12.2 || ^4.0.0",
-        "less-loader": "^8.0.0",
+        "less": "^3.12.2 || ^4.1.1",
+        "less-loader": "^9.1.0",
         "mock-require": "^3.0.3",
         "normalize.css": "^8.0.1",
-        "playwright": "^1.10.0",
-        "postcss": "^8.2.15",
+        "playwright": "^1.12.1",
+        "postcss": "^8.3.1",
         "postcss-custom-properties": "^11.0.0",
-        "prettier": "^2.2.1",
+        "prettier": "^2.3.1",
         "pretty-quick": "^3.1.0",
-        "react": "^17.0.1",
-        "react-dom": "^17.0.1",
-        "react-refresh": "^0.9.0",
-        "resolve-url-loader": "^3.1.1",
-        "sass": "^1.27.0",
-        "sass-loader": "^11.0.1",
-        "sass-resources-loader": "^2.1.1",
-        "sinon": "^9.2.0",
+        "react": "^17.0.2",
+        "react-dom": "^17.0.2",
+        "react-refresh": "^0.10.0",
+        "resolve-url-loader": "^3.1.3",
+        "sass": "^1.34.1",
+        "sass-loader": "^12.1.0",
+        "sass-resources-loader": "^2.2.1",
+        "sinon": "^11.1.1",
         "stylus": "^0.54.8",
-        "stylus-loader": "^5.0.0",
+        "stylus-loader": "^6.1.0",
         "temp-sandbox": "^4.0.1",
-        "ts-loader": "^8.0.18",
-        "typescript": "^4.2.3",
-        "vue-loader15": "npm:vue-loader@^15.9.1",
-        "vue-loader16": "npm:vue-loader@^16.1.0",
-        "vue-template-compiler": "^2.6.12",
-        "vue2": "npm:vue@^2.6.12",
-        "vue3": "npm:vue@^3.0.1"
+        "ts-loader": "^9.2.3",
+        "typescript": "^4.3.2",
+        "vue-loader15": "npm:vue-loader@^15.9.7",
+        "vue-loader16": "npm:vue-loader@^16.2.0",
+        "vue-template-compiler": "^2.6.14",
+        "vue2": "npm:vue@^2.6.14",
+        "vue3": "npm:vue@^3.1.1"
     },
     "peerDependencies": {
-        "postcss": "^8.2.15"
+        "postcss": "^8.3.1"
     },
     "engines": {
         "node": ">=12.14.0"

diff --git a/src/Assert.js b/src/Assert.js
@@ -1,6 +1,5 @@
 let assert = require('assert');
 let Dependencies = require('./Dependencies');
-let argv = require('yargs').argv;
 let File = require('./File');
 
 class Assert {

diff --git a/src/Dependencies.js b/src/Dependencies.js
@@ -1,6 +1,5 @@
 let childProcess = require('child_process');
 let Log = require('./Log');
-let argv = require('yargs').argv;
 let PackageManager = require('./PackageManager');
 
 /**

diff --git a/src/Paths.js b/src/Paths.js
@@ -1,4 +1,3 @@
-let argv = require('yargs').argv;
 let path = require('path');
 
 class Paths {

diff --git a/src/components/CssWebpackConfig.js b/src/components/CssWebpackConfig.js
@@ -10,9 +10,9 @@ class CssWebpackConfig extends AutomaticComponent {
 
         return [
             {
-                package: 'postcss@^8.2.15',
+                package: 'postcss@^8.3.1',
                 check: name =>
-                    semver.satisfies(require(`${name}/package.json`).version, '^8.2.15')
+                    semver.satisfies(require(`${name}/package.json`).version, '^8.3.1')
             }
         ];
     }
@@ -186,7 +186,11 @@ class CssWebpackConfig extends AutomaticComponent {
         }
 
         if (method === 'inline') {
-            loaders.push({ loader: 'style-loader' });
+            if (Mix.components.get('vue') && location === 'default') {
+                loaders.push({ loader: 'vue-style-loader' });
+            } else {
+                loaders.push({ loader: 'style-loader' });
+            }
         } else if (method === 'extract') {
             loaders.push({
                 loader: MiniCssExtractPlugin.loader,

diff --git a/src/components/React.js b/src/components/React.js
@@ -10,11 +10,11 @@ class React {
         if (this.supportsFastRefreshing()) {
             return dependencies.concat([
                 {
-                    package: '@pmmmwh/react-refresh-webpack-plugin@^0.5.0-beta.0',
+                    package: '@pmmmwh/react-refresh-webpack-plugin@^0.5.0-rc.0',
                     check: name =>
                         semver.satisfies(
                             require(`${name}/package.json`).version,
-                            '^0.5.0-beta.0'
+                            '^0.5.0-rc.0'
                         )
                 },
                 'react-refresh'

diff --git a/src/components/Sass.js b/src/components/Sass.js
@@ -7,9 +7,9 @@ class Sass extends Preprocessor {
     dependencies() {
         this.requiresReload = true;
 
-        return tap(['sass-loader@^11.0.1', 'sass'], dependencies => {
+        return tap(['sass-loader@^12.1.0', 'sass'], dependencies => {
             if (Config.processCssUrls) {
-                dependencies.push('resolve-url-loader@^3.1.2');
+                dependencies.push('resolve-url-loader@^3.1.3');
             }
         });
     }

diff --git a/src/components/Vue.js b/src/components/Vue.js
@@ -56,7 +56,7 @@ class Vue {
 
         let dependencies = [
             this.version === 2 ? 'vue-template-compiler' : '@vue/compiler-sfc',
-            this.version === 2 ? 'vue-loader@^15.9.5' : 'vue-loader@^16.1.0'
+            this.version === 2 ? 'vue-loader@^15.9.7' : 'vue-loader@^16.2.0'
         ];
 
         if (this.options.extractStyles && this.options.globalStyles) {

diff --git a/src/webpackPlugins/BuildOutputPlugin.js b/src/webpackPlugins/BuildOutputPlugin.js
@@ -1,5 +1,4 @@
 const _ = require('lodash');
-const argv = require('yargs');
 const chalk = require('chalk');
 const Table = require('cli-table3');
 const readline = require('readline');

diff --git a/test/features/react.js b/test/features/react.js
@@ -97,8 +97,7 @@ test('it adds the necessary fast refreshing dependencies', t => {
     t.truthy(
         dependencies.find(
             dependency =>
-                dependency.package ===
-                '@pmmmwh/react-refresh-webpack-plugin@^0.5.0-beta.0'
+                dependency.package === '@pmmmwh/react-refresh-webpack-plugin@^0.5.0-rc.0'
         )
     );
     t.true(dependencies.includes('react-refresh'));

diff --git a/test/features/vue.js b/test/features/vue.js
@@ -38,13 +38,13 @@ test('it knows the Vue 2 compiler name', t => {
     t.true(dependencies.includes('vue-template-compiler'));
 });
 
-test('DISABLED: it switches to vue-style-loader when not extracting styles', async t => {
+test('it switches to vue-style-loader when not extracting styles', async t => {
     mix.vue({ version: 2, extractStyles: false });
 
     const config = await webpack.buildConfig();
 
-    assert.doesNotHaveWebpackLoader(t, config, 'vue-style-loader');
-    assert.hasWebpackLoader(t, config, 'style-loader');
+    assert.hasWebpackLoader(t, config, 'vue-style-loader');
+    assert.doesNotHaveWebpackLoader(t, config, 'style-loader');
     assert.doesNotHaveWebpackLoader(t, config, /mini-css-extract-plugin/);
 });
 

diff --git a/test/features/vue3.js b/test/features/vue3.js
@@ -34,13 +34,13 @@ test('it knows the Vue 3 compiler name', t => {
     t.true(dependencies.includes('@vue/compiler-sfc'));
 });
 
-test('DISABLED: it switches to vue-style-loader when not extracting styles', async t => {
+test('it switches to vue-style-loader when not extracting styles', async t => {
     mix.vue({ version: 3, extractStyles: false });
 
     const config = await webpack.buildConfig();
 
-    assert.doesNotHaveWebpackLoader(t, config, 'vue-style-loader');
-    assert.hasWebpackLoader(t, config, 'style-loader');
+    assert.hasWebpackLoader(t, config, 'vue-style-loader');
+    assert.doesNotHaveWebpackLoader(t, config, 'style-loader');
     assert.doesNotHaveWebpackLoader(t, config, loader =>
         loader.includes('mini-css-extract-plugin')
     );