Merge master in to next branch

.github/workflows/test.yml

@@ -0,0 +1,28 @@
+name: Test
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+
+      - uses: actions/cache@v1
+        id: cache
+        with:
+          path: "node_modules"
+          key: ${{ runner.os }}-${{ hashFiles('yarn.lock') }}
+
+      - name: Install dependencies
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: yarn
+
+      - name: Run tests
+        run: yarn test
+
+      - name: Coverage
+        run: yarn codecov
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.husky/commit-msg

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx --no -- commitlint --edit ""

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+yarn lint

CHANGELOG.md

@@ -2,6 +2,90 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.12.3](https://github.com/nuxt-community/vuetify-module/compare/v1.12.2...v1.12.3) (2021-12-12)
+
+
+### Bug Fixes
+
+* **deps:** revert to sass-loader v10 ([#487](https://github.com/nuxt-community/vuetify-module/issues/487)) ([50dd7d4](https://github.com/nuxt-community/vuetify-module/commit/50dd7d40299aac7d04d1e951fe8bf9b77163e72f))
+
+### [1.12.2](https://github.com/nuxt-community/vuetify-module/compare/v1.12.1...v1.12.2) (2021-11-28)
+
+### [1.12.1](https://github.com/nuxt-community/vuetify-module/compare/v1.12.0...v1.12.1) (2021-06-13)
+
+
+### Bug Fixes
+
+* require [email protected] ([f7a65cf](https://github.com/nuxt-community/vuetify-module/commit/f7a65cf41e5f8b39469db0411f398a93a5865e31))
+
+## [1.12.0](https://github.com/nuxt-community/vuetify-module/compare/v1.11.3...v1.12.0) (2021-06-13)
+
+
+### Features
+
+* compatible with Nuxt 2.14 and typescript 4 ([#395](https://github.com/nuxt-community/vuetify-module/issues/395)) ([16c2bca](https://github.com/nuxt-community/vuetify-module/commit/16c2bca8e6e293ada9ea4f00d4a2e767d5be5671))
+
+
+### Bug Fixes
+
+* **types:** use UserVuetifyPreset instead of VuetifyPreset ([#419](https://github.com/nuxt-community/vuetify-module/issues/419)) ([d75b2be](https://github.com/nuxt-community/vuetify-module/commit/d75b2bea1bf68a66f2f77e97dd88d5f0e01d4ad2))
+* lock sass version to ~1.32.13 ([#452](https://github.com/nuxt-community/vuetify-module/issues/452)) ([4868782](https://github.com/nuxt-community/vuetify-module/commit/48687822d21bf87b375c934634f0ac02a05f47a8)), closes [#446](https://github.com/nuxt-community/vuetify-module/issues/446)
+
+### [1.11.3](https://github.com/nuxt-community/vuetify-module/compare/v1.11.2...v1.11.3) (2021-01-17)
+
+
+### Bug Fixes
+
+* remove fibers dependency to support node.js 14 on Windows ([#390](https://github.com/nuxt-community/vuetify-module/issues/390)) ([7a02126](https://github.com/nuxt-community/vuetify-module/commit/7a021268b3901a9716a0f82d20ff034c454d9a95))
+* sass-loader use additionalData vs prependData ([a92eaf1](https://github.com/nuxt-community/vuetify-module/commit/a92eaf175d626be20b68327b9b2be3d188ba59dd))
+
+### [1.11.2](https://github.com/nuxt-community/vuetify-module/compare/v1.11.1...v1.11.2) (2020-04-26)
+
+### [1.11.1](https://github.com/nuxt-community/vuetify-module/compare/v1.11.0...v1.11.1) (2020-04-26)
+
+
+### Bug Fixes
+
+* check if preset is in presetsCDN ([#291](https://github.com/nuxt-community/vuetify-module/issues/291)) ([57a0ceb](https://github.com/nuxt-community/vuetify-module/commit/57a0ceb74551c20ca9fccf53b5083ad805e500a8))
+
+## [1.11.0](https://github.com/nuxt-community/vuetify-module/compare/v1.10.3...v1.11.0) (2020-02-17)
+
+
+### Features
+
+* allow for list of custom fonts ([#269](https://github.com/nuxt-community/vuetify-module/issues/269)) ([3644437](https://github.com/nuxt-community/vuetify-module/commit/3644437cb01630b43aaa1898bfa352469b8faa91))
+
+### [1.10.3](https://github.com/nuxt-community/vuetify-module/compare/v1.10.2...v1.10.3) (2020-01-30)
+
+
+### Bug Fixes
+
+* fix VuetifyLoaderOptions match type ([#273](https://github.com/nuxt-community/vuetify-module/issues/273)) ([2923943](https://github.com/nuxt-community/vuetify-module/commit/2923943a05b3940b31277ab64234535eda4c3ceb))
+* use minimal vuetify import ([#267](https://github.com/nuxt-community/vuetify-module/issues/267)) ([1dffcbb](https://github.com/nuxt-community/vuetify-module/commit/1dffcbbd4fcce8bae3f9b03d6b83cf0434588790))
+
+### [1.10.2](https://github.com/nuxt-community/vuetify-module/compare/v1.10.1...v1.10.2) (2020-01-17)
+
+### [1.10.1](https://github.com/nuxt-community/vuetify-module/compare/v1.10.0...v1.10.1) (2020-01-15)
+
+
+### Bug Fixes
+
+* update devDependencies & fix code ([7f37ef6](https://github.com/nuxt-community/vuetify-module/commit/7f37ef64f9fc7d23fcb3a84a9ba7cfe963f3f3ca)), closes [#251](https://github.com/nuxt-community/vuetify-module/issues/251)
+
+## [1.10.0](https://github.com/nuxt-community/vuetify-module/compare/v1.9.1...v1.10.0) (2020-01-13)
+
+
+### Features
+
+* add preset support ([#247](https://github.com/nuxt-community/vuetify-module/issues/247)) ([25d9813](https://github.com/nuxt-community/vuetify-module/commit/25d98137ded1296d1ddab9a7c4854102021bce66))
+
+
+### Bug Fixes
+
+* **deps:** bump vuetify version to latest and fix type path ([#237](https://github.com/nuxt-community/vuetify-module/issues/237)) ([b30f5db](https://github.com/nuxt-community/vuetify-module/commit/b30f5db447e74fed1871d59584eb98bbc15dceb6))
+
+### [1.9.1](https://github.com/nuxt-community/vuetify-module/compare/v1.9.0...v1.9.1) (2019-12-05)
+
 ## [1.9.0](https://github.com/nuxt-community/vuetify-module/compare/v1.8.6...v1.9.0) (2019-10-02)
 
 ### Notes

README.md

@@ -9,7 +9,13 @@
   <a href="https://www.npmjs.com/package/@nuxtjs/vuetify"><img src="https://img.shields.io/npm/l/@nuxtjs/vuetify.svg?style=flat-square" alt="License"></a>
 </p>
 
-> [Vuetify 2](https://vuetifyjs.com) module for [Nuxt.js](https://nuxtjs.org)
+> [Vuetify 2](https://vuetifyjs.com) module for [Nuxt 2](https://nuxt.com)
+
+## Nuxt 3
+
+Looking for a Nuxt 3 solution? Try out: 
+- [userquin/vuetify-nuxt-module](https://github.com/userquin/vuetify-nuxt-module)
+- [nuxt-alt/vuetify](https://github.com/nuxt-alt/vuetify)
 
 ## Infos
 
@@ -75,8 +81,9 @@ Usage example :
 $btn-border-radius: 0px;
 
 // If you need to extend Vuetify SASS lists
+$material-light: ( cards: blue );
+
 @import '~vuetify/src/styles/styles.sass';
-$material-light: map-merge($material-light, ( cards: blue ));
 ```
 
 ```js
@@ -129,7 +136,8 @@ Here are the accepted values for this option :
 
 Please refer to [Vuetify Icons documentation](https://vuetifyjs.com/en/customization/icons) for more information about icons, notably for using only bunch of SVG icons instead of including all icons in your app.
 
-You can also set the whole `defaultAssets` option to `false` to prevent any automatic add of these two assets.
+You can also set the whole `defaultAssets` option to `false` to prevent any automatic add of these two assets. 
+You can read more about adding your own assets in the [Offline applications](https://github.com/nuxt-community/vuetify-module#offline-applications) section. 
 
 ### `optionsPath`
 
@@ -187,12 +195,21 @@ export default function ({ app }) {
 
 ### `treeShake`
 
-- Type: `Boolean`
+- Type: `Object` or `Boolean`
 - Default: `process.env.NODE_ENV === 'production'`
 
 Uses [vuetify-loader](https://github.com/vuetifyjs/vuetify-loader) to enable automatic [tree-shaking](https://vuetifyjs.com/en/customization/a-la-carte).
 Enabled only for production by default.
 
+You can set object as a set of options to [manually import](https://vuetifyjs.com/en/features/treeshaking/#manually-importing) Vuetify modules globally:
+
+| Key | Type | Value |
+| --- | --- | --- |
+| components | string[] | array of name of Vuetify components to import globally |
+| directives | string[] | array of name of Vuetify directives to import globally |
+| loaderOptions | function | loader option which applies to VuetifyLoaderPlugin |
+| transitions | string[] | array of name of [Vuetify transitions](https://vuetifyjs.com/en/styles/transitions/) to import globally |
+
 ## TypeScript
 
 If you're using TypeScript, you'll need to add `@nuxtjs/vuetify` in your `compilerOptions` of your `tsconfig.json` :
@@ -217,7 +234,7 @@ If you're building an application that will need to work offline (more likely a
 
 It means you must set [`defaultAssets`](#defaultAssets) option to `false`.
 
-For fonts, you may leverage CSS [**@font-face**](https://www.w3schools.com/cssref/css3_pr_font-face_rule.asp) rule with local path of your fonts.
+For fonts, you may leverage CSS [**@font-face**](https://www.w3schools.com/cssref/css3_pr_font-face_rule.asp) rule with local path of your fonts. You may find the [google webfonts helper](https://google-webfonts-helper.herokuapp.com/fonts/roboto?subsets=latin) site useful for generating **@font-face** rules and sourcing replacement files for the default CDNs.
 
 For icons, you can either use the same way than above, or leverage tree-shaken SVG libraries like [**Material Design Icons SVG**](https://github.com/Templarian/MaterialDesign-JS) or [**Font Awesome 5 SVG**](https://fontawesome.com/how-to-use/on-the-web/advanced/svg-javascript-core).
 

jest.config.js

@@ -6,7 +6,7 @@ module.exports = {
   },
   globals: {
     'ts-jest': {
-      tsConfig: 'tsconfig.test.json',
+      tsconfig: 'tsconfig.test.json',
       diagnostics: {
         ignoreCodes: [2345]
       }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxtjs/vuetify",
-  "version": "1.9.0",
+  "version": "1.12.3",
   "description": "Vuetify Module for Nuxt.js",
   "license": "MIT",
   "contributors": [
@@ -22,36 +22,37 @@
     "build": "tsc",
     "lint": "eslint --ext .ts,.js,.vue .",
     "test": "yarn lint && jest",
-    "release": "yarn test && yarn build && standard-version && git push --follow-tags && npm publish"
+    "release": "yarn test && yarn build && standard-version && git push --follow-tags && npm publish",
+    "prepare": "husky install"
   },
   "files": [
     "dist",
     "templates"
   ],
   "dependencies": {
     "deepmerge": "^4.2.2",
-    "fibers": "^4.0.2",
-    "sass": "^1.23.7",
-    "sass-loader": "^8.0.0",
-    "vuetify": "^2.1.13",
-    "vuetify-loader": "^1.4.3"
+    "sass": "~1.32.13",
+    "sass-loader": "^10.2.0",
+    "vuetify": "^2.6",
+    "vuetify-loader": "^1.7.3"
   },
   "devDependencies": {
-    "@commitlint/cli": "latest",
-    "@commitlint/config-conventional": "latest",
-    "@nuxt/typescript-build": "latest",
-    "@nuxt/typescript-runtime": "latest",
-    "@nuxtjs/eslint-config-typescript": "latest",
-    "@types/jest": "latest",
-    "@types/sass": "latest",
-    "codecov": "latest",
-    "eslint": "latest",
-    "husky": "latest",
-    "jest": "latest",
-    "nuxt-edge": "latest",
+    "@commitlint/cli": "^15.0.0",
+    "@commitlint/config-conventional": "^15.0.0",
+    "@nuxt/types": "^2.15.8",
+    "@nuxt/typescript-build": "^2.1.0",
+    "@nuxt/typescript-runtime": "^2.1.0",
+    "@nuxtjs/eslint-config-typescript": "^7.0.2",
+    "@types/jest": "^27.0.3",
+    "@types/sass": "^1.43.1",
+    "codecov": "^3.8.2",
+    "eslint": "^8.3.0",
+    "husky": "^7.0.4",
+    "jest": "^27.3.1",
+    "nuxt": "^2.15.8",
     "nuxt-webfontloader": "^1.1.0",
-    "standard-version": "latest",
-    "ts-jest": "latest",
-    "typescript": "~3.6"
+    "standard-version": "^9.3.2",
+    "ts-jest": "^27.0.7",
+    "typescript": "~4.0"
   }
 }

renovate.json

@@ -9,6 +9,7 @@
     "dependencies"
   ],
   "ignoreDeps": [
+    "sass",
     "typescript"
   ]
 }