Merge pull request #20095 from nextcloud/dep/old_js_pack

Remove legacy js packages
nextcloud · Mar 22, 2020 · c03c446 · c03c446
2 parents 3b92af9 + 939535f
commit c03c446
Show file tree

Hide file tree

Showing 16 changed files with 42 additions and 58 deletions.
diff --git a/apps/settings/js/vue-settings-apps-users-management.js b/apps/settings/js/vue-settings-apps-users-management.js
diff --git a/apps/settings/js/vue-settings-apps-users-management.js.map b/apps/settings/js/vue-settings-apps-users-management.js.map
diff --git a/apps/settings/js/vue-settings-personal-security.js b/apps/settings/js/vue-settings-personal-security.js
diff --git a/apps/settings/js/vue-settings-personal-security.js.map b/apps/settings/js/vue-settings-personal-security.js.map
diff --git a/apps/settings/src/components/AuthTokenSection.vue b/apps/settings/src/components/AuthTokenSection.vue
@@ -36,7 +36,7 @@
 
 <script>
 import axios from '@nextcloud/axios'
-import confirmPassword from 'nextcloud-password-confirmation'
+import confirmPassword from '@nextcloud/password-confirmation'
 
 import AuthTokenList from './AuthTokenList'
 import AuthTokenSetupDialogue from './AuthTokenSetupDialogue'

diff --git a/apps/settings/src/components/AuthTokenSetupDialogue.vue b/apps/settings/src/components/AuthTokenSetupDialogue.vue
@@ -78,7 +78,7 @@
 
 <script>
 import QR from '@chenfengyuan/vue-qrcode'
-import confirmPassword from 'nextcloud-password-confirmation'
+import confirmPassword from '@nextcloud/password-confirmation'
 
 export default {
 	name: 'AuthTokenSetupDialogue',

diff --git a/apps/settings/src/store/api.js b/apps/settings/src/store/api.js
@@ -21,7 +21,7 @@
  */
 
 import axios from '@nextcloud/axios'
-import confirmPassword from 'nextcloud-password-confirmation'
+import confirmPassword from '@nextcloud/password-confirmation'
 
 const sanitize = function(url) {
 	return url.replace(/\/$/, '') // Remove last url slash

diff --git a/apps/twofactor_backupcodes/js/settings.js b/apps/twofactor_backupcodes/js/settings.js
diff --git a/apps/twofactor_backupcodes/js/settings.js.map b/apps/twofactor_backupcodes/js/settings.js.map
diff --git a/apps/twofactor_backupcodes/src/views/PersonalSettings.vue b/apps/twofactor_backupcodes/src/views/PersonalSettings.vue
@@ -44,7 +44,7 @@
 </template>
 
 <script>
-import confirmPassword from 'nextcloud-password-confirmation'
+import confirmPassword from '@nextcloud/password-confirmation'
 import { print } from '../service/PrintService'
 
 export default {

diff --git a/apps/workflowengine/js/workflowengine.js b/apps/workflowengine/js/workflowengine.js
diff --git a/apps/workflowengine/js/workflowengine.js.map b/apps/workflowengine/js/workflowengine.js.map
diff --git a/apps/workflowengine/src/components/Checks/MultiselectTag/api.js b/apps/workflowengine/src/components/Checks/MultiselectTag/api.js
@@ -21,7 +21,7 @@
  */
 
 import axios from '@nextcloud/axios'
-import { generateRemoteUrl } from 'nextcloud-router'
+import { generateRemoteUrl } from '@nextcloud/router'
 
 const xmlToJson = (xml) => {
 	let obj = {}

diff --git a/apps/workflowengine/src/store.js b/apps/workflowengine/src/store.js
@@ -24,7 +24,7 @@ import Vue from 'vue'
 import Vuex from 'vuex'
 import axios from '@nextcloud/axios'
 import { getApiUrl } from './helpers/api'
-import confirmPassword from 'nextcloud-password-confirmation'
+import confirmPassword from '@nextcloud/password-confirmation'
 import { loadState } from '@nextcloud/initial-state'
 
 Vue.use(Vuex)

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -34,6 +34,7 @@
     "@nextcloud/initial-state": "^1.1.1",
     "@nextcloud/l10n": "^1.1.1",
     "@nextcloud/logger": "^1.1.1",
+    "@nextcloud/password-confirmation": "^1.0.0",
     "@nextcloud/paths": "^1.1.0",
     "@nextcloud/router": "^1.0.0",
     "@nextcloud/vue": "^1.4.1",
@@ -58,8 +59,6 @@
     "marked": "^0.8.1",
     "moment": "^2.24.0",
     "moment-timezone": "^0.5.28",
-    "nextcloud-password-confirmation": "^0.4.2",
-    "nextcloud-router": "0.0.9",
     "nextcloud-vue-collections": "^0.7.2",
     "p-limit": "^2.2.2",
     "p-queue": "^6.3.0",