Update JS dependency vuex to v3.1.1 (#6663)

* Update JS dependency vuex to v3.1.1 * Update bundle * Fix package.json * Optimize Vuex imports (mostly tests) * Ensure yarn.lock integrity * yarn.lock: Fix integrity * Fix Webpack's `excludeAssets` on Windows
pymedusa · May 18, 2019 · 291f919 · 291f919
1 parent 618cca6
commit 291f919
Show file tree

Hide file tree

Showing 26 changed files with 1,049 additions and 46 deletions.
diff --git a/.yarnrc b/.yarnrc
@@ -1,2 +1,3 @@
+unsafe-disable-integrity-migration false
 --add.exact true
 --upgrade.exact true
diff --git a/themes-default/slim/.yarnrc b/themes-default/slim/.yarnrc
@@ -1,2 +1,3 @@
+unsafe-disable-integrity-migration false
 --add.exact true
 --upgrade.exact true
diff --git a/themes-default/slim/package.json b/themes-default/slim/package.json
@@ -76,14 +76,14 @@
     "vue-jest": "3.0.4",
     "vue-js-toggle-button": "1.3.2",
     "vue-loader": "15.7.0",
-    "vue-router": "3.0.6",
     "vue-meta": "1.6.0",
     "vue-native-websocket": "2.0.13",
+    "vue-router": "3.0.6",
     "vue-scrollto": "2.15.0",
     "vue-snotify": "3.2.1",
     "vue-template-compiler": "2.6.10",
     "vue-truncate-collapsed": "2.1.0",
-    "vuex": "3.1.0",
+    "vuex": "3.1.1",
     "webpack": "4.30.0",
     "webpack-cli": "3.3.2",
     "xo": "0.24.0"

diff --git a/themes-default/slim/src/store/index.js b/themes-default/slim/src/store/index.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import Vuex from 'vuex';
+import Vuex, { Store } from 'vuex';
 import VueNativeSock from 'vue-native-websocket';
 import {
     auth,
@@ -24,8 +24,6 @@ import {
     SOCKET_RECONNECT_ERROR
 } from './mutation-types';
 
-const { Store } = Vuex;
-
 Vue.use(Vuex);
 
 const store = new Store({

diff --git a/themes-default/slim/test/specs/__snapshots__/root-dirs.spec.js.snap b/themes-default/slim/test/specs/__snapshots__/root-dirs.spec.js.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`QualityPill.test.js renders and changing default/selected: After changing the default root dir 1`] = `
+exports[`RootDirs.test.js renders and changing default/selected: After changing the default root dir 1`] = `
 <div
   id="root-dirs-wrapper"
 >
@@ -63,7 +63,7 @@ exports[`QualityPill.test.js renders and changing default/selected: After changi
 </div>
 `;
 
-exports[`QualityPill.test.js renders and changing default/selected: Base snapshot 1`] = `
+exports[`RootDirs.test.js renders and changing default/selected: Base snapshot 1`] = `
 <div
   id="root-dirs-wrapper"
 >

diff --git a/themes-default/slim/test/specs/add-recommended.spec.js b/themes-default/slim/test/specs/add-recommended.spec.js
@@ -1,4 +1,4 @@
-import Vuex from 'vuex';
+import Vuex, { Store } from 'vuex';
 import VueRouter from 'vue-router';
 import { createLocalVue, shallowMount } from '@vue/test-utils';
 import { AppLink, AddRecommended } from '../../src/components';
@@ -14,7 +14,6 @@ describe('AddRecommended.test.js', () => {
         localVue.component('app-link', AppLink);
 
         const { state } = fixtures;
-        const { Store } = Vuex;
         const store = new Store({ state });
 
         wrapper = shallowMount(AddRecommended, {

diff --git a/themes-default/slim/test/specs/add-show-options.spec.js b/themes-default/slim/test/specs/add-show-options.spec.js
@@ -1,4 +1,4 @@
-import Vuex from 'vuex';
+import Vuex, { Store } from 'vuex';
 import VueRouter from 'vue-router';
 import { createLocalVue, mount } from '@vue/test-utils';
 import { AddShowOptions } from '../../src/components';
@@ -14,7 +14,6 @@ describe('AddShowOptions.test.js', () => {
         localVue.use(VueRouter);
 
         const { state } = fixtures;
-        const { Store } = Vuex;
         store = new Store({ state });
     });
 

diff --git a/themes-default/slim/test/specs/add-shows.spec.js b/themes-default/slim/test/specs/add-shows.spec.js
@@ -1,4 +1,4 @@
-import Vuex from 'vuex';
+import Vuex, { Store } from 'vuex';
 import VueRouter from 'vue-router';
 import { createLocalVue, shallowMount } from '@vue/test-utils';
 import { AppLink, AddShows } from '../../src/components';
@@ -14,7 +14,6 @@ describe('AddShows.test.js', () => {
         localVue.component('app-link', AppLink);
 
         const { state } = fixtures;
-        const { Store } = Vuex;
         const store = new Store({ state });
 
         wrapper = shallowMount(AddShows, {

diff --git a/themes-default/slim/test/specs/anidb-release-group-ui.spec.js b/themes-default/slim/test/specs/anidb-release-group-ui.spec.js
@@ -1,4 +1,4 @@
-import Vuex from 'vuex';
+import Vuex, { Store } from 'vuex';
 import VueRouter from 'vue-router';
 import { createLocalVue, mount } from '@vue/test-utils';
 import { AnidbReleaseGroupUi } from '../../src/components';
@@ -14,7 +14,6 @@ describe('AnidbReleaseGroupUi.test.js', () => {
         localVue.use(VueRouter);
 
         const { state } = fixtures;
-        const { Store } = Vuex;
         store = new Store({ state });
     });
 

diff --git a/themes-default/slim/test/specs/app-header.spec.js b/themes-default/slim/test/specs/app-header.spec.js
@@ -1,4 +1,4 @@
-import Vuex from 'vuex';
+import Vuex, { Store } from 'vuex';
 import VueRouter from 'vue-router';
 import { createLocalVue, shallowMount } from '@vue/test-utils';
 import { AppHeader } from '../../src/components';
@@ -14,7 +14,6 @@ describe('AppHeader.test.js', () => {
         localVue.use(VueRouter);
 
         const { state } = fixtures;
-        const { Store } = Vuex;
         store = new Store({ state });
     });
 

diff --git a/themes-default/slim/test/specs/app-link.spec.js b/themes-default/slim/test/specs/app-link.spec.js
@@ -1,4 +1,4 @@
-import Vuex from 'vuex';
+import Vuex, { Store } from 'vuex';
 import VueRouter from 'vue-router';
 import { createLocalVue, mount } from '@vue/test-utils';
 import { AppLink } from '../../src/components';
@@ -15,7 +15,6 @@ describe('AppLink.test.js', () => {
         localVue.use(VueRouter);
 
         const { state } = fixtures;
-        const { Store } = Vuex;
         store = new Store({ state });
         routerBase = '/'; // This might be '/webroot'
     });

diff --git a/themes-default/slim/test/specs/config-post-processing.spec.js b/themes-default/slim/test/specs/config-post-processing.spec.js
@@ -1,4 +1,4 @@
-import Vuex from 'vuex';
+import Vuex, { Store } from 'vuex';
 import VueRouter from 'vue-router';
 import { createLocalVue, mount } from '@vue/test-utils';
 import { ConfigPostProcessing } from '../../src/components';
@@ -14,7 +14,6 @@ describe('ConfigPostProcessing.test.js', () => {
         localVue.use(VueRouter);
 
         const { state } = fixtures;
-        const { Store } = Vuex;
         store = new Store({ state });
     });
 

diff --git a/themes-default/slim/test/specs/config.spec.js b/themes-default/slim/test/specs/config.spec.js
@@ -1,4 +1,4 @@
-import Vuex from 'vuex';
+import Vuex, { Store } from 'vuex';
 import VueRouter from 'vue-router';
 import { createLocalVue, mount } from '@vue/test-utils';
 import { Config } from '../../src/components';
@@ -14,7 +14,6 @@ describe('Config.test.js', () => {
         localVue.use(VueRouter);
 
         const { state } = fixtures;
-        const { Store } = Vuex;
         store = new Store({ state });
     });
 

diff --git a/themes-default/slim/test/specs/irc.spec.js b/themes-default/slim/test/specs/irc.spec.js
@@ -1,4 +1,4 @@
-import Vuex from 'vuex';
+import Vuex, { Store } from 'vuex';
 import VueRouter from 'vue-router';
 import { createLocalVue, mount } from '@vue/test-utils';
 import { IRC } from '../../src/components';
@@ -14,7 +14,6 @@ describe('IRC.test.js', () => {
         localVue.use(VueRouter);
 
         const { state } = fixtures;
-        const { Store } = Vuex;
         store = new Store({ state });
     });
 

diff --git a/themes-default/slim/test/specs/login.spec.js b/themes-default/slim/test/specs/login.spec.js
@@ -1,4 +1,4 @@
-import Vuex from 'vuex';
+import Vuex, { Store } from 'vuex';
 import VueRouter from 'vue-router';
 import { createLocalVue, mount } from '@vue/test-utils';
 import { Login } from '../../src/components';
@@ -14,7 +14,6 @@ describe('Login.test.js', () => {
         localVue.use(VueRouter);
 
         const { state } = fixtures;
-        const { Store } = Vuex;
         store = new Store({ state });
     });
 

diff --git a/themes-default/slim/test/specs/plot-info.spec.js b/themes-default/slim/test/specs/plot-info.spec.js
@@ -1,4 +1,4 @@
-import Vuex from 'vuex';
+import Vuex, { Store } from 'vuex';
 import VueRouter from 'vue-router';
 import { createLocalVue, mount } from '@vue/test-utils';
 import { PlotInfo } from '../../src/components';
@@ -14,7 +14,6 @@ describe('PlotInfo.test.js', () => {
         localVue.use(VueRouter);
 
         const { state } = fixtures;
-        const { Store } = Vuex;
         store = new Store({ state });
     });
 

diff --git a/themes-default/slim/test/specs/quality-pill.spec.js b/themes-default/slim/test/specs/quality-pill.spec.js
@@ -1,4 +1,4 @@
-import Vuex from 'vuex';
+import Vuex, { Store } from 'vuex';
 import VueRouter from 'vue-router';
 import { createLocalVue } from '@vue/test-utils';
 import { QualityPill } from '../../src/components';
@@ -15,7 +15,6 @@ describe('QualityPill.test.js', () => {
         localVue.use(VueRouter);
 
         const { state } = fixtures;
-        const { Store } = Vuex;
         store = new Store({ state });
     });
 

diff --git a/themes-default/slim/test/specs/root-dirs.spec.js b/themes-default/slim/test/specs/root-dirs.spec.js
@@ -1,10 +1,10 @@
-import Vuex from 'vuex';
+import Vuex, { Store } from 'vuex';
 import VueRouter from 'vue-router';
 import { createLocalVue, mount } from '@vue/test-utils';
 import { RootDirs } from '../../src/components';
 import fixtures from '../__fixtures__/root-dirs';
 
-describe('QualityPill.test.js', () => {
+describe('RootDirs.test.js', () => {
     let localVue;
     let store;
 
@@ -14,7 +14,6 @@ describe('QualityPill.test.js', () => {
         localVue.use(VueRouter);
 
         const { state } = fixtures;
-        const { Store } = Vuex;
         store = new Store({ state });
     });
 

diff --git a/themes-default/slim/test/specs/select-list.spec.js b/themes-default/slim/test/specs/select-list.spec.js
@@ -1,4 +1,4 @@
-import Vuex from 'vuex';
+import Vuex, { Store } from 'vuex';
 import VueRouter from 'vue-router';
 import { createLocalVue, mount } from '@vue/test-utils';
 import { SelectList } from '../../src/components';
@@ -14,7 +14,6 @@ describe('SelectList.test.js', () => {
         localVue.use(VueRouter);
 
         const { state } = fixtures;
-        const { Store } = Vuex;
         store = new Store({ state });
     });
 

diff --git a/themes-default/slim/test/specs/show-selector.spec.js b/themes-default/slim/test/specs/show-selector.spec.js
@@ -1,4 +1,4 @@
-import Vuex from 'vuex';
+import Vuex, { Store } from 'vuex';
 import VueRouter from 'vue-router';
 import { createLocalVue, mount } from '@vue/test-utils';
 import { ShowSelector } from '../../src/components';
@@ -15,7 +15,6 @@ describe('ShowSelector.test.js', () => {
         localVue.use(VueRouter);
 
         const { state } = fixtures;
-        const { Store } = Vuex;
         store = new Store({ state });
     });
 

diff --git a/themes-default/slim/webpack.config.js b/themes-default/slim/webpack.config.js
@@ -81,7 +81,7 @@ const webpackConfig = (env, mode) => ({
     },
     stats: {
         // Hides assets copied from `./dist` to `../../themes` by CopyWebpackPlugin
-        excludeAssets: /(\.\.\/)+themes\/.*/,
+        excludeAssets: /(\.\.[\\/])+themes[\\/].*/,
         // When `false`, hides extra information about assets collected by children (e.g. plugins)
         children: false
     },