refactor: extract vite and webpack builders (#45)

2024-11-22 05:35:13 +00:00 · 2021-04-03 15:38:07 +02:00 · 2021-04-03 15:38:07 +02:00 · f47808f59a
commit f47808f59a
parent 2c1eb87671
36 changed files with 144 additions and 339 deletions
--- a/packages/app/package.json
+++ b/packages/app/package.json
@ -1,6 +1,6 @@
 {
  "name": "@nuxt/app",
-  "version": "0.0.0",
+  "version": "0.1.0",
  "repository": "nuxt/framework",
  "license": "MIT",
  "main": "./dist/index.js",
@ -12,13 +12,25 @@
    "prepublishOnly": "yarn build"
  },
  "dependencies": {
+    "@vueuse/head": "^0.5.1",
    "hookable": "^4.4.1",
-    "vue": "^3.0.11"
+    "ohmyfetch": "^0.1.8",
+    "vue": "^3.0.11",
+    "vue-router": "^4.0.5",
+    "vuex5": "^0.5.0-testing.3"
  },
  "build": {
    "entries": {
-      "index": { "distDir": ".gen" },
+      "index": {
+        "distDir": ".gen"
+      },
      "/": {}
-    }
+    },
+    "dependencies": [
+      "@vueuse/head",
+      "ohmyfetch",
+      "vue-router",
+      "vuex5"
+    ]
  }
 }
--- a/packages/app/src/index.js
+++ b/packages/app/src/index.js
@ -1 +0,0 @@
-export * from './index.ts'
--- a/packages/kit/package.json
+++ b/packages/kit/package.json
@ -1,6 +1,6 @@
 {
  "name": "@nuxt/kit",
-  "version": "0.0.0",
+  "version": "0.1.0",
  "repository": "nuxt/framework",
  "license": "MIT",
  "main": "./dist/index.js",
--- a/packages/nu/package.json
+++ b/packages/nu/package.json
@ -1,6 +1,6 @@
 {
  "name": "@nuxt/nu",
-  "version": "0.0.0",
+  "version": "0.1.0",
  "repository": "nuxt/framework",
  "license": "MIT",
  "main": "./dist/index.js",
--- a/packages/nuxt3/package.json
+++ b/packages/nuxt3/package.json
@ -17,103 +17,28 @@
    },
    "dependencies": [
      "@nuxt/app",
-      "@vue/compiler-sfc",
-      "postcss",
-      "postcss-loader",
-      "postcss-import-resolver",
-      "@vue/babel-preset-jsx",
-      "@vueuse/head",
-      "babel-loader",
-      "vue-loader",
-      "chalk",
-      "core-js",
-      "css-loader",
-      "file-loader",
-      "style-resources-loader",
-      "url-loader",
-      "vue",
-      "vue-router",
-      "vuex5",
-      "vue-style-loader"
+      "@nuxt/vite-builder",
+      "@nuxt/webpack-builder"
    ]
  },
  "dependencies": {
-    "@nuxt/kit": "0.0.0",
-    "@nuxt/app": "0.0.0",
-    "@nuxt/friendly-errors-webpack-plugin": "^2.5.0",
+    "@nuxt/kit": "^0.1.0",
+    "@nuxt/app": "^0.1.0",
+    "@nuxt/vite-builder": "^0.1.0",
+    "@nuxt/webpack-builder": "^0.1.0",
    "@nuxt/nitro": "^0.1.11",
-    "@vitejs/plugin-vue": "^1.2.1",
-    "@vue/babel-preset-jsx": "^1.2.4",
-    "@vue/compiler-sfc": "^3.0.11",
-    "@vueuse/head": "^0.5.1",
-    "babel-loader": "^8.2.2",
-    "chalk": "^4.1.0",
    "chokidar": "^3.5.1",
    "consola": "^2.15.3",
-    "core-js": "^3.10.0",
-    "css-loader": "^5.2.0",
-    "css-minimizer-webpack-plugin": "^1.3.0",
    "defu": "^3.2.2",
-    "esbuild-loader": "^2.11.0",
-    "file-loader": "^6.2.0",
    "fs-extra": "^9.1.0",
-    "glob": "^7.1.6",
    "globby": "^11.0.3",
    "hash-sum": "^2.0.0",
    "hookable": "^4.4.1",
    "ignore": "^5.1.8",
    "lodash": "^4.17.21",
-    "memfs": "^3.2.1",
-    "mini-css-extract-plugin": "^1.4.0",
-    "pify": "^5.0.0",
-    "postcss": "^8.2.9",
-    "postcss-import-resolver": "^2.0.0",
-    "postcss-loader": "^5.2.0",
    "scule": "^0.1.1",
-    "style-resources-loader": "^1.4.1",
-    "time-fix-plugin": "^2.0.7",
-    "ufo": "^0.6.10",
-    "url-loader": "^4.1.1",
-    "vite": "^2.1.5",
-    "vue": "^3.0.11",
-    "vue-loader": "^16.2.0",
-    "vue-router": "^4.0.5",
-    "vue-style-loader": "^4.1.3",
-    "vuex5": "0.5.0-testing.3",
-    "webpack": "^5.30.0",
-    "webpack-bundle-analyzer": "^4.4.0",
-    "webpack-dev-middleware": "^4.1.0",
-    "webpack-hot-middleware": "^2.25.0",
-    "webpackbar": "^5.0.0-3"
+    "ufo": "^0.6.10"
  },
  "devDependencies": {
-    "@types/autoprefixer": "^10.2.0",
-    "@types/compression": "^1.7.0",
-    "@types/etag": "^1.8.0",
-    "@types/exit": "^0.1.31",
-    "@types/file-loader": "^4.2.1",
-    "@types/fs-extra": "^9.0.9",
-    "@types/glob": "^7.1.3",
-    "@types/hash-sum": "^1.0.0",
-    "@types/html-minifier": "^4.0.0",
-    "@types/jest": "^26.0.22",
-    "@types/jsdom": "^16.2.9",
-    "@types/less": "^3.0.2",
-    "@types/lodash": "^4.14.168",
-    "@types/lru-cache": "^5.1.0",
-    "@types/minimist": "^1.2.1",
-    "@types/on-headers": "^1.0.0",
-    "@types/opener": "^1.4.0",
-    "@types/pify": "^5.0.0",
-    "@types/pug": "^2.0.4",
-    "@types/semver": "^7.3.4",
-    "@types/serialize-javascript": "^5.0.0",
-    "@types/serve-static": "^1.13.9",
-    "@types/server-destroy": "^1.0.1",
-    "@types/terser-webpack-plugin": "^5.0.3",
-    "@types/webpack-bundle-analyzer": "^3.9.2",
-    "@types/webpack-dev-middleware": "^4.1.2",
-    "@types/webpack-hot-middleware": "^2.25.4",
-    "@types/wrap-ansi": "^3.0.0"
  }
 }
--- a/packages/nuxt3/src/builder.ts
+++ b/packages/nuxt3/src/builder.ts
@ -100,10 +100,7 @@ export async function generate (builder: Builder) {
 async function bundle ({ nuxt }: Builder) {
  // @ts-ignore
  const useVite = !!nuxt.options.vite
-  const bundle = await (useVite
-    ? import('./vite/vite' /* webpackChunkName: "vite" */)
-    : import('./webpack/webpack' /* webpackChunkName: "webpack" */))
-    .then(p => p.bundle)
+  const { bundle } = await (useVite ? import('@nuxt/vite-builder') : import('@nuxt/webpack-builder'))
  return bundle(nuxt)
 }

--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@ -0,0 +1,31 @@
+{
+  "name": "@nuxt/vite-builder",
+  "version": "0.1.0",
+  "repository": "nuxt/framework",
+  "license": "MIT",
+  "main": "./dist/index.js",
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "jiti ../../scripts/build .",
+    "prepublishOnly": "yarn build"
+  },
+  "build": {
+    "entries": {
+      "index": {
+        "format": "cjs"
+      }
+    },
+    "dependencies": [
+      "@nuxt/kit"
+    ]
+  },
+  "dependencies": {
+    "@nuxt/kit": "^0.1.0",
+    "@vitejs/plugin-vue": "^1.2.1",
+    "consola": "^2.15.3",
+    "fs-extra": "^9.1.0",
+    "vite": "^2.1.5"
+  }
+}
--- a/packages/vite/src/index.ts
+++ b/packages/vite/src/index.ts
@ -0,0 +1 @@
+export * from './vite'
--- a/packages/nuxt3/src/vite/vite.ts
+++ b/packages/nuxt3/src/vite/vite.ts
--- a/packages/webpack/package.json
+++ b/packages/webpack/package.json
@ -0,0 +1,75 @@
+{
+  "name": "@nuxt/webpack-builder",
+  "version": "0.1.0",
+  "repository": "nuxt/framework",
+  "license": "MIT",
+  "main": "./dist/index.js",
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "jiti ../../scripts/build .",
+    "prepublishOnly": "yarn build"
+  },
+  "build": {
+    "entries": {
+      "index": {
+        "format": "cjs"
+      }
+    },
+    "dependencies": [
+      "@nuxt/kit",
+      "@vue/compiler-sfc",
+      "@vue/babel-preset-jsx",
+      "postcss",
+      "postcss-import-resolver",
+      "postcss-loader",
+      "babel-loader",
+      "vue-loader",
+      "css-loader",
+      "file-loader",
+      "style-resources-loader",
+      "url-loader",
+      "vue-style-loader"
+    ]
+  },
+  "dependencies": {
+    "@nuxt/friendly-errors-webpack-plugin": "^2.5.0",
+    "@nuxt/kit": "^0.1.0",
+    "@vue/babel-preset-jsx": "^1.2.4",
+    "@vue/compiler-sfc": "^3.0.11",
+    "babel-loader": "^8.2.2",
+    "consola": "^2.15.3",
+    "css-loader": "^5.2.0",
+    "css-minimizer-webpack-plugin": "^1.3.0",
+    "esbuild-loader": "^2.11.0",
+    "file-loader": "^6.2.0",
+    "fs-extra": "^9.1.0",
+    "glob": "^7.1.6",
+    "hash-sum": "^2.0.0",
+    "lodash": "^4.17.21",
+    "memfs": "^3.2.1",
+    "mini-css-extract-plugin": "^1.4.0",
+    "pify": "^5.0.0",
+    "postcss": "^8.2.9",
+    "postcss-import-resolver": "^2.0.0",
+    "postcss-loader": "^5.2.0",
+    "style-resources-loader": "^1.4.1",
+    "time-fix-plugin": "^2.0.7",
+    "ufo": "^0.6.10",
+    "url-loader": "^4.1.1",
+    "vue-loader": "^16.2.0",
+    "vue-style-loader": "^4.1.3",
+    "webpack": "^5.30.0",
+    "webpack-bundle-analyzer": "^4.4.0",
+    "webpack-dev-middleware": "^4.1.0",
+    "webpack-hot-middleware": "^2.25.0",
+    "webpackbar": "^5.0.0-3"
+  },
+  "devDependencies": {
+    "@types/terser-webpack-plugin": "^5.0.3",
+    "@types/webpack-bundle-analyzer": "^3.9.2",
+    "@types/webpack-dev-middleware": "^4.1.2",
+    "@types/webpack-hot-middleware": "^2.25.4"
+  }
+}
--- a/packages/nuxt3/src/webpack/configs/client.ts
+++ b/packages/nuxt3/src/webpack/configs/client.ts
--- a/packages/nuxt3/src/webpack/configs/index.ts
+++ b/packages/nuxt3/src/webpack/configs/index.ts
--- a/packages/nuxt3/src/webpack/configs/server.ts
+++ b/packages/nuxt3/src/webpack/configs/server.ts
--- a/packages/webpack/src/index.ts
+++ b/packages/webpack/src/index.ts
@ -0,0 +1 @@
+export * from './webpack'
--- a/packages/nuxt3/src/webpack/plugins/vue/client.ts
+++ b/packages/nuxt3/src/webpack/plugins/vue/client.ts
@ -5,7 +5,7 @@

 import { dirname } from 'path'
 import hash from 'hash-sum'
-import uniq from 'lodash/uniq'
+import { uniq } from 'lodash'
 import { writeFile, mkdirp } from 'fs-extra'

 import { isJS, isCSS, isHotUpdate } from './util'
--- a/packages/nuxt3/src/webpack/plugins/vue/server.ts
+++ b/packages/nuxt3/src/webpack/plugins/vue/server.ts
--- a/packages/nuxt3/src/webpack/plugins/vue/util.ts
+++ b/packages/nuxt3/src/webpack/plugins/vue/util.ts
--- a/packages/nuxt3/src/webpack/plugins/warning-ignore.ts
+++ b/packages/nuxt3/src/webpack/plugins/warning-ignore.ts
--- a/packages/nuxt3/src/webpack/presets/assets.ts
+++ b/packages/nuxt3/src/webpack/presets/assets.ts
--- a/packages/nuxt3/src/webpack/presets/babel.ts
+++ b/packages/nuxt3/src/webpack/presets/babel.ts
--- a/packages/nuxt3/src/webpack/presets/base.ts
+++ b/packages/nuxt3/src/webpack/presets/base.ts
@ -4,7 +4,7 @@ import WebpackBar from 'webpackbar'
 import consola from 'consola'
 import { DefinePlugin, Configuration } from 'webpack'
 import FriendlyErrorsWebpackPlugin from '@nuxt/friendly-errors-webpack-plugin'
-import escapeRegExp from 'lodash/escapeRegExp'
+import { escapeRegExp } from 'lodash'
 import { hasProtocol, joinURL } from 'ufo'
 import WarningIgnorePlugin from '../plugins/warning-ignore'
 import { WebpackConfigContext, applyPresets, fileName } from '../utils/config'
--- a/packages/nuxt3/src/webpack/presets/esbuild.ts
+++ b/packages/nuxt3/src/webpack/presets/esbuild.ts
--- a/packages/nuxt3/src/webpack/presets/node.ts
+++ b/packages/nuxt3/src/webpack/presets/node.ts
--- a/packages/nuxt3/src/webpack/presets/nuxt.ts
+++ b/packages/nuxt3/src/webpack/presets/nuxt.ts
--- a/packages/nuxt3/src/webpack/presets/pug.ts
+++ b/packages/nuxt3/src/webpack/presets/pug.ts
--- a/packages/nuxt3/src/webpack/presets/style.ts
+++ b/packages/nuxt3/src/webpack/presets/style.ts
--- a/packages/nuxt3/src/webpack/presets/vue.ts
+++ b/packages/nuxt3/src/webpack/presets/vue.ts
--- a/packages/nuxt3/src/webpack/utils/babel-preset.js
+++ b/packages/nuxt3/src/webpack/utils/babel-preset.js
--- a/packages/nuxt3/src/webpack/utils/config.ts
+++ b/packages/nuxt3/src/webpack/utils/config.ts
@ -1,5 +1,5 @@
 import consola from 'consola'
-import cloneDeep from 'lodash/cloneDeep'
+import { cloneDeep } from 'lodash'
 import { Configuration } from 'webpack'
 import type { Nuxt } from '@nuxt/kit'

--- a/packages/nuxt3/src/webpack/utils/index.ts
+++ b/packages/nuxt3/src/webpack/utils/index.ts
--- a/packages/nuxt3/src/webpack/utils/mfs.ts
+++ b/packages/nuxt3/src/webpack/utils/mfs.ts
--- a/packages/nuxt3/src/webpack/utils/postcss.ts
+++ b/packages/nuxt3/src/webpack/utils/postcss.ts
@ -2,9 +2,7 @@
 import fs from 'fs'
 import path from 'path'
 import consola from 'consola'
-import defaults from 'lodash/defaults'
-import merge from 'lodash/merge'
-import cloneDeep from 'lodash/cloneDeep'
+import { defaults, merge, cloneDeep } from 'lodash'
 import createResolver from 'postcss-import-resolver'
 import { Nuxt, tryRequireModule } from '@nuxt/kit'

--- a/packages/nuxt3/src/webpack/utils/reserved-tags.ts
+++ b/packages/nuxt3/src/webpack/utils/reserved-tags.ts
--- a/packages/nuxt3/src/webpack/webpack.ts
+++ b/packages/nuxt3/src/webpack/webpack.ts
--- a/playground/nuxt.config.ts
+++ b/playground/nuxt.config.ts
@ -1,5 +1,5 @@
 import { defineNuxtConfig } from '@nuxt/kit'

 export default defineNuxtConfig({
-  vite: !true
+  vite: true
 })
--- a/yarn.lock
+++ b/yarn.lock
@ -1564,13 +1564,6 @@
  resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a"
  integrity sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==

-"@types/autoprefixer@^10.2.0":
-  version "10.2.0"
-  resolved "https://registry.yarnpkg.com/@types/autoprefixer/-/autoprefixer-10.2.0.tgz#cb6cd67f00337607433b17ebf2cee511db957b9e"
-  integrity sha512-ClU0uw3HhUra890K4xcf2IQxD6w0WOjPIaKb8jrRXYPHvvUW1P5dGufPlDtTo5gtWPWH+4L6tSBAoAKVf93uBQ==
-  dependencies:
-    autoprefixer "*"
-
 "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7":
  version "7.1.13"
  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.13.tgz#bc6eea53975fdf163aff66c086522c6f293ae4cf"
@ -1604,29 +1597,6 @@
  dependencies:
    "@babel/types" "^7.3.0"

-"@types/body-parser@*":
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz#0685b3c47eb3006ffed117cdd55164b61f80538f"
-  integrity sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==
-  dependencies:
-    "@types/connect" "*"
-    "@types/node" "*"
-
-"@types/clean-css@*":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/@types/clean-css/-/clean-css-4.2.3.tgz#12c13cc815f5e793014ee002c6324455907d851c"
-  integrity sha512-ET0ldU/vpXecy5vO8JRIhtJWSrk1vzXdJcp3Bjf8bARZynl6vfkhEKY/A7njfNIRlmyTGuVFuqnD6I3tOGdXpQ==
-  dependencies:
-    "@types/node" "*"
-    source-map "^0.6.0"
-
-"@types/compression@^1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@types/compression/-/compression-1.7.0.tgz#8dc2a56604873cf0dd4e746d9ae4d31ae77b2390"
-  integrity sha512-3LzWUM+3k3XdWOUk/RO+uSjv7YWOatYq2QADJntK1pjkk4DfVP0KrIEPDnXRJxAAGKe0VpIPRmlINLDuCedZWw==
-  dependencies:
-    "@types/express" "*"
-
 "@types/connect@*":
  version "3.4.34"
  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.34.tgz#170a40223a6d666006d93ca128af2beb1d9b1901"
@ -1660,61 +1630,6 @@
  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
  integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==

-"@types/etag@^1.8.0":
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/@types/etag/-/etag-1.8.0.tgz#37f0b1f3ea46da7ae319bbedb607e375b4c99f7e"
-  integrity sha512-EdSN0x+Y0/lBv7YAb8IU4Jgm6DWM+Bqtz7o5qozl96fzaqdqbdfHS5qjdpFeIv7xQ8jSLyjMMNShgYtMajEHyQ==
-  dependencies:
-    "@types/node" "*"
-
-"@types/exit@^0.1.31":
-  version "0.1.31"
-  resolved "https://registry.yarnpkg.com/@types/exit/-/exit-0.1.31.tgz#681387d7724b42b91c29c7822da7967e05db5255"
-  integrity sha512-ghT0E6Bw64RXc6lM30ExMNlYbUCsyR8oucl/q+ESGGhNOXOmBPpZHYGXCH2T/yTFq9YtudNCnZEQ4puX6aq87A==
-  dependencies:
-    "@types/node" "*"
-
-"@types/express-serve-static-core@^4.17.18":
-  version "4.17.19"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz#00acfc1632e729acac4f1530e9e16f6dd1508a1d"
-  integrity sha512-DJOSHzX7pCiSElWaGR8kCprwibCB/3yW6vcT8VG3P0SJjnv19gnWG/AZMfM60Xj/YJIp/YCaDHyvzsFVeniARA==
-  dependencies:
-    "@types/node" "*"
-    "@types/qs" "*"
-    "@types/range-parser" "*"
-
-"@types/express@*":
-  version "4.17.11"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.11.tgz#debe3caa6f8e5fcda96b47bd54e2f40c4ee59545"
-  integrity sha512-no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg==
-  dependencies:
-    "@types/body-parser" "*"
-    "@types/express-serve-static-core" "^4.17.18"
-    "@types/qs" "*"
-    "@types/serve-static" "*"
-
-"@types/file-loader@^4.2.1":
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@types/file-loader/-/file-loader-4.2.1.tgz#f41154dc90d578002df8ae94db80c315e844720e"
-  integrity sha512-ImtIwnIEEMgyE7DK1JduhiDv+8WzfRWb3BPuf6RiBD1ySz05vyDRhGiKvIcuUPxUzMNBRZHN0pB+bWXSX3+t1w==
-  dependencies:
-    "@types/webpack" "^4"
-
-"@types/fs-extra@^9.0.9":
-  version "9.0.9"
-  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.9.tgz#11ed43b3f3c6b3490f1ef9bd17f58da896e2d861"
-  integrity sha512-5TqDycCl0oMzwzd1cIjSJWMKMvLCDVErle4ZTjU4EmHDURR/+yZghe6GDHMCpHtcVfq0x0gMoOM546/5TbYHrg==
-  dependencies:
-    "@types/node" "*"
-
-"@types/glob@^7.1.3":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183"
-  integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==
-  dependencies:
-    "@types/minimatch" "*"
-    "@types/node" "*"
-
 "@types/graceful-fs@^4.1.2":
  version "4.1.5"
  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15"
@ -1722,20 +1637,6 @@
  dependencies:
    "@types/node" "*"

-"@types/hash-sum@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/hash-sum/-/hash-sum-1.0.0.tgz#838f4e8627887d42b162d05f3d96ca636c2bc504"
-  integrity sha512-FdLBT93h3kcZ586Aee66HPCVJ6qvxVjBlDWNmxSGSbCZe9hTsjRKdSsl4y1T+3zfujxo9auykQMnFsfyHWD7wg==
-
-"@types/html-minifier@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@types/html-minifier/-/html-minifier-4.0.0.tgz#2065cb9944f2d1b241146707c6935aa7b947d279"
-  integrity sha512-eFnGhrKmjWBlnSGNtunetE3UU2Tc/LUl92htFslSSTmpp9EKHQVcYQadCyYfnzUEFB5G/3wLWo/USQS/mEPKrA==
-  dependencies:
-    "@types/clean-css" "*"
-    "@types/relateurl" "*"
-    "@types/uglify-js" "*"
-
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
  version "2.0.3"
  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762"
@ -1763,15 +1664,6 @@
    jest-diff "^26.0.0"
    pretty-format "^26.0.0"

-"@types/jsdom@^16.2.9":
-  version "16.2.9"
-  resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-16.2.9.tgz#9c219e5c387f045aae8b80ae4d4cf61d098c15eb"
-  integrity sha512-7+HFvB7RIrU4KGazrn0/K81yjdg1hpwshM+nbt7CNlbwN1TUq5sBFMCfVglBYYv29l6ZTmXXFEB2FnxLv5gDcg==
-  dependencies:
-    "@types/node" "*"
-    "@types/parse5" "*"
-    "@types/tough-cookie" "*"
-
 "@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6":
  version "7.0.7"
  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
@ -1782,37 +1674,17 @@
  resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
  integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=

-"@types/less@^3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@types/less/-/less-3.0.2.tgz#2761d477678c8374cb9897666871662eb1d1115e"
-  integrity sha512-62vfe65cMSzYaWmpmhqCMMNl0khen89w57mByPi1OseGfcV/LV03fO8YVrNj7rFQsRWNJo650WWyh6m7p8vZmA==
-
-"@types/lodash@^4.14.168":
-  version "4.14.168"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.168.tgz#fe24632e79b7ade3f132891afff86caa5e5ce008"
-  integrity sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q==
-
-"@types/lru-cache@^5.1.0":
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/@types/lru-cache/-/lru-cache-5.1.0.tgz#57f228f2b80c046b4a1bd5cac031f81f207f4f03"
-  integrity sha512-RaE0B+14ToE4l6UqdarKPnXwVDuigfFv+5j9Dze/Nqr23yyuqdNvzcZi3xB+3Agvi5R4EOgAksfv3lXX4vBt9w==
-
-"@types/mime@^1":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
-  integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
-
 "@types/mime@^2.0.2":
  version "2.0.3"
  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.3.tgz#c893b73721db73699943bfc3653b1deb7faa4a3a"
  integrity sha512-Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q==

-"@types/minimatch@*", "@types/minimatch@^3.0.3":
+"@types/minimatch@^3.0.3":
  version "3.0.3"
  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==

-"@types/minimist@^1.2.0", "@types/minimist@^1.2.1":
+"@types/minimist@^1.2.0":
  version "1.2.1"
  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz#283f669ff76d7b8260df8ab7a4262cc83d988256"
  integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==
@ -1832,65 +1704,21 @@
  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
  integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==

-"@types/on-headers@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/on-headers/-/on-headers-1.0.0.tgz#12e80879ff22257036d3f18310c39de1881d141e"
-  integrity sha512-m5LRgPZzWPHGoEQDbuVuduRMctCW5tDarxi9f7+rYZoJDy7nMHMMrODtqbwPpNjYc6Ilg4vL2NeYAwimJfku3w==
-  dependencies:
-    "@types/node" "*"
-
-"@types/opener@^1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@types/opener/-/opener-1.4.0.tgz#7967fae45cfabfe1fa268512b1b304f5a2b1127f"
-  integrity sha1-eWf65Fz6v+H6JoUSsbME9aKxEn8=
-  dependencies:
-    "@types/node" "*"
-
 "@types/parse-json@^4.0.0":
  version "4.0.0"
  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
  integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==

-"@types/parse5@*":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-6.0.0.tgz#38590dc2c3cf5717154064e3ee9b6947ee21b299"
-  integrity sha512-oPwPSj4a1wu9rsXTEGIJz91ISU725t0BmSnUhb57sI+M8XEmvUop84lzuiYdq0Y5M6xLY8DBPg0C2xEQKLyvBA==
-
-"@types/pify@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@types/pify/-/pify-5.0.0.tgz#50eac92722df9ae02caa9f514609cb8d18f9acd7"
-  integrity sha512-Y7rZv5LH4WqWXiCBDp+OqMG43XekhABHsUoWnfWcpy2TE4YxekicDMxt95aQsRgGYWAZ21ab7IxOQj0pHhVKsQ==
-
 "@types/prettier@^2.0.0":
  version "2.2.3"
  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.3.tgz#ef65165aea2924c9359205bf748865b8881753c0"
  integrity sha512-PijRCG/K3s3w1We6ynUKdxEc5AcuuH3NBmMDP8uvKVp6X43UY7NQlTzczakXP3DJR0F4dfNQIGjU2cUeRYs2AA==

-"@types/pug@^2.0.4":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@types/pug/-/pug-2.0.4.tgz#8772fcd0418e3cd2cc171555d73007415051f4b2"
-  integrity sha1-h3L80EGOPNLMFxVV1zAHQVBR9LI=
-
 "@types/q@^1.5.1":
  version "1.5.4"
  resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24"
  integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==

-"@types/qs@*":
-  version "6.9.6"
-  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.6.tgz#df9c3c8b31a247ec315e6996566be3171df4b3b1"
-  integrity sha512-0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA==
-
-"@types/range-parser@*":
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c"
-  integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==
-
-"@types/relateurl@*":
-  version "0.2.28"
-  resolved "https://registry.yarnpkg.com/@types/relateurl/-/relateurl-0.2.28.tgz#6bda7db8653fa62643f5ee69e9f69c11a392e3a6"
-  integrity sha1-a9p9uGU/piZD9e5p6facEaOS46Y=
-
 "@types/resolve@1.17.1":
  version "1.17.1"
  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6"
@ -1898,31 +1726,6 @@
  dependencies:
    "@types/node" "*"

-"@types/semver@^7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.4.tgz#43d7168fec6fa0988bb1a513a697b29296721afb"
-  integrity sha512-+nVsLKlcUCeMzD2ufHEYuJ9a2ovstb6Dp52A5VsoKxDXgvE051XgHI/33I1EymwkRGQkwnA0LkhnUzituGs4EQ==
-
-"@types/serialize-javascript@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@types/serialize-javascript/-/serialize-javascript-5.0.0.tgz#127638567bd9f11251ad0ca2d9d9ea9ce5ca4b93"
-  integrity sha512-2+ai0/OTduvDzJHRAcqDwgNwshL1TN+iAfjzJJogXPSSjTBuqPl7MI0xGqCcPx+PDFbvmziiK1H6bjDb4DcoSA==
-
-"@types/serve-static@*", "@types/serve-static@^1.13.9":
-  version "1.13.9"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.9.tgz#aacf28a85a05ee29a11fb7c3ead935ac56f33e4e"
-  integrity sha512-ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA==
-  dependencies:
-    "@types/mime" "^1"
-    "@types/node" "*"
-
-"@types/server-destroy@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@types/server-destroy/-/server-destroy-1.0.1.tgz#6010a89e2df4f2c15a265fe73c70fd3641486530"
-  integrity sha512-77QGr7waZbE0Y0uF+G+uH3H3SmhyA78Jf2r5r7QSrpg0U3kSXduWpGjzP9PvPLR/KCy+kHjjpnugRHsYTnHopg==
-  dependencies:
-    "@types/node" "*"
-
 "@types/source-list-map@*":
  version "0.1.2"
  resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
@ -1946,11 +1749,6 @@
    terser "^5.3.8"
    webpack "^5.1.0"

-"@types/tough-cookie@*":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.0.tgz#fef1904e4668b6e5ecee60c52cc6a078ffa6697d"
-  integrity sha512-I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A==
-
 "@types/uglify-js@*":
  version "3.13.0"
  resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.13.0.tgz#1cad8df1fb0b143c5aba08de5712ea9d1ff71124"
@ -2002,11 +1800,6 @@
    "@types/webpack-sources" "*"
    source-map "^0.6.0"

-"@types/wrap-ansi@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/wrap-ansi/-/wrap-ansi-3.0.0.tgz#18b97a972f94f60a679fd5c796d96421b9abb9fd"
-  integrity sha512-ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g==
-
 "@types/yargs-parser@*":
  version "20.2.0"
  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.0.tgz#dd3e6699ba3237f0348cd085e4698780204842f9"
@ -2820,18 +2613,6 @@ atob@^2.1.2:
  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==

-autoprefixer@*:
-  version "10.2.5"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.2.5.tgz#096a0337dbc96c0873526d7fef5de4428d05382d"
-  integrity sha512-7H4AJZXvSsn62SqZyJCP+1AWwOuoYpUfK6ot9vm0e87XD6mT8lDywc9D9OTJPMULyGcvmIxzTAMeG2Cc+YX+fA==
-  dependencies:
-    browserslist "^4.16.3"
-    caniuse-lite "^1.0.30001196"
-    colorette "^1.2.2"
-    fraction.js "^4.0.13"
-    normalize-range "^0.1.2"
-    postcss-value-parser "^4.1.0"
-
 available-typed-arrays@^1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz#6b098ca9d8039079ee3f77f7b783c4480ba513f5"
@ -3027,7 +2808,7 @@ browser-process-hrtime@^1.0.0:
  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
  integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==

-browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.3:
+browserslist@^4.0.0, browserslist@^4.14.5:
  version "4.16.3"
  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz#340aa46940d7db878748567c5dea24a48ddf3717"
  integrity sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==
@ -3217,7 +2998,7 @@ caniuse-api@^3.0.0:
    lodash.memoize "^4.1.2"
    lodash.uniq "^4.5.0"

-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001181, caniuse-lite@^1.0.30001196:
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001181:
  version "1.0.30001202"
  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001202.tgz#4cb3bd5e8a808e8cd89e4e66c549989bc8137201"
  integrity sha512-ZcijQNqrcF8JNLjzvEiXqX4JUYxoZa7Pvcsd9UD8Kz4TvhTonOSNRsK+qtvpVL4l6+T1Rh4LFtLfnNWg6BGWCQ==
@ -3769,11 +3550,6 @@ copy-descriptor@^0.1.0:
  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=

-core-js@^3.10.0:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.10.0.tgz#9a020547c8b6879f929306949e31496bbe2ae9b3"
-  integrity sha512-MQx/7TLgmmDVamSyfE+O+5BHvG1aUGj/gHhLn1wVtm2B5u1eVIPvh7vkfjwWKNCjrTJB8+He99IntSQ1qP+vYQ==
-
 core-util-is@1.0.2, core-util-is@~1.0.0:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@ -5153,11 +4929,6 @@ form-data@~2.3.2:
    combined-stream "^1.0.6"
    mime-types "^2.1.12"

-fraction.js@^4.0.13:
-  version "4.0.13"
-  resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.0.13.tgz#3c1c315fa16b35c85fffa95725a36fa729c69dfe"
-  integrity sha512-E1fz2Xs9ltlUp+qbiyx9wmt2n9dRzPsS11Jtdb8D2o+cC7wr9xkkKsVKJuBX0ST+LVS+LhLO+SbLJNtfWcJvXA==
-
 fragment-cache@^0.2.1:
  version "0.2.1"
  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
@ -7820,11 +7591,6 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==

-normalize-range@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
-  integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
-
 normalize-url@^3.0.0, normalize-url@^3.3.0:
  version "3.3.0"
  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
@ -10962,7 +10728,7 @@ vue@^3.0.11:
    "@vue/runtime-dom" "3.0.11"
    "@vue/shared" "3.0.11"

-vuex5@0.5.0-testing.3:
+vuex5@^0.5.0-testing.3:
  version "0.5.0-testing.3"
  resolved "https://registry.yarnpkg.com/vuex5/-/vuex5-0.5.0-testing.3.tgz#2e7e5d45fabc26870c80257215f0e38696a45d59"
  integrity sha512-fKcpx/RwnfD2L7Lv4VKjY9hmBZp3LJi2G7tUblCUQB5vhOKpoWkip5XIYHEDmJe5KnJJvZ7nf9Ih8wvCIOCVQg==