Skip to content

Commit b2b9048

Browse files
authored
Merge pull request #9626 from ledgersmb/renovate/1.13-quasar-extras-2.x
Update dependency @quasar/extras to v2 (1.13)
2 parents 029e604 + 3ecd5da commit b2b9048

4 files changed

Lines changed: 9 additions & 16 deletions

File tree

UI/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"url": "https://github.com/ledgersmb/LedgerSMB"
3737
},
3838
"dependencies": {
39-
"@quasar/extras": "^1.16.17",
39+
"@quasar/extras": "^2.0.0",
4040
"content-disposition": "2.0.1",
4141
"dijit": "1.17.3",
4242
"dojo": "1.17.3",

UI/src/main-vue.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ import LoginPage from "@/views/LoginPage";
99
import LsmbMain from "@/views/LsmbMain";
1010
import { useSessionUserStore } from "@/store/sessionUser";
1111

12+
// import quasar extras compliant with v2
13+
import "@quasar/extras/material-icons/material-icons.css";
14+
import "@quasar/extras/roboto-font/roboto-font.css";
15+
1216
import { installQuasar } from "./quasar-init";
1317

1418
const dojoParser = require("dojo/parser");

UI/webpack.config.js

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -215,17 +215,6 @@ if (TARGET !== "readme") {
215215
from: "dojo/resources/**/*",
216216
to: "."
217217
},
218-
// Add Quasar assets
219-
{
220-
context: "node_modules",
221-
from: "@quasar/extras/material-icons/**/*",
222-
to: "quasar/material-icons/[name][ext]"
223-
},
224-
{
225-
context: "node_modules",
226-
from: "@quasar/extras/roboto-font/**/*",
227-
to: "quasar/roboto-font/[name][ext]"
228-
}
229218
],
230219
options: {
231220
concurrency: 100

UI/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3544,10 +3544,10 @@
35443544
core-js "^3.49.0"
35453545
core-js-compat "^3.49.0"
35463546

3547-
"@quasar/extras@^1.16.17":
3548-
version "1.18.0"
3549-
resolved "https://registry.yarnpkg.com/@quasar/extras/-/extras-1.18.0.tgz#ff62889de6b48e30e5c2f44f8da167e1589b1ff9"
3550-
integrity sha512-hIqqw56sKGujWA3sTIT1ItlVglD+eA3hAWDVxY4qjA4/BSgYJDHk6ymJCbsDPIJFT7DJsG/F3A67vELXbBAIvA==
3547+
"@quasar/extras@^2.0.0":
3548+
version "2.0.0"
3549+
resolved "https://registry.yarnpkg.com/@quasar/extras/-/extras-2.0.0.tgz#28fa58eef562a1045d07ba7223cc7e80983cfbf1"
3550+
integrity sha512-JiVq65j28Rp5AFLVpHBSv+MUV+NpE4x8cSGyfWquakOZe8FCV1E6qmbCDQhPY/e2fheFhaN8uGl1R3UbC8BxZw==
35513551

35523552
"@quasar/render-ssr-error@^1.0.4":
35533553
version "1.0.4"

0 commit comments

Comments
 (0)