From ccc1ec0d0d4e447735ed879257263795cf15af5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9=20Viricel?= Date: Fri, 4 Dec 2020 16:41:03 +0100 Subject: [PATCH] Update less and less-loader + Inject variables in Vue --- package.json | 4 +-- src/assets/less/variables.less | 3 +++ vue.config.js | 9 +++++++ yarn.lock | 46 ++++++++++++++++++++++------------ 4 files changed, 44 insertions(+), 18 deletions(-) create mode 100644 src/assets/less/variables.less create mode 100644 vue.config.js diff --git a/package.json b/package.json index 2d0b9d8..deb66c2 100644 --- a/package.json +++ b/package.json @@ -34,8 +34,8 @@ "eslint-plugin-import": "^2.20.2", "eslint-plugin-prettier": "^3.2.0", "eslint-plugin-vue": "^6.2.2", - "less": "^3.0.4", - "less-loader": "^5.0.0", + "less": "^3.12.2", + "less-loader": "^7.1.0", "vue-template-compiler": "^2.6.11" } } diff --git a/src/assets/less/variables.less b/src/assets/less/variables.less new file mode 100644 index 0000000..8feffd9 --- /dev/null +++ b/src/assets/less/variables.less @@ -0,0 +1,3 @@ +@primary-color: #0c9696; +@secondary-color: #ffffff; +@text-color: #333; diff --git a/vue.config.js b/vue.config.js new file mode 100644 index 0000000..e62581d --- /dev/null +++ b/vue.config.js @@ -0,0 +1,9 @@ +module.exports = { + css: { + loaderOptions: { + less: { + additionalData: `@import "~@/assets/less/variables.less";` + } + } + } +}; diff --git a/yarn.lock b/yarn.lock index a32ef7b..9772cb6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1233,7 +1233,7 @@ dependencies: jest-diff "^24.3.0" -"@types/json-schema@^7.0.5": +"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6": version "7.0.6" resolved "https://registry.npm.taobao.org/@types/json-schema/download/@types/json-schema-7.0.6.tgz?cache=0&sync_timestamp=1605054274568&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fjson-schema%2Fdownload%2F%40types%2Fjson-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0" integrity sha1-9MfsQ+gbMZqYFRFQMXCfJph4kfA= @@ -1915,7 +1915,7 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: resolved "https://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-3.5.2.tgz?cache=0&sync_timestamp=1606678582797&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv-keywords%2Fdownload%2Fajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" integrity sha1-MfKdpatuANHC0yms97WSlhTVAU0= -ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4: +ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5: version "6.12.6" resolved "https://registry.npm.taobao.org/ajv/download/ajv-6.12.6.tgz?cache=0&sync_timestamp=1606676435969&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha1-uvWmLoArB9l3A0WG+MO69a3ybfQ= @@ -3126,7 +3126,7 @@ clone-response@^1.0.2: dependencies: mimic-response "^1.0.0" -clone@2.x, clone@^2.1.1: +clone@2.x: version "2.1.2" resolved "https://registry.npm.taobao.org/clone/download/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18= @@ -5733,7 +5733,7 @@ ignore@^4.0.3, ignore@^4.0.6: image-size@~0.5.0: version "0.5.5" - resolved "https://registry.npm.taobao.org/image-size/download/image-size-0.5.5.tgz?cache=0&sync_timestamp=1603729549093&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fimage-size%2Fdownload%2Fimage-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c" + resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c" integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w= import-cwd@^2.0.0: @@ -7009,6 +7009,11 @@ kleur@^3.0.3: resolved "https://registry.npm.taobao.org/kleur/download/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" integrity sha1-p5yezIbuHOP6YgbRIWxQHxR/wH4= +klona@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz#7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0" + integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA== + latest-version@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" @@ -7041,19 +7046,19 @@ left-pad@^1.3.0: resolved "https://registry.npm.taobao.org/left-pad/download/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e" integrity sha1-W4o6d2Xf4AEmHd6RVYnngvjJTR4= -less-loader@^5.0.0: - version "5.0.0" - resolved "https://registry.npm.taobao.org/less-loader/download/less-loader-5.0.0.tgz#498dde3a6c6c4f887458ee9ed3f086a12ad1b466" - integrity sha1-SY3eOmxsT4h0WO6e0/CGoSrRtGY= +less-loader@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-7.1.0.tgz#958d41e86d7de0bcb490711ee0f235aa9dc596aa" + integrity sha512-EHbnRaTzHgsxnd3RK6OXSiygcCJs72+2ezXVLg+Hgl/ijUTtthKZXZh4MvQkWJr3h/SSKvxGZr7IIHzuS2KbVQ== dependencies: - clone "^2.1.1" - loader-utils "^1.1.0" - pify "^4.0.1" + klona "^2.0.4" + loader-utils "^2.0.0" + schema-utils "^3.0.0" -less@^3.0.4: +less@^3.12.2: version "3.12.2" - resolved "https://registry.npm.taobao.org/less/download/less-3.12.2.tgz#157e6dd32a68869df8859314ad38e70211af3ab4" - integrity sha1-FX5t0ypohp34hZMUrTjnAhGvOrQ= + resolved "https://registry.yarnpkg.com/less/-/less-3.12.2.tgz#157e6dd32a68869df8859314ad38e70211af3ab4" + integrity sha512-+1V2PCMFkL+OIj2/HrtrvZw0BC0sYLMICJfbQjuj/K8CEnlrFX6R5cKKgzzttsZDHyxQNL1jqMREjKN3ja/E3Q== dependencies: tslib "^1.10.0" optionalDependencies: @@ -7752,8 +7757,8 @@ nanomatch@^1.2.9: native-request@^1.0.5: version "1.0.8" - resolved "https://registry.npm.taobao.org/native-request/download/native-request-1.0.8.tgz#8f66bf606e0f7ea27c0e5995eb2f5d03e33ae6fb" - integrity sha1-j2a/YG4PfqJ8DlmV6y9dA+M65vs= + resolved "https://registry.yarnpkg.com/native-request/-/native-request-1.0.8.tgz#8f66bf606e0f7ea27c0e5995eb2f5d03e33ae6fb" + integrity sha512-vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag== natural-compare@^1.4.0: version "1.4.0" @@ -9677,6 +9682,15 @@ schema-utils@^2.0.0, schema-utils@^2.5.0, schema-utils@^2.6.5, schema-utils@^2.6 ajv "^6.12.4" ajv-keywords "^3.5.2" +schema-utils@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef" + integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA== + dependencies: + "@types/json-schema" "^7.0.6" + ajv "^6.12.5" + ajv-keywords "^3.5.2" + select-hose@^2.0.0: version "2.0.0" resolved "https://registry.npm.taobao.org/select-hose/download/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"