Skip to content

P
pro-layout
Unverified Commit 91146d43 authored by Sendya's avatar Sendya
Browse files
Options

fix: support less@4, fix less import '~' err

parent e868e745
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 27 deletions
src/BasicLayout.less
View file @ 91146d43
@import '~ant-design-vue/es/style/themes/default.less'; @import 'ant-design-vue/es/style/themes/default.less';
@basicLayout-prefix-cls: ~'@{ant-prefix}-pro-basicLayout'; @basicLayout-prefix-cls: ~'@{ant-prefix}-pro-basicLayout';
@pro-layout-header-height: 48px; @pro-layout-header-height: 48px;
......
src/FooterToolbar/index.less
View file @ 91146d43
@import '~ant-design-vue/es/style/themes/default.less'; @import 'ant-design-vue/es/style/themes/default.less';
@pro-footer-bar-prefix-cls: ~'@{ant-prefix}-pro-footer-bar'; @pro-footer-bar-prefix-cls: ~'@{ant-prefix}-pro-footer-bar';
......
src/GlobalFooter/index.less
View file @ 91146d43
@import '~ant-design-vue/es/style/themes/default.less'; @import 'ant-design-vue/es/style/themes/default.less';
@pro-global-footer-prefix-cls: ~'@{ant-prefix}-pro-global-footer'; @pro-global-footer-prefix-cls: ~'@{ant-prefix}-pro-global-footer';
......
src/GlobalHeader/index.less
View file @ 91146d43
@import '~ant-design-vue/es/style/themes/default.less'; @import 'ant-design-vue/es/style/themes/default.less';
@import '../BasicLayout.less'; @import '../BasicLayout.less';
@pro-layout-global-header-prefix-cls: ~'@{ant-prefix}-pro-global-header'; @pro-layout-global-header-prefix-cls: ~'@{ant-prefix}-pro-global-header';
......
src/GridContent/GridContent.less
View file @ 91146d43
@import '~ant-design-vue/es/style/themes/default.less'; @import 'ant-design-vue/es/style/themes/default.less';
@pro-layout-grid-content-prefix-cls: ~'@{ant-prefix}-pro-grid-content'; @pro-layout-grid-content-prefix-cls: ~'@{ant-prefix}-pro-grid-content';
......
src/Header.less
View file @ 91146d43
@import '~ant-design-vue/es/style/themes/default.less'; @import 'ant-design-vue/es/style/themes/default.less';
@pro-layout-fixed-header-prefix-cls: ~'@{ant-prefix}-pro-fixed-header'; @pro-layout-fixed-header-prefix-cls: ~'@{ant-prefix}-pro-fixed-header';
......
src/PageContainer/index.less
View file @ 91146d43
@import "~ant-design-vue/es/style/themes/default.less"; @import "ant-design-vue/es/style/themes/default.less";
@pro-layout-page-container: ~'@{ant-prefix}-pro-page-container'; @pro-layout-page-container: ~'@{ant-prefix}-pro-page-container';
......
src/TopNavHeader/index.less
View file @ 91146d43
@import '~ant-design-vue/es/style/themes/default.less'; @import 'ant-design-vue/es/style/themes/default.less';
@import '../BasicLayout.less'; @import '../BasicLayout.less';
@top-nav-header-prefix-cls: ~'@{ant-prefix}-pro-top-nav-header'; @top-nav-header-prefix-cls: ~'@{ant-prefix}-pro-top-nav-header';
......
yarn.lock
View file @ 91146d43
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
# yarn lockfile v1 # yarn lockfile v1
"@ant-design-vue/tools@^3.0.7": "@ant-design-vue/tools@^3.0.8":
version "3.0.7" version "3.0.8"
resolved "https://registry.yarnpkg.com/@ant-design-vue/tools/-/tools-3.0.7.tgz#80a2ea01768f7823adf8db4b3a19609ffd809f9e" resolved "https://registry.yarnpkg.com/@ant-design-vue/tools/-/tools-3.0.8.tgz#a24f5aeebae875c656153bd5a121b754f0f39b0a"
integrity sha512-XJL1yoEnOPjctSqmTzSX5rp+l+g5YCWQblib3T7hEAkRxj5fCZAy8NZdt3pvf9SkqvLxSXEf3ddCP/OoUBDSpQ== integrity sha512-kZzp3cFWE1bv5WFkB1qTSTW1xIcUTOsQvygqYUeRly6rrFPo3DZ2S16Co/Awy43iA0biQdQvUIA+icCfZ30fDQ==
dependencies: dependencies:
"@babel/core" "~7.2.2" "@babel/core" "~7.2.2"
"@babel/plugin-proposal-class-properties" "~7.2.1" "@babel/plugin-proposal-class-properties" "~7.2.1"
...@@ -74,8 +74,8 @@ ...@@ -74,8 +74,8 @@
koa-router "7.x" koa-router "7.x"
koa-serve-index "^1.1.1" koa-serve-index "^1.1.1"
koa-static "^5.0.0" koa-static "^5.0.0"
less "^3.9.0" less "^4.0.0"
less-loader "^4.1.0" less-loader "^7.1.0"
match-require "2.x" match-require "2.x"
merge2 "~1.2.3" merge2 "~1.2.3"
mini-css-extract-plugin "^0.5.0" mini-css-extract-plugin "^0.5.0"
...@@ -1765,7 +1765,7 @@ ...@@ -1765,7 +1765,7 @@
dependencies: dependencies:
jest-diff "^24.3.0" jest-diff "^24.3.0"
"@types/json-schema@^7.0.3", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5": "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6":
version "7.0.7" version "7.0.7"
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA== integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
...@@ -2648,7 +2648,7 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: ...@@ -2648,7 +2648,7 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.9.1: ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.9.1:
version "6.12.6" version "6.12.6"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
...@@ -8097,7 +8097,7 @@ humanize-url@^1.0.0: ...@@ -8097,7 +8097,7 @@ humanize-url@^1.0.0:
normalize-url "^1.0.0" normalize-url "^1.0.0"
strip-url-auth "^1.0.0" strip-url-auth "^1.0.0"
iconv-lite@0.4.24, iconv-lite@^0.4.24: iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
version "0.4.24" version "0.4.24"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
...@@ -10104,6 +10104,11 @@ kleur@^3.0.3: ...@@ -10104,6 +10104,11 @@ kleur@^3.0.3:
resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
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==
koa-body@^4.0.4: koa-body@^4.0.4:
version "4.2.0" version "4.2.0"
resolved "https://registry.yarnpkg.com/koa-body/-/koa-body-4.2.0.tgz#37229208b820761aca5822d14c5fc55cee31b26f" resolved "https://registry.yarnpkg.com/koa-body/-/koa-body-4.2.0.tgz#37229208b820761aca5822d14c5fc55cee31b26f"
...@@ -10306,16 +10311,16 @@ left-pad@^1.3.0: ...@@ -10306,16 +10311,16 @@ left-pad@^1.3.0:
resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e" resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
integrity sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA== integrity sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==
less-loader@^4.1.0: less-loader@^7.1.0:
version "4.1.0" version "7.3.0"
resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-4.1.0.tgz#2c1352c5b09a4f84101490274fd51674de41363e" resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-7.3.0.tgz#f9d6d36d18739d642067a05fb5bd70c8c61317e5"
integrity sha512-KNTsgCE9tMOM70+ddxp9yyt9iHqgmSs0yTZc5XH5Wo+g80RWRIYNqE58QJKm/yMud5wZEvz50ugRDuzVIkyahg== integrity sha512-Mi8915g7NMaLlgi77mgTTQvK022xKRQBIVDSyfl3ErTuBhmZBQab0mjeJjNNqGbdR+qrfTleKXqbGI4uEFavxg==
dependencies: dependencies:
clone "^2.1.1" klona "^2.0.4"
loader-utils "^1.1.0" loader-utils "^2.0.0"
pify "^3.0.0" schema-utils "^3.0.0"
"less@2.6.x || ^3.7.1", less@^3.9.0: "less@2.6.x || ^3.7.1":
version "3.13.1" version "3.13.1"
resolved "https://registry.yarnpkg.com/less/-/less-3.13.1.tgz#0ebc91d2a0e9c0c6735b83d496b0ab0583077909" resolved "https://registry.yarnpkg.com/less/-/less-3.13.1.tgz#0ebc91d2a0e9c0c6735b83d496b0ab0583077909"
integrity sha512-SwA1aQXGUvp+P5XdZslUOhhLnClSLIjWvJhmd+Vgib5BFIr9lMNlQwmwUNOjXThF/A0x+MCYYPeWEfeWiLRnTw== integrity sha512-SwA1aQXGUvp+P5XdZslUOhhLnClSLIjWvJhmd+Vgib5BFIr9lMNlQwmwUNOjXThF/A0x+MCYYPeWEfeWiLRnTw==
...@@ -10331,6 +10336,23 @@ less-loader@^4.1.0: ...@@ -10331,6 +10336,23 @@ less-loader@^4.1.0:
native-request "^1.0.5" native-request "^1.0.5"
source-map "~0.6.0" source-map "~0.6.0"
less@^4.0.0:
version "4.1.1"
resolved "https://registry.yarnpkg.com/less/-/less-4.1.1.tgz#15bf253a9939791dc690888c3ff424f3e6c7edba"
integrity sha512-w09o8tZFPThBscl5d0Ggp3RcrKIouBoQscnOMgFH3n5V3kN/CXGHNfCkRPtxJk6nKryDXaV9aHLK55RXuH4sAw==
dependencies:
copy-anything "^2.0.1"
parse-node-version "^1.0.1"
tslib "^1.10.0"
optionalDependencies:
errno "^0.1.1"
graceful-fs "^4.1.2"
image-size "~0.5.0"
make-dir "^2.1.0"
mime "^1.4.1"
needle "^2.5.2"
source-map "~0.6.0"
leven@^2.1.0: leven@^2.1.0:
version "2.1.0" version "2.1.0"
resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580" resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
...@@ -11376,6 +11398,15 @@ nearley@^2.7.10: ...@@ -11376,6 +11398,15 @@ nearley@^2.7.10:
railroad-diagrams "^1.0.0" railroad-diagrams "^1.0.0"
randexp "0.4.6" randexp "0.4.6"
needle@^2.5.2:
version "2.6.0"
resolved "https://registry.yarnpkg.com/needle/-/needle-2.6.0.tgz#24dbb55f2509e2324b4a99d61f413982013ccdbe"
integrity sha512-KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg==
dependencies:
debug "^3.2.6"
iconv-lite "^0.4.4"
sax "^1.2.4"
negotiator@0.4.9: negotiator@0.4.9:
version "0.4.9" version "0.4.9"
resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.4.9.tgz#92e46b6db53c7e421ed64a2bc94f08be7630df3f" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.4.9.tgz#92e46b6db53c7e421ed64a2bc94f08be7630df3f"
...@@ -12052,7 +12083,7 @@ parse-json@^5.0.0: ...@@ -12052,7 +12083,7 @@ parse-json@^5.0.0:
json-parse-even-better-errors "^2.3.0" json-parse-even-better-errors "^2.3.0"
lines-and-columns "^1.1.6" lines-and-columns "^1.1.6"
parse-node-version@^1.0.0: parse-node-version@^1.0.0, parse-node-version@^1.0.1:
version "1.0.1" version "1.0.1"
resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b" resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA== integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
...@@ -13795,6 +13826,15 @@ schema-utils@^2.0.0, schema-utils@^2.5.0, schema-utils@^2.6.5, schema-utils@^2.6 ...@@ -13795,6 +13826,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 "^6.12.4"
ajv-keywords "^3.5.2" 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"
scroll-into-view-if-needed@^2.2.25: scroll-into-view-if-needed@^2.2.25:
version "2.2.27" version "2.2.27"
resolved "https://registry.yarnpkg.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.27.tgz#c696e439bb50128abc558317b39c929907bd0620" resolved "https://registry.yarnpkg.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.27.tgz#c696e439bb50128abc558317b39c929907bd0620"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment