@jcoreio/toolchain 5.0.0 → 5.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcoreio/toolchain",
-  "version": "5.0.0",
+  "version": "5.0.2",
   "description": "base JS build toolchain",
   "repository": {
     "type": "git",

package/scripts/upgrade.cjs

@@ -6,8 +6,10 @@ const {
   monorepoSubpackageJsons,
 } = require('../util/findUps.cjs')
 const execa = require('../util/execa.cjs')
+const confirm = require('../util/confirm.cjs')
+const semver = require('semver')
 const writeMigratedVersion = require('../util/writeMigratedVersion.cjs')
-const { name } = require('../package.json')
+const { name, version: currentVersion } = require('../package.json')
 
 async function upgrade([version] = []) {
   const toolchains = [
@@ -17,8 +19,10 @@ async function upgrade([version] = []) {
         .filter((pkg) => pkg.startsWith(`${name}-`))
     ),
   ]
-  if (!packageJson[name] || !packageJson[name].migratedVersion) {
+  let migratedVersion = packageJson[name] && packageJson[name].migratedVersion
+  if (!migratedVersion) {
     await writeMigratedVersion()
+    migratedVersion = currentVersion
   }
   const isTest = Boolean(process.env.JCOREIO_TOOLCHAIN_SELF_TEST)
 
@@ -28,6 +32,19 @@ async function upgrade([version] = []) {
         stdio: 'pipe',
       })
     ).stdout.trim()
+    if (
+      semver.major(version) > semver.major(migratedVersion) &&
+      !(await confirm({
+        message: 'Do you want to upgrade to a newer major version?',
+        initial: true,
+      }))
+    ) {
+      version = (
+        await execa('npm', ['view', `${name}@^${migratedVersion}`, 'version'], {
+          stdio: 'pipe',
+        })
+      ).stdout.trim()
+    }
   }
 
   await execa(

package/util/findUps.cjs

@@ -7,10 +7,11 @@ const once = require('./once.cjs')
 const { name } = require('../package.json')
 const configSchema = require('./configSchema.cjs')
 
-let cwd = process.cwd()
-
-const nodeModulesMatch = /\/node_modules(\/|$)/.exec(cwd)
-if (nodeModulesMatch) cwd = cwd.substring(0, nodeModulesMatch.index)
+const cwd = (
+  fs.pathExistsSync(Path.join(process.cwd(), 'package.json'))
+    ? process.cwd()
+    : __filename
+).replace(/\/node_modules(\/.*|$)/, '')
 
 const packageJsonFile = (exports.packageJsonFile = findUp.sync('package.json', {
   cwd,
@@ -90,14 +91,28 @@ const toolchainPackages = (exports.toolchainPackages = [
   ...Object.keys(packageJson.devDependencies || {}),
 ].filter((dep) => dep.startsWith(name)))
 
+const isToolchainDev = Path.normalize(__dirname)
+  .replace(/\\/, '/')
+  .endsWith('packages/base/util')
+
 const toolchainPackageJsons = (exports.toolchainPackageJsons = {})
 for (const pkg of toolchainPackages) {
   toolchainPackageJsons[pkg] =
     pkg === packageJson.name
       ? packageJson
-      : require(require.resolve(`${pkg}/package.json`, {
-          paths: [projectDir],
-        }))
+      : require(isToolchainDev
+          ? Path.resolve(
+              __dirname,
+              '..',
+              '..',
+              pkg === '@jcoreio/toolchain'
+                ? 'base'
+                : pkg.replace('@jcoreio/toolchain-', ''),
+              'package.json'
+            )
+          : require.resolve(`${pkg}/package.json`, {
+              paths: [projectDir],
+            }))
 }
 
 let toolchainConfigFile