Skip to content

Commit c990fda

Browse files
authored
Merge pull request #9620 from ledgersmb/renovate/master-quasar-extras-2.x
Update dependency @quasar/extras to v2 (master)
2 parents 47f24c2 + a421465 commit c990fda

4 files changed

Lines changed: 10 additions & 17 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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4533,10 +4533,10 @@ __metadata:
45334533
languageName: node
45344534
linkType: hard
45354535

4536-
"@quasar/extras@npm:^1.16.17":
4537-
version: 1.18.0
4538-
resolution: "@quasar/extras@npm:1.18.0"
4539-
checksum: 10c0/deb795bbca27b2ea0fad47c224af2029459b1896b06fdc3d2d58ef9fe014968508f28005b4f96246461fdbcb1e75ccbfe6fb193095787d473627f9af1c9dabb6
4536+
"@quasar/extras@npm:^2.0.0":
4537+
version: 2.0.0
4538+
resolution: "@quasar/extras@npm:2.0.0"
4539+
checksum: 10c0/12da06f8d5d751a77e6ca916a1911853b4bb3e36494159143dca2e62b0e6cd6837b71ed5c0117e17a91a7046ad422f6eb7857d79c9cd1d2eaa3ec3451fa087b9
45404540
languageName: node
45414541
linkType: hard
45424542

@@ -12241,7 +12241,7 @@ __metadata:
1224112241
"@eslint/js": "npm:10.0.1"
1224212242
"@pinia/testing": "npm:1.0.3"
1224312243
"@quasar/app-webpack": "npm:^4.2.0"
12244-
"@quasar/extras": "npm:^1.16.17"
12244+
"@quasar/extras": "npm:^2.0.0"
1224512245
"@redocly/cli": "npm:2.31.5"
1224612246
"@typescript-eslint/utils": "npm:8.60.0"
1224712247
"@vitejs/plugin-vue": "npm:6.0.7"

0 commit comments

Comments
 (0)