Merge pull request #27185 from nextcloud/dependabot/npm_and_yarn/master/node-sass-replace

Replace node-sass with sass & bump css-loader
2021-05-28 08:51:50 +02:00 · 2021-05-28 08:51:50 +02:00 · 11900c741e
parent 7668d3afcd 83ebcf2a7a
commit 11900c741e
70 changed files with 261 additions and 804 deletions
--- a/apps/comments/js/comments-app.js
+++ b/apps/comments/js/comments-app.js
--- a/apps/comments/js/comments-app.js.map
+++ b/apps/comments/js/comments-app.js.map
--- a/apps/dashboard/js/dashboard.js
+++ b/apps/dashboard/js/dashboard.js
--- a/apps/dashboard/js/dashboard.js.map
+++ b/apps/dashboard/js/dashboard.js.map
--- a/apps/files/js/dist/personal-settings.js
+++ b/apps/files/js/dist/personal-settings.js
--- a/apps/files/js/dist/personal-settings.js.map
+++ b/apps/files/js/dist/personal-settings.js.map
--- a/apps/files/js/dist/sidebar.js
+++ b/apps/files/js/dist/sidebar.js
--- a/apps/files/js/dist/sidebar.js.map
+++ b/apps/files/js/dist/sidebar.js.map
--- a/apps/files/js/dist/templates.js
+++ b/apps/files/js/dist/templates.js
--- a/apps/files/js/dist/templates.js.map
+++ b/apps/files/js/dist/templates.js.map
--- a/apps/files/src/views/TemplatePicker.vue
+++ b/apps/files/src/views/TemplatePicker.vue
@ -274,7 +274,7 @@ export default {
 	}

 	// Make sure we're relative for the loading emptycontent on top
-	/deep/ .modal-container {
+	::v-deep .modal-container {
 		position: relative;
 		overflow-y: auto !important;
 	}
--- a/apps/files_sharing/js/dist/additionalScripts.js
+++ b/apps/files_sharing/js/dist/additionalScripts.js
--- a/apps/files_sharing/js/dist/additionalScripts.js.map
+++ b/apps/files_sharing/js/dist/additionalScripts.js.map
--- a/apps/files_sharing/js/dist/files_sharing_tab.js
+++ b/apps/files_sharing/js/dist/files_sharing_tab.js
--- a/apps/files_sharing/js/dist/files_sharing_tab.js.map
+++ b/apps/files_sharing/js/dist/files_sharing_tab.js.map
--- a/apps/files_trashbin/js/files_trashbin.js
+++ b/apps/files_trashbin/js/files_trashbin.js
--- a/apps/files_trashbin/js/files_trashbin.js.map
+++ b/apps/files_trashbin/js/files_trashbin.js.map
--- a/apps/files_versions/js/files_versions.js
+++ b/apps/files_versions/js/files_versions.js
--- a/apps/files_versions/js/files_versions.js.map
+++ b/apps/files_versions/js/files_versions.js.map
--- a/apps/oauth2/js/oauth2.js
+++ b/apps/oauth2/js/oauth2.js
--- a/apps/oauth2/js/oauth2.js.map
+++ b/apps/oauth2/js/oauth2.js.map
--- a/apps/settings/js/vue-settings-admin-security.js
+++ b/apps/settings/js/vue-settings-admin-security.js
--- a/apps/settings/js/vue-settings-admin-security.js.map
+++ b/apps/settings/js/vue-settings-admin-security.js.map
--- a/apps/settings/js/vue-settings-apps-223abad42415f2a14ff7.js
+++ b/apps/settings/js/vue-settings-apps-223abad42415f2a14ff7.js
--- a/apps/settings/js/vue-settings-apps-223abad42415f2a14ff7.js.map
+++ b/apps/settings/js/vue-settings-apps-223abad42415f2a14ff7.js.map
--- a/apps/settings/js/vue-settings-apps-f74180e89663e17e4d00.js
+++ b/apps/settings/js/vue-settings-apps-f74180e89663e17e4d00.js
--- a/apps/settings/js/vue-settings-apps-f74180e89663e17e4d00.js.map
+++ b/apps/settings/js/vue-settings-apps-f74180e89663e17e4d00.js.map
--- a/apps/settings/js/vue-settings-apps-users-management.js
+++ b/apps/settings/js/vue-settings-apps-users-management.js
--- a/apps/settings/js/vue-settings-apps-users-management.js.map
+++ b/apps/settings/js/vue-settings-apps-users-management.js.map
--- a/apps/settings/js/vue-settings-personal-security.js
+++ b/apps/settings/js/vue-settings-personal-security.js
--- a/apps/settings/js/vue-settings-personal-security.js.map
+++ b/apps/settings/js/vue-settings-personal-security.js.map
--- a/apps/settings/js/vue-settings-personal-webauthn.js
+++ b/apps/settings/js/vue-settings-personal-webauthn.js
--- a/apps/settings/js/vue-settings-personal-webauthn.js.map
+++ b/apps/settings/js/vue-settings-personal-webauthn.js.map
--- a/apps/settings/js/vue-settings-users-1cea17c532aa8b60d75e.js
+++ b/apps/settings/js/vue-settings-users-1cea17c532aa8b60d75e.js
--- a/apps/settings/js/vue-settings-users-1cea17c532aa8b60d75e.js.map
+++ b/apps/settings/js/vue-settings-users-1cea17c532aa8b60d75e.js.map
--- a/apps/settings/js/vue-settings-users-c19dd249aea12a7f1df7.js
+++ b/apps/settings/js/vue-settings-users-c19dd249aea12a7f1df7.js
--- a/apps/settings/js/vue-settings-users-c19dd249aea12a7f1df7.js.map
+++ b/apps/settings/js/vue-settings-users-c19dd249aea12a7f1df7.js.map
--- a/apps/settings/js/vue-vendors-settings-apps-settings-users-8a46227bb6c532a39fb9.js.map
+++ b/apps/settings/js/vue-vendors-settings-apps-settings-users-8a46227bb6c532a39fb9.js.map
--- a/apps/settings/js/vue-vendors-settings-apps-settings-users-a83a008fa896e5732f9d.js
+++ b/apps/settings/js/vue-vendors-settings-apps-settings-users-a83a008fa896e5732f9d.js
--- a/apps/settings/js/vue-vendors-settings-apps-settings-users-a83a008fa896e5732f9d.js.map
+++ b/apps/settings/js/vue-vendors-settings-apps-settings-users-a83a008fa896e5732f9d.js.map
--- a/apps/systemtags/js/systemtags.js
+++ b/apps/systemtags/js/systemtags.js
--- a/apps/systemtags/js/systemtags.js.map
+++ b/apps/systemtags/js/systemtags.js.map
--- a/apps/twofactor_backupcodes/js/settings.js
+++ b/apps/twofactor_backupcodes/js/settings.js
--- a/apps/twofactor_backupcodes/js/settings.js.map
+++ b/apps/twofactor_backupcodes/js/settings.js.map
--- a/apps/updatenotification/js/updatenotification.js
+++ b/apps/updatenotification/js/updatenotification.js
--- a/apps/updatenotification/js/updatenotification.js.map
+++ b/apps/updatenotification/js/updatenotification.js.map
--- a/apps/user_status/js/dashboard.js
+++ b/apps/user_status/js/dashboard.js
--- a/apps/user_status/js/dashboard.js.map
+++ b/apps/user_status/js/dashboard.js.map
--- a/apps/user_status/js/user-status-menu.js
+++ b/apps/user_status/js/user-status-menu.js
--- a/apps/user_status/js/user-status-menu.js.map
+++ b/apps/user_status/js/user-status-menu.js.map
--- a/apps/user_status/js/user-status-modal.js
+++ b/apps/user_status/js/user-status-modal.js
--- a/apps/user_status/js/user-status-modal.js.map
+++ b/apps/user_status/js/user-status-modal.js.map
--- a/apps/weather_status/js/weather-status.js
+++ b/apps/weather_status/js/weather-status.js
--- a/apps/weather_status/js/weather-status.js.map
+++ b/apps/weather_status/js/weather-status.js.map
--- a/apps/workflowengine/js/workflowengine.js
+++ b/apps/workflowengine/js/workflowengine.js
--- a/apps/workflowengine/js/workflowengine.js.map
+++ b/apps/workflowengine/js/workflowengine.js.map
--- a/core/js/dist/install.js
+++ b/core/js/dist/install.js
--- a/core/js/dist/install.js.map
+++ b/core/js/dist/install.js.map
--- a/core/js/dist/login.js
+++ b/core/js/dist/login.js
--- a/core/js/dist/login.js.map
+++ b/core/js/dist/login.js.map
--- a/core/js/dist/main.js
+++ b/core/js/dist/main.js
--- a/core/js/dist/main.js.map
+++ b/core/js/dist/main.js.map
--- a/core/js/dist/recommendedapps.js
+++ b/core/js/dist/recommendedapps.js
--- a/core/js/dist/recommendedapps.js.map
+++ b/core/js/dist/recommendedapps.js.map
--- a/core/js/dist/systemtags.js
+++ b/core/js/dist/systemtags.js
--- a/core/js/dist/systemtags.js.map
+++ b/core/js/dist/systemtags.js.map
--- a/core/js/dist/unified-search.js
+++ b/core/js/dist/unified-search.js
--- a/core/js/dist/unified-search.js.map
+++ b/core/js/dist/unified-search.js.map
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -101,7 +101,7 @@
    "babel-loader": "^8.2.2",
    "babel-loader-exclude-node-modules-except": "^1.1.2",
    "chai": "^4.3.4",
-    "css-loader": "^5.2.0",
+    "css-loader": "^5.2.6",
    "eslint": "^6.8.0",
    "eslint-config-standard": "^14.1.1",
    "eslint-loader": "^4.0.2",
@ -117,7 +117,7 @@
    "jsdom-global": "^3.0.2",
    "mocha": "^8.3.2",
    "mochapack": "^2.0.6",
-    "node-sass": "^5.0.0",
+    "sass": "^1.34.0",
    "sass-loader": "^10.1.1",
    "sinon": "^9.2.4",
    "sinon-chai": "^3.6.0",