feat(cli): PNPM support #15055 (#15198) + small cmd refactoring

cli/bin/quasar

@@ -22,15 +22,15 @@ let cmd = process.argv[2]
 
 if (cmd === 'create') {
   process.argv.splice(2, 1)
-  require(`./quasar-create`)
+  require(`../lib/cmd/create.js`)
 }
 else if (cmd === 'serve') {
   process.argv.splice(2, 1)
-  require(`./quasar-serve`)
+  require(`../lib/cmd/serve.js`)
 }
 else if (cmd === 'upgrade') {
   process.argv.splice(2, 1)
-  require(`./quasar-upgrade`)
+  require(`../lib/cmd/upgrade.js`)
 }
 else {
   const root = require('../lib/get-project-root')()
@@ -83,7 +83,7 @@ else {
 
         const { red } = require('kolorist')
 
-        require(`./quasar-help`)
+        require(`../lib/cmd/help.js`)
 
         console.log(`\n ${red(`Error`)} Unknown command "${ cmd }"`)
 
@@ -99,6 +99,6 @@ else {
       cmd = 'help'
     }
 
-    require(`./quasar-${cmd}`)
+    require(`../lib/cmd/${cmd}.js`)
   }
 }

cli/bin/quasar-create → cli/lib/cmd/create.js

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 
 const parseArgs = require('minimist')
 const { yellow } = require('kolorist')
@@ -51,12 +50,12 @@ if (argv.help) {
   process.exit(0)
 }
 
-require('../lib/ensure-outside-project')()
+require('../ensure-outside-project')()
 
 console.log()
 console.log(
   require('fs').readFileSync(
-    require('path').join(__dirname, '../assets/logo.art'),
+    require('path').join(__dirname, '../../assets/logo.art'),
     'utf8'
   )
 )
@@ -86,9 +85,9 @@ const tildify = require('tildify')
 const inquirer = require('inquirer')
 const rm = require('rimraf').sync
 
-const generate = require('../lib/generate')
-const logger = require('../lib/logger')
-const { isLocalPath, getTemplatePath } = require('../lib/local-path')
+const generate = require('../generate')
+const logger = require('../logger')
+const { isLocalPath, getTemplatePath } = require('../local-path')
 
 let template = argv.kit
   ? (

cli/bin/quasar-help → cli/lib/cmd/help.js

@@ -1,13 +1,12 @@
-#!/usr/bin/env node
 
 console.log()
 console.log(
   require('fs').readFileSync(
-    require('path').join(__dirname, '../assets/logo.art'),
+    require('path').join(__dirname, '../../assets/logo.art'),
     'utf8'
   )
 )
-console.log('  Running @quasar/cli v' + require('../package.json').version)
+console.log('  Running @quasar/cli v' + require('../../package.json').version)
 
 const { italic } = require('kolorist')
 

cli/bin/quasar-info → cli/lib/cmd/info.js

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 
 const parseArgs = require('minimist')
 const { green, red } = require('kolorist')
@@ -37,14 +36,14 @@ function getSpawnOutput (command) {
   }
 }
 
-const getExternalIPs = require('../lib/net').getExternalNetworkInterface
+const getExternalIPs = require('../net').getExternalNetworkInterface
 const output = [
   { key: 'Operating System', value: green(`${os.type()}(${os.release()}) - ${os.platform()}/${os.arch()}`), section: true },
   { key: 'NodeJs', value: green(process.version.slice(1)) },
   { key: 'Global packages', section: true },
   { key: '  NPM', value: getSpawnOutput('npm') },
   { key: '  yarn', value: getSpawnOutput('yarn') },
-  { key: '  @quasar/cli', value: green(require('../package.json').version) },
+  { key: '  @quasar/cli', value: green(require('../../package.json').version) },
   { key: '  @quasar/icongenie', value: getSpawnOutput('icongenie') },
   { key: '  cordova', value: getSpawnOutput('cordova') }
 ]

cli/bin/quasar-serve → cli/lib/cmd/serve.js

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 
 const parseArgs = require('minimist')
 
@@ -227,7 +226,7 @@ if (ssrDetected === false) {
 
   getServer(app).listen(argv.port, argv.hostname, () => {
     const url = `http${argv.https ? 's' : ''}://${getHostname(argv.hostname)}:${argv.port}`
-    const { version } = require('../package.json')
+    const { version } = require('../../package.json')
 
     const info = [
       ['Quasar CLI', `v${version}`],
@@ -248,7 +247,7 @@ if (ssrDetected === false) {
     console.log('\n' + info.join('\n') + '\n')
 
     if (argv.open) {
-      const isMinimalTerminal = require('../lib/is-minimal-terminal')
+      const isMinimalTerminal = require('../is-minimal-terminal')
       if (!isMinimalTerminal) {
         require('open')(url, { url: true })
       }
@@ -285,7 +284,7 @@ if (ssrDetected === false) {
     else {
       // Use a self-signed certificate if no certificate was configured.
       // Cycle certs every 24 hours
-      const certPath = path.join(__dirname, '../ssl-server.pem')
+      const certPath = path.join(__dirname, '../../ssl-server.pem')
       let certExists = fs.existsSync(certPath)
 
       if (certExists) {

cli/bin/quasar-upgrade → cli/lib/cmd/upgrade.js

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 
 const parseArgs = require('minimist')
 
@@ -53,15 +52,15 @@ const path = require('path')
 const execSync = require('child_process').execSync
 const { green, red } = require('kolorist')
 
-const root = require('../lib/get-project-root')()
-const { log, fatal } = require('../lib/logger')
+const root = require('../get-project-root')()
+const { log, fatal } = require('../logger')
 
 if (!root) {
   fatal(`⚠️  Error. This command must be executed inside a Quasar project folder only.`)
 }
 
 if (!fs.existsSync(path.join(root, 'node_modules'))) {
-  fatal('⚠️  Please run "yarn" / "npm install" first\n')
+  fatal('⚠️  Please run "yarn" / "npm install" / "pnpm install" first\n')
 }
 
 const pkg = require(path.join(root, 'package.json'))
@@ -114,8 +113,8 @@ function upgradeQuasar () {
     devDependencies: []
   }
 
-  const packager = require('../lib/node-packager')(root)
-  const getPackageJson = require('../lib/get-package-json')(root)
+  const packager = require('../node-packager')(root)
+  const getPackageJson = require('../get-package-json')(root)
 
   console.log()
   log(`Gathering information with ${packager}...`)
@@ -185,7 +184,7 @@ function upgradeQuasar () {
   }
 
   const { removeSync } = require('fs-extra')
-  const spawn = require('../lib/spawn')
+  const spawn = require('../spawn')
 
   if (removeDeprecatedAppPkg === true) {
     const params = packager === 'yarn'
@@ -227,7 +226,11 @@ function upgradeQuasar () {
 
     const params = packager === 'yarn'
       ? (type === 'devDependencies' ? [ 'add', '--dev' ] : [ 'add' ])
-      : [ `install`, `--save${type === 'devDependencies' ? '-dev' : ''}` ]
+      : (
+        packager === 'pnpm'
+          ? [ 'install' ]
+          : `--save${type === 'devDependencies' ? '-dev' : ''}` // npm
+      )
 
     deps[type].forEach(dep => {
       // need to delete tha package otherwise