diff --git a/.gitmodules b/.gitmodules index 0f5f5debe0628..23e24f45fc0c5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,3 +34,6 @@ [submodule "custom-npms/nc-mdi-svg"] path = custom-npms/nc-mdi-svg url = git@github.com:IONOS-Productivity/nc-MaterialDesign-SVG.git +[submodule "custom-npms/nc-mdi-js"] + path = custom-npms/nc-mdi-js + url = git@github.com:IONOS-Productivity/nc-MaterialDesign-JS.git diff --git a/IONOS b/IONOS index 81a053854707f..d9da5b1d4c4b3 160000 --- a/IONOS +++ b/IONOS @@ -1 +1 @@ -Subproject commit 81a053854707f17d2e8990ca9247e3f9373efb2b +Subproject commit d9da5b1d4c4b39b21c40f8619bd357650cd6fa23 diff --git a/custom-npms/nc-mdi-js b/custom-npms/nc-mdi-js new file mode 160000 index 0000000000000..7f5ace1207342 --- /dev/null +++ b/custom-npms/nc-mdi-js @@ -0,0 +1 @@ +Subproject commit 7f5ace1207342664872b2e295b1c3dddd9f6ee58 diff --git a/custom-npms/nc-vue-material-design-icons b/custom-npms/nc-vue-material-design-icons index 952419c24338b..e819217216c84 160000 --- a/custom-npms/nc-vue-material-design-icons +++ b/custom-npms/nc-vue-material-design-icons @@ -1 +1 @@ -Subproject commit 952419c24338b1b41e4eacc53b15364fab59ff81 +Subproject commit e819217216c841f9affc23715d277cbed32b6c00 diff --git a/package-lock.json b/package-lock.json index 40a1d14eba1d4..0f08dd074a302 100644 --- a/package-lock.json +++ b/package-lock.json @@ -94,6 +94,7 @@ "@cypress/vue2": "^2.1.1", "@cypress/webpack-preprocessor": "^6.0.2", "@jest/globals": "^29.7.0", + "@mdi/js": "file:./custom-npms/nc-mdi-js", "@mdi/svg": "file:./custom-npms/nc-mdi-svg/dist", "@nextcloud/babel-config": "^1.2.0", "@nextcloud/cypress": "^1.0.0-beta.8", @@ -173,6 +174,30 @@ "npm": "^10.7.0" } }, + "custom-npms/nc-mdi-js": { + "name": "@mdi/js", + "version": "7.4.47", + "license": "Apache-2.0", + "devDependencies": { + "@mdi/svg": "file:../nc-mdi-svg/dist", + "@mdi/util": "^0.3.2", + "typescript": "^5.6.3" + } + }, + "custom-npms/nc-mdi-js/node_modules/typescript": { + "version": "5.6.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz", + "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, "custom-npms/nc-mdi-svg/dist": { "name": "@mdi/svg", "version": "7.4.47", @@ -4432,15 +4457,20 @@ } }, "node_modules/@mdi/js": { - "version": "7.4.47", - "resolved": "https://registry.npmjs.org/@mdi/js/-/js-7.4.47.tgz", - "integrity": "sha512-KPnNOtm5i2pMabqZxpUz7iQf+mfrYZyKCZ8QNz85czgEt7cuHcGorWfdzUMWYA0SD+a6Hn4FmJ+YhzzzjkTZrQ==", - "license": "Apache-2.0" + "resolved": "custom-npms/nc-mdi-js", + "link": true }, "node_modules/@mdi/svg": { "resolved": "custom-npms/nc-mdi-svg/dist", "link": true }, + "node_modules/@mdi/util": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@mdi/util/-/util-0.3.2.tgz", + "integrity": "sha512-0ICbKIcsI+OYSqz6SWsYVJA6+kM+irQQiwYGBtJlq0a0sI0JrB2bCrc4S/xVfexqwa1EG8dlSY/ohsQllEXnyQ==", + "dev": true, + "license": "MIT" + }, "node_modules/@nextcloud/auth": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/@nextcloud/auth/-/auth-2.4.0.tgz", diff --git a/package.json b/package.json index be6fdd32f9051..360e7e930b139 100644 --- a/package.json +++ b/package.json @@ -194,7 +194,8 @@ "webpack-merge": "^6.0.1", "workbox-webpack-plugin": "^7.1.0", "vue-material-design-icons": "file:./custom-npms/nc-vue-material-design-icons/dist", - "@mdi/svg": "file:./custom-npms/nc-mdi-svg/dist" + "@mdi/svg": "file:./custom-npms/nc-mdi-svg/dist", + "@mdi/js": "file:./custom-npms/nc-mdi-js" }, "browserslist": [ "extends @nextcloud/browserslist-config" @@ -206,6 +207,7 @@ "overrides": { "colors": "1.4.0", "vue-material-design-icons" : "$vue-material-design-icons", - "@mdi/svg" : "$@mdi/svg" + "@mdi/svg" : "$@mdi/svg", + "@mdi/js" : "$@mdi/js" } }