From 68bb7353bab12487689d71ebe59e43c58b77f9af Mon Sep 17 00:00:00 2001 From: laiweizhen Date: Tue, 1 Jun 2021 17:31:29 +0800 Subject: [PATCH] File path processing first --- packages/create-react-app/createReactApp.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/create-react-app/createReactApp.js b/packages/create-react-app/createReactApp.js index f8b7443987d..fab5678b8a8 100755 --- a/packages/create-react-app/createReactApp.js +++ b/packages/create-react-app/createReactApp.js @@ -751,12 +751,6 @@ function getPackageInfo(installPackage) { return Promise.resolve({ name: installPackage.match(/([^/]+)\.git(#.*)?$/)[1], }); - } else if (installPackage.match(/.+@/)) { - // Do not match @scope/ when stripping off @version or @tag - return Promise.resolve({ - name: installPackage.charAt(0) + installPackage.substr(1).split('@')[0], - version: installPackage.split('@')[1], - }); } else if (installPackage.match(/^file:/)) { const installPackagePath = installPackage.match(/^file:(.*)?$/)[1]; const { name, version } = require(path.join( @@ -764,6 +758,12 @@ function getPackageInfo(installPackage) { 'package.json' )); return Promise.resolve({ name, version }); + } else if (installPackage.match(/.+@/)) { + // Do not match @scope/ when stripping off @version or @tag + return Promise.resolve({ + name: installPackage.charAt(0) + installPackage.substr(1).split('@')[0], + version: installPackage.split('@')[1], + }); } return Promise.resolve({ name: installPackage }); }