From 9540b47d796dc87c9cc739b8bd171c9506fdd068 Mon Sep 17 00:00:00 2001 From: Romain Date: Thu, 16 Apr 2020 13:40:21 +0200 Subject: [PATCH 1/2] Update ProjectPackageManager.js upgrade method: manage multiple package names separated by spaces --- .../cli/lib/util/ProjectPackageManager.js | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/packages/@vue/cli/lib/util/ProjectPackageManager.js b/packages/@vue/cli/lib/util/ProjectPackageManager.js index 2c1ab10a8d..f7dbe2076d 100644 --- a/packages/@vue/cli/lib/util/ProjectPackageManager.js +++ b/packages/@vue/cli/lib/util/ProjectPackageManager.js @@ -290,20 +290,25 @@ class PackageManager { } async upgrade (packageName) { - const realname = stripVersion(packageName) - if ( - isTestOrDebug && - (packageName === '@vue/cli-service' || isOfficialPlugin(resolvePluginId(realname))) - ) { - // link packages in current repo for test - const src = path.resolve(__dirname, `../../../../${realname}`) - const dest = path.join(this.context, 'node_modules', realname) - await fs.remove(dest) - await fs.symlink(src, dest, 'dir') - return + // manage multiple packages separated by spaces + const packageNamesArray = []; + + for (const packname of packageName.split(" ")) { + const realname = stripVersion(packname) + if ( + isTestOrDebug && + (packname === '@vue/cli-service' || isOfficialPlugin(resolvePluginId(realname))) + ) { + // link packages in current repo for test + const src = path.resolve(__dirname, `../../../../${realname}`) + const dest = path.join(this.context, 'node_modules', realname) + await fs.remove(dest) + await fs.symlink(src, dest, 'dir') + } + else packageNamesArray.push(packname) } - return await this.runCommand('add', [packageName]) + if(packageNamesArray.length) return await this.runCommand('add', packageNamesArray) } } From e961b880a9eec6cb720d9c51fb649f46f7a08909 Mon Sep 17 00:00:00 2001 From: Romain Date: Sat, 18 Apr 2020 15:14:49 +0200 Subject: [PATCH 2/2] Code reformatting for CI --- packages/@vue/cli/lib/util/ProjectPackageManager.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/@vue/cli/lib/util/ProjectPackageManager.js b/packages/@vue/cli/lib/util/ProjectPackageManager.js index f7dbe2076d..73cd6d5c6e 100644 --- a/packages/@vue/cli/lib/util/ProjectPackageManager.js +++ b/packages/@vue/cli/lib/util/ProjectPackageManager.js @@ -291,9 +291,9 @@ class PackageManager { async upgrade (packageName) { // manage multiple packages separated by spaces - const packageNamesArray = []; + const packageNamesArray = [] - for (const packname of packageName.split(" ")) { + for (const packname of packageName.split(' ')) { const realname = stripVersion(packname) if ( isTestOrDebug && @@ -304,11 +304,12 @@ class PackageManager { const dest = path.join(this.context, 'node_modules', realname) await fs.remove(dest) await fs.symlink(src, dest, 'dir') + } else { + packageNamesArray.push(packname) } - else packageNamesArray.push(packname) } - if(packageNamesArray.length) return await this.runCommand('add', packageNamesArray) + if (packageNamesArray.length) return await this.runCommand('add', packageNamesArray) } }