@startupjs/cli 0.54.3 → 0.54.7

package/corepack.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+
+# Fail script on first failed command
+set -e
+
+# function to compare version numbers
+function version_greater_or_equal() {
+   [ "$1" == "`echo -e "$1\n$2" | sort -V | tail -n1`" ]
+}
+
+function main () {
+  # check if 'corepack' exists
+  if ! command -v corepack &> /dev/null
+  then
+      echo "corepack could not be found"
+
+      read -p "Do you want to install it? (Y/n) " answer
+      case ${answer:0:1} in
+          y|Y )
+              npm i -g corepack@latest
+          ;;
+          * )
+              echo "Aborting the script as per your request."
+              exit 1
+          ;;
+      esac
+  fi
+
+  # check if the version is >=0.20.0
+  version=$(corepack --version)
+  required_version="0.20.0"
+
+  if version_greater_or_equal $required_version $version; then
+      echo "corepack version is less than ${required_version}"
+
+      read -p "Would you like to update it now? (Y/n) " answer
+      case ${answer:0:1} in
+          y|Y )
+              npm i -g corepack@latest
+          ;;
+          * )
+              echo "Aborting the script as per your request."
+              exit 1
+          ;;
+      esac
+  fi
+
+  # do 'corepack enable'
+  corepack enable
+
+  # do 'corepack use yarn@4'
+  corepack use yarn@"$1"
+}
+
+main "$@"; exit

package/index.js

@@ -335,7 +335,7 @@ const SCRIPTS = {
 }
 
 const DEFAULT_TEMPLATE = 'ui'
-const DEFAULT_YARN_VERSION = '4.0.1'
+const DEFAULT_YARN_VERSION = '4'
 const TEMPLATES = {
   simple: {
     subTemplates: ['simple']
@@ -381,6 +381,16 @@ commander
   .action(async (projectName, { reactNative, template, yarn }) => {
     console.log('> run npx', projectName, { reactNative, template, yarn })
 
+    // setup corepack
+    try {
+      await execa.command(
+        `${path.join(__dirname, 'corepack.sh')} ${yarn}`,
+        { shell: true }
+      )
+    } catch (e) {
+      console.error(e.stderr)
+    }
+
     const projectPath = path.join(process.cwd(), LOCAL_DIR, projectName)
 
     // check if template exists
@@ -414,19 +424,10 @@ commander
       })
     }
 
-    // specify yarn version
-    await execa('yarn', ['set', 'version', yarn], {
-      cwd: projectPath,
-      stdio: 'inherit'
-    })
     await execa('yarn', ['config', 'set', 'nodeLinker', 'node-modules'], {
       cwd: projectPath,
       stdio: 'inherit'
     })
-    await execa('yarn', ['config', 'set', 'enableGlobalCache', false], {
-      cwd: projectPath,
-      stdio: 'inherit'
-    })
 
     // remove extra dependencies which are covered by startupjs core
     if (REMOVE_DEPENDENCIES.length) {
@@ -746,9 +747,7 @@ function appendGitignore (projectPath) {
     # Mongo data when running in a docker dev container
     /.mongo
     # yarn
-    .yarn/*
-    !.yarn/releases
-    !.yarn/cache
+    .yarn/
   `.replace(/\n\s+/g, '\n')
 
   fs.writeFileSync(gitignorePath, gitignore)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@startupjs/cli",
-  "version": "0.54.3",
+  "version": "0.54.7",
   "description": "start, watch and build startupjs project",
   "main": "index.js",
   "license": "MIT",
@@ -25,5 +25,5 @@
     "webpack-cli": "^4.9.1",
     "webpack-dev-server": "^4.4.0"
   },
-  "gitHead": "208b1eb50e749d344be1c24d446ab0fceea4b33b"
+  "gitHead": "7482d5c9d3b425fdd75a511a338c485ffbefb9da"
 }