@jcoreio/toolchain 4.1.0 → 4.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcoreio/toolchain",
-  "version": "4.1.0",
+  "version": "4.3.0",
   "description": "base JS build toolchain",
   "repository": {
     "type": "git",
@@ -12,7 +12,7 @@
   "bugs": {
     "url": "https://github.com/jcoreio/toolchains/issues"
   },
-  "homepage": "https://github.com/jcoreio/toolchains/tree/beta/packages/base",
+  "homepage": "https://github.com/jcoreio/toolchains/tree/main/packages/base",
   "dependencies": {
     "@jcoreio/eslint-plugin-implicit-dependencies": "^1.1.1",
     "chalk": "^4.0.0",

package/plugins/getConfigFiles.cjs

@@ -2,6 +2,7 @@ const { name } = require('../package.json')
 const dedent = require('dedent-js')
 const fs = require('../util/projectFs.cjs')
 const JSON5 = require('json5')
+const { isMonorepoSubpackage } = require('../util/findUps.cjs')
 const getPluginsArraySync = require('../util/getPluginsArraySync.cjs')
 
 async function getRootEslintConfig() {
@@ -17,6 +18,9 @@ module.exports = [
   async function getConfigFiles() {
     const { env, rules } = (await getRootEslintConfig()) || {}
     const files = {
+      '.npmrc': dedent`
+        optional=false
+      `,
       '.eslintrc.cjs': (prev) =>
         prev
           ? prev.replace(
@@ -60,7 +64,7 @@ module.exports = [
       },
     }
     for (const file of [
-      'githooks.cjs',
+      ...(isMonorepoSubpackage ? [] : ['githooks.cjs']),
       'lint-staged.config.cjs',
       'prettier.config.cjs',
     ]) {

package/scripts/create.cjs

@@ -1,25 +1,41 @@
 const path = require('path')
 const execa = require('../util/execa.cjs')
 const ChdirFs = require('../util/ChdirFs.cjs')
-const pkgName = require('../package.json').name
+const pkg = require('../package.json')
 const dedent = require('dedent-js')
+const parseRepositoryUrl = require('../util/parseRepositoryUrl.cjs')
 
 async function create(args = []) {
   const prompt = require('prompts')
 
+  let monorepoPackageJson, monorepoProjectDir
+  try {
+    ;({
+      monorepoPackageJson,
+      monorepoProjectDir,
+    } = require('../util/findUps.cjs'))
+  } catch (error) {
+    if (!error.message.startsWith('failed to find project package.json')) {
+      throw error
+    }
+  }
+
   const required = (s) => Boolean(s) || 'required'
 
   let defaultAuthor
-  try {
-    defaultAuthor = (
-      await execa('git', ['config', 'user.name'], {
-        stdio: 'pipe',
-        maxBuffer: 1024,
-        encoding: 'utf8',
-      })
-    ).stdout.trim()
-  } catch (error) {
-    // ignore
+  if (monorepoPackageJson) defaultAuthor = monorepoPackageJson.author
+  else {
+    try {
+      defaultAuthor = (
+        await execa('git', ['config', 'user.name'], {
+          stdio: 'pipe',
+          maxBuffer: 1024,
+          encoding: 'utf8',
+        })
+      ).stdout.trim()
+    } catch (error) {
+      // ignore
+    }
   }
 
   const questions = [
@@ -53,25 +69,29 @@ async function create(args = []) {
       type: 'text',
       name: 'keywords',
       message: 'Package keywords:',
-      format: (text) => text.split(/\s*,\s*|\s+/g),
-    },
-    {
-      type: 'text',
-      name: 'organization',
-      initial: (prev, { name }) => {
-        const match = /^@(.*?)\//.exec(name)
-        if (match) return match[1]
-      },
-      message: 'GitHub organization:',
-      validate: required,
-    },
-    {
-      type: 'text',
-      name: 'repo',
-      message: 'GitHub repo:',
-      initial: (prev, { name }) => name.replace(/^@(.*?)\//, ''),
-      validate: required,
+      format: (text) => (text || '').split(/\s*,\s*|\s+/g),
     },
+    ...(monorepoPackageJson
+      ? []
+      : [
+          {
+            type: 'text',
+            name: 'organization',
+            initial: (prev, { name }) => {
+              const match = /^@(.*?)\//.exec(name)
+              if (match) return match[1]
+            },
+            message: 'GitHub organization:',
+            validate: required,
+          },
+          {
+            type: 'text',
+            name: 'repo',
+            message: 'GitHub repo:',
+            initial: (prev, { name }) => name.replace(/^@(.*?)\//, ''),
+            validate: required,
+          },
+        ]),
     {
       type: 'select',
       name: 'license',
@@ -116,26 +136,45 @@ async function create(args = []) {
     keywords,
     license,
     copyrightHolder,
-    organization,
-    repo,
   } = answers
 
+  const { organization, repo } = monorepoPackageJson
+    ? parseRepositoryUrl(monorepoPackageJson.repository.url)
+    : answers
+
   const cwd = path.resolve(directory)
 
   await require('fs-extra').mkdirs(path.join(cwd, 'src'))
 
   const fs = ChdirFs(cwd)
 
+  const subpackagePath = monorepoProjectDir
+    ? path.relative(monorepoProjectDir, cwd)
+    : undefined
+
+  const branch = subpackagePath
+    ? (
+        await execa('git', ['rev-parse', '--abbrev-ref', 'HEAD'], {
+          stdio: 'pipe',
+          encoding: 'utf8',
+          maxBuffer: 1024,
+        })
+      ).stdout.trim()
+    : ''
+
   const packageJson = {
     name,
     description,
     repository: {
       type: 'git',
       url: `https://github.com/${organization}/${repo}.git`,
+      ...(subpackagePath ? { directory: subpackagePath } : {}),
     },
-    homepage: `https://github.com/${organization}/${repo}`,
+    homepage: `https://github.com/${organization}/${repo}${
+      subpackagePath ? `/tree/${branch}/${subpackagePath}` : ''
+    }`,
     bugs: {
-      url: `https://github.com/${organization}/${repo}`,
+      url: `https://github.com/${organization}/${repo}/issues`,
     },
     author,
     license,
@@ -173,21 +212,41 @@ async function create(args = []) {
     })
   )
 
-  await execa('git', ['init'], { cwd })
-  await execa('git', ['remote', 'add', 'origin', packageJson.repository.url], {
-    cwd,
-  })
+  if (!monorepoPackageJson) {
+    await execa('git', ['init'], { cwd })
+    await execa(
+      'git',
+      ['remote', 'add', 'origin', packageJson.repository.url],
+      {
+        cwd,
+      }
+    )
+  }
+
+  const isTest = Boolean(process.env.JCOREIO_TOOLCHAIN_SELF_TEST)
+
   await execa(
     'pnpm',
-    ['add', '-D', '--prefer-offline', '--no-optional', pkgName],
+    [
+      'add',
+      '-D',
+      '--prefer-offline',
+      `${pkg.name}@${isTest ? 'workspace:*' : pkg.version}`,
+    ],
     { cwd }
   )
   await execa('pnpm', ['exec', 'tc', 'init'], { cwd })
 
-  await execa('git', ['add', '.'], { cwd })
-  await execa('git', ['commit', '-m', 'chore: initial commit from tc create'], {
-    cwd,
-  })
+  if (!monorepoPackageJson) {
+    await execa('git', ['add', '.'], { cwd })
+    await execa(
+      'git',
+      ['commit', '-m', 'chore: initial commit from tc create'],
+      {
+        cwd,
+      }
+    )
+  }
 }
 
 exports.description = 'create a new toolchain project'

package/scripts/init.cjs

@@ -47,6 +47,7 @@ async function init(args = []) {
         'react',
         'circle',
         'semantic-release',
+        'aws-lambda',
       ].map((value) => ({
         title: `${name}-${value}`,
         value: `${name}-${value}`,
@@ -69,7 +70,6 @@ async function init(args = []) {
   await execa('pnpm', [
     'add',
     '-D',
-    '--no-optional',
     '--prefer-offline',
     ...(isMonorepoRoot ? ['-w'] : []),
     isTest ? '../packages/base' : `${name}@^${version}`,

package/scripts/migrate.cjs

@@ -34,7 +34,6 @@ async function migrate(args = []) {
   if (!args.includes('--config-only')) {
     await execa('pnpm', [
       'i',
-      '--no-optional',
       '--prefer-offline',
       '--fix-lockfile',
       ...(isMonorepoRoot ? ['-w'] : []),

package/scripts/prepublish.cjs

@@ -1,12 +1,17 @@
 const execa = require('../util/execa.cjs')
+const { isMonorepoRoot, packageJson } = require('../util/findUps.cjs')
 
 exports.run = async function (args = []) {
-  const { scripts } = require('./toolchain.cjs')
-  await execa('tc', ['check'])
-  if (scripts.coverage) await execa('tc', ['coverage'])
-  if (scripts['test:esm']) await execa('tc', ['test:esm'])
-  await execa('tc', ['build'])
-  await execa('tc', ['build:smoke-test'])
+  if (isMonorepoRoot && packageJson.name !== '@jcoreio/toolchains') {
+    await execa('pnpm', ['run', '-r', 'prepublish'])
+  } else {
+    const { scripts } = require('./toolchain.cjs')
+    await execa('tc', ['check'])
+    if (scripts.coverage) await execa('tc', ['coverage'])
+    if (scripts['test:esm']) await execa('tc', ['test:esm'])
+    await execa('tc', ['build'])
+    await execa('tc', ['build:smoke-test'])
+  }
 }
 
 exports.description = 'run check, coverage, and build'

package/scripts/toolchain.cjs

@@ -5,9 +5,9 @@ const chalk = require('chalk')
 const getPluginsObjectSync = require('../util/getPluginsObjectSync.cjs')
 const execa = require('../util/execa.cjs')
 
-let toolchainConfig
+let toolchainConfig, isMonorepoRoot
 try {
-  ;({ toolchainConfig } = require('../util/findUps.cjs'))
+  ;({ toolchainConfig, isMonorepoRoot } = require('../util/findUps.cjs'))
 } catch (error) {
   if (!error.message.startsWith('failed to find project package.json')) {
     throw error
@@ -36,6 +36,7 @@ const scripts = toolchainConfig
         },
       },
       'install-git-hooks': require('./install-git-hooks.cjs'),
+      ...(isMonorepoRoot ? { create: require('./create.cjs') } : {}),
       ...getPluginsObjectSync('scripts'),
       ...Object.fromEntries(
         Object.entries(toolchainConfig.scripts || {}).map(([name, script]) => [

package/scripts/upgrade.cjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-const { packageJson, isMonorepoRoot } = require('../util/findUps.cjs')
+const { packageJson, monorepoProjectDir } = require('../util/findUps.cjs')
 const execa = require('../util/execa.cjs')
 const { name } = require('../package.json')
 
@@ -19,18 +19,27 @@ async function upgrade([version] = []) {
     ).stdout.trim()
   }
 
-  await execa('pnpm', [
-    'add',
-    '-D',
-    '--no-optional',
-    '--prefer-offline',
-    ...(isMonorepoRoot ? ['-w'] : []),
-    isTest ? '../packages/base' : `${name}@^${version}`,
-    ...(isTest
-      ? toolchains.map((t) => t.replace(`${name}-`, '../packages/'))
-      : toolchains.map((t) => `${t}@^${version}`)),
-  ])
-  await execa('tc', ['migrate'])
+  await execa(
+    'pnpm',
+    isTest
+      ? [
+          ...(monorepoProjectDir ? ['-r'] : []),
+          'add',
+          '-D',
+          '--prefer-offline',
+          '../packages/base',
+          ...toolchains.map((t) => t.replace(`${name}-`, '../packages/')),
+        ]
+      : [
+          ...(monorepoProjectDir ? ['-r'] : []),
+          'update',
+          '--prefer-offline',
+          `${name}@^${version}`,
+          toolchains.map((t) => `${t}@^${version}`),
+        ]
+  )
+  if (monorepoProjectDir) await execa('pnpm', ['-r', 'run', 'tc', 'migrate'])
+  else await execa('tc', ['migrate'])
 }
 
 exports.description = 'upgrade toolchains and migrate'

package/util/ChdirFs.cjs

@@ -10,6 +10,10 @@ function ChdirFs(cwd) {
     emptyDir: (path, ...args) => fs.emptyDir(resolve(cwd, path), ...args),
     emptyDirSync: (path, ...args) =>
       fs.emptyDirSync(resolve(cwd, path), ...args),
+    ensureSymlink: (src, dest, ...args) =>
+      fs.ensureSymlink(resolve(cwd, src), resolve(cwd, dest), ...args),
+    ensureSymlinkSync: (src, dest, ...args) =>
+      fs.ensureSymlinkSync(resolve(cwd, src), resolve(cwd, dest), ...args),
     lstat: (path, ...args) => fs.lstat(resolve(cwd, path), ...args),
     stat: (path, ...args) => fs.stat(resolve(cwd, path), ...args),
     lstatSync: (path, ...args) => fs.lstatSync(resolve(cwd, path), ...args),

package/util/execa.cjs

@@ -37,8 +37,8 @@ function getExecaArgs(command, args, options, ...rest) {
 
   const opts = {
     stdio: 'inherit',
-    cwd: projectDir,
     ...options,
+    cwd: options.cwd ? Path.resolve(projectDir, options.cwd) : projectDir,
     env: {
       ...process.env,
       ...options.env,

package/util/findUps.cjs

@@ -1,6 +1,7 @@
 const findUp = require('find-up')
 const Path = require('path')
 const fs = require('fs-extra')
+const glob = require('glob')
 const merge = require('./merge.cjs')
 const once = require('./once.cjs')
 const { name } = require('../package.json')
@@ -59,6 +60,16 @@ exports.monorepoPackageJson = monorepoPackageJsonFile
   ? fs.readJsonSync(monorepoPackageJsonFile)
   : undefined
 
+exports.monorepoSubpackageJsonFiles = pnpmWorkspace
+  ? [
+      ...new Set(
+        pnpmWorkspace.packages.flatMap((p) =>
+          glob.sync(Path.join(p, 'package.json'), { cwd: monorepoProjectDir })
+        )
+      ),
+    ].map((f) => Path.resolve(monorepoProjectDir, f))
+  : undefined
+
 const findGitDir = once(function findGitDir(cwd = process.cwd()) {
   let stopAt = Path.dirname(monorepoProjectDir || projectDir)
   if (stopAt === '/') stopAt = undefined

package/util/parseRepositoryUrl.cjs

@@ -0,0 +1,11 @@
+const { parse: parseUrl } = require('url')
+
+const repoRegExp = new RegExp('^/(.+?)/([^/.]+)')
+
+module.exports = function parseRepositoryUrl(url) {
+  const parsed = parseUrl(url)
+  const match = repoRegExp.exec(parsed.path || '')
+  if (!match) throw new Error(`unsupported source repository url: ${url}`)
+  const [organization, repo] = match.slice(1)
+  return { ...parsed, organization, repo }
+}