jiek 2.2.3 → 2.2.5-alpha.1

package/src/commands/publish.ts

@@ -324,34 +324,63 @@ async function prepublish({ bumper }: {
       .readdirSync(resolveByDir(resolvedOutdir), { recursive: true })
       .filter(file => typeof file === 'string')
       .filter(file => file !== 'package.json')
-    for (const file of allBuildFiles) {
-      const filepath = resolveByDir(resolvedOutdir, file)
-      const stat = fs.statSync(filepath)
-      if (stat.isDirectory()) {
-        const existsIndexFile = allBuildFiles
-          .some(f =>
-            [
-              path.join(file, 'index.js'),
-              path.join(file, 'index.mjs'),
-              path.join(file, 'index.cjs')
-            ].includes(f)
-          )
-        if (existsIndexFile) {
-          const cpDistPath = resolveByDir(resolvedOutdir, resolvedOutdir, file)
-          const pkgJSONPath = resolveByDir(resolvedOutdir, file, 'package.json')
-          const relativePath = path.relative(filepath, cpDistPath)
-          const { type } = manifest
-          fs.writeFileSync(
-            pkgJSONPath,
-            JSON.stringify({
-              type,
-              main: [relativePath, `index.${type === 'module' ? 'c' : ''}js`].join('/'),
-              module: [relativePath, `index.${type === 'module' ? '' : 'm'}js`].join('/')
-            })
-          )
+    const resolvedExports = manifest.exports as Record<string, unknown>
+    Object
+      .keys(resolvedExports)
+      .forEach(key => {
+        if (key === '.') return
+        if (/\.[cm]?js$/.test(key)) return
+        // resource file suffix
+        const resourceFileSuffixes = [
+          '.d.ts',
+          '.d.mts',
+          '.d.cts',
+          '.css',
+          '.scss',
+          '.sass',
+          '.less',
+          '.styl',
+          '.stylus',
+          '.json',
+          '.json5'
+        ]
+        if (resourceFileSuffixes.find(suffix => key.endsWith(suffix))) return
+
+        const value = resolvedExports[key] as {
+          import?: string
+          require?: string
+          default?: string
         }
-      }
-    }
+
+        const filepath = resolveByDir(resolvedOutdir, key)
+
+        fs.mkdirSync(filepath, { recursive: true })
+        const pkgJSONPath = resolveByDir(resolvedOutdir, key, 'package.json')
+        const relativePath = Array.from({ length: key.split('/').length - 1 }, () => '..').join('/')
+        const { type } = manifest
+        const pkgJSON: Record<string, unknown> = { type }
+        if ('default' in value) {
+          pkgJSON[
+            type === 'module' ? 'module' : 'main'
+          ] = [
+            relativePath,
+            value.default?.replace(/^\.\//, '')
+          ].join('/')
+        }
+        if ('import' in value) {
+          pkgJSON.module = [
+            relativePath,
+            value.import?.replace(/^\.\//, '')
+          ].join('/')
+        }
+        if ('require' in value) {
+          pkgJSON.main = [
+            relativePath,
+            value.require?.replace(/^\.\//, '')
+          ].join('/')
+        }
+        fs.writeFileSync(pkgJSONPath, JSON.stringify(pkgJSON))
+      })
     fs.mkdirSync(resolveByDir(resolvedOutdir, resolvedOutdir))
     for (const file of allBuildFiles) {
       const filepath = resolveByDir(resolvedOutdir, file)
@@ -411,13 +440,20 @@ async function prepublish({ bumper }: {
 async function postpublish() {
   await forEachSelectedProjectsGraphEntries(dir => {
     const jiekTempDir = path.resolve(dir, 'node_modules/.jiek/.tmp')
-    const packageJSON = path.resolve(dir, 'package.json')
-    const jiekTempPackageJSON = path.resolve(jiekTempDir, 'package.json')
-    if (fs.existsSync(jiekTempPackageJSON)) {
-      fs.copyFileSync(jiekTempPackageJSON, packageJSON)
-      fs.rmSync(jiekTempPackageJSON)
-      // eslint-disable-next-line no-console
+    const packageJSONPath = path.resolve(dir, 'package.json')
+    const { name, version } = JSON.parse(fs.readFileSync(packageJSONPath, 'utf-8')) as {
+      name: string
+      version: string
+    }
+    const jiekTempPackageJSONPath = path.resolve(jiekTempDir, 'package.json')
+    if (fs.existsSync(jiekTempPackageJSONPath)) {
+      fs.copyFileSync(jiekTempPackageJSONPath, packageJSONPath)
+      fs.rmSync(jiekTempPackageJSONPath)
+      /* eslint-disable no-console */
       console.log(`${dir}/package.json has been restored`)
+      console.log(`if you want to check the compatibility of the package, you can visit:`)
+      console.log(`https://arethetypeswrong.github.io/?p=${name}%40${version}`)
+      /* eslint-enable no-console */
     } else {
       throw new Error(
         `jiek temp \`${dir}/package.json\` not found, please confirm the jiek pre-publish command has been executed`

package/src/rollup/base.ts

@@ -110,4 +110,28 @@ export interface TemplateOptions {
       js?: InputPluginOption
       dts: InputPluginOption
     }
+  /**
+   * https://www.npmjs.com/package/@rollup/plugin-inject#usage
+   *
+   * @example
+   * ```js
+   * {
+   *   // import { Promise } from 'es6-promise'
+   *   Promise: [ 'es6-promise', 'Promise' ],
+   *
+   *   // import { Promise as P } from 'es6-promise'
+   *   P: [ 'es6-promise', 'Promise' ],
+   *
+   *   // import $ from 'jquery'
+   *   $: 'jquery',
+   *
+   *   // import * as fs from 'fs'
+   *   fs: [ 'fs', '*' ],
+   *
+   *   // use a local module instead of a third-party one
+   *   'Object.assign': path.resolve( 'src/helpers/object-assign.js' ),
+   * }
+   * ```
+   */
+  injects?: Record<string, string | [string, string]>
 }

package/src/rollup/index.ts

@@ -8,6 +8,7 @@ import { getAllLeafs } from '@jiek/pkger/entrypoints'
 import { dts } from '@jiek/rollup-plugin-dts'
 import { getWorkspaceDir } from '@jiek/utils/getWorkspaceDir'
 import commonjs from '@rollup/plugin-commonjs'
+import inject from '@rollup/plugin-inject'
 import json from '@rollup/plugin-json'
 import { nodeResolve } from '@rollup/plugin-node-resolve'
 import { isMatch } from 'micromatch'
@@ -23,7 +24,7 @@ import { recusiveListFiles } from '#~/utils/recusiveListFiles.ts'
 import { getCompilerOptionsByFilePath } from '#~/utils/ts.ts'
 
 import type { ConfigGenerateContext, TemplateOptions } from './base'
-import createRequire, { isFormatEsm } from './plugins/create-require'
+import createRequire, { CREATE_REQUIRE_VIRTUAL_MODULE_NAME } from './plugins/create-require'
 import progress from './plugins/progress'
 import skip from './plugins/skip'
 import externalResolver from './utils/externalResolver'
@@ -389,7 +390,16 @@ const generateConfigs = (context: ConfigGenerateContext, options: TemplateOption
         esbuild({
           sourceMap: sourcemap === 'hidden' ? false : !!sourcemap,
           tsconfig: buildTSConfigPath,
-          target: 'node22',
+          loaders: {
+            cts: 'ts',
+            ctsx: 'tsx',
+            mts: 'ts',
+            mtsx: 'tsx',
+            cjs: 'js',
+            cjsx: 'jsx',
+            mjs: 'js',
+            mjsx: 'jsx'
+          },
           ...noTypeResolvedBuilderOptions,
           supported: {
             'import-attributes': features.keepImportAttributes !== false,
@@ -411,6 +421,14 @@ const generateConfigs = (context: ConfigGenerateContext, options: TemplateOption
           ...noTypeResolvedBuilderOptions,
           jsc: {
             ...resolvedBuilderOptions.jsc,
+            parser: resolvedBuilderOptions.jsc?.parser
+              ? resolvedBuilderOptions.jsc?.parser
+              : {
+                syntax: 'typescript',
+                tsx: true,
+                decorators: true,
+                dynamicImport: true
+              },
             experimental: {
               ...resolvedBuilderOptions.jsc?.experimental,
               keepImportAttributes: features.keepImportAttributes !== false
@@ -451,9 +469,7 @@ const generateConfigs = (context: ConfigGenerateContext, options: TemplateOption
             : features.keepImportAttributes === true
             ? 'with'
             : features.keepImportAttributes,
-          plugins: [
-            isFormatEsm(format === 'esm')
-          ]
+          plugins: []
         }, onlyOncePlugins)
       ],
       plugins: [
@@ -467,8 +483,16 @@ const generateConfigs = (context: ConfigGenerateContext, options: TemplateOption
           )
           .catch(() => void 0),
         commonjs(),
-        createRequire(),
         builder,
+        // inject plugin can't resolve `import type`, so we should register it after the builder plugin
+        inject({
+          sourceMap: sourcemap === 'hidden' ? false : !!sourcemap,
+          modules: {
+            ...build.injects ?? {},
+            require: CREATE_REQUIRE_VIRTUAL_MODULE_NAME
+          }
+        }),
+        createRequire(format === 'esm'),
         ana,
         progress({
           onEvent: (event, message) => void publishInEntry('progress', { event, message, tags: ['js'] })
@@ -479,15 +503,16 @@ const generateConfigs = (context: ConfigGenerateContext, options: TemplateOption
   }
 
   if (dtsOutput && !WITHOUT_DTS) {
+    const sourcemap = typeof options?.output?.sourcemap === 'object'
+      ? options.output.sourcemap.dts
+      : options?.output?.sourcemap
     rollupOptions.push({
       input: inputObj,
       external,
       output: [
         {
           dir: dtsOutdir,
-          sourcemap: typeof options?.output?.sourcemap === 'object'
-            ? options.output.sourcemap.dts
-            : options?.output?.sourcemap,
+          sourcemap,
           entryFileNames: (chunkInfo) => (
             Array.isArray(inputObj)
               ? chunkInfo.facadeModuleId!.replace(`${process.cwd()}/`, '')

package/src/rollup/plugins/create-require.ts

@@ -1,74 +1,23 @@
-// https://github.com/privatenumber/pkgroll/blob/73559f8864203a50a5aa12c0a6503ceed3690aff/src/utils/rollup-plugins/create-require.ts#L1
-// Thanks to @privatenumber for the snippet
-
-import inject from '@rollup/plugin-inject'
-import replace from '@rollup/plugin-replace'
 import type { Plugin } from 'rollup'
 
-const virtualModuleName = 'jiek:create-require'
-
-/**
- * Since rollup is bundled by rollup, it needs to add a run-time
- * suffix so that this doesn't get replaced.
- */
-const isEsmVariableName = `IS_ESM${Math.random().toString(36).slice(2)}`
-
-const INSERT_STR = `
-import { createRequire } from 'node:module'
+export const CREATE_REQUIRE_VIRTUAL_MODULE_NAME = 'jiek:create-require'
 
-export default (
-  ${isEsmVariableName}
-    ? /* @__PURE__ */ createRequire(import.meta.url)
-    : require
-)
+const INSERT_STR = (isESM: boolean) =>
+  `
+${isESM ? `import { createRequire } from 'node:module'` : ''}
+export default ${isESM ? '/* @__PURE__ */ createRequire(import.meta.url)' : 'require'}
 `.trim()
 
-/**
- * Plugin to seamlessly allow usage of `require`
- * across CJS and ESM modules.
- *
- * This is usually nor a problem for CJS outputs,
- * but for ESM outputs, it must be used via
- * createRequire.
- *
- * This plugin automatically injects it for ESM.
- */
-export default (): Plugin => ({
-  ...inject({
-    require: virtualModuleName
-  }),
-
+export default (isEsm: boolean): Plugin => ({
   name: 'create-require',
-
-  resolveId: source => (
-    (source === virtualModuleName)
-      ? source
+  resolveId: id => (
+    id === CREATE_REQUIRE_VIRTUAL_MODULE_NAME
+      ? id
       : null
   ),
-
-  load: (id) => {
-    if (id !== virtualModuleName) {
-      return null
-    }
-
-    return INSERT_STR
-  }
+  load: id => (
+    id === CREATE_REQUIRE_VIRTUAL_MODULE_NAME
+      ? INSERT_STR(isEsm)
+      : null
+  )
 })
-
-export const isFormatEsm = (
-  isEsm: boolean
-): Plugin => {
-  const handler = replace({
-    [isEsmVariableName]: isEsm
-  }).renderChunk!
-
-  return ({
-    name: 'create-require-insert-format',
-
-    // Pick out renderChunk because it's used as an output plugin
-    renderChunk: {
-      order: 'pre',
-      handler: typeof handler === 'function' ? handler : handler.handler
-    }
-  })
-}

package/src/utils/checkDependency.ts

@@ -1,7 +1,7 @@
+import { execSync } from 'node:child_process'
 import process from 'node:process'
 
 import { confirm } from '@inquirer/prompts'
-import { execaCommand } from 'execa'
 
 import { getWD } from '#~/utils/getWD.ts'
 
@@ -11,9 +11,13 @@ export async function checkDependency(dependency: string) {
   } catch {
     console.error(`The package '${dependency}' is not installed, please install it first.`)
     const { notWorkspace } = getWD()
-    const command = `pnpm install -${notWorkspace ? '' : 'w'}D ${dependency}`
-    if (await confirm({ message: 'Do you want to install it now?' })) {
-      await execaCommand(command)
+    const command = `pnpm add -${notWorkspace ? '' : 'w'}D ${dependency}`
+    if (await confirm({ message: `Do you want to add it now? (${command})` })) {
+      execSync(command, {
+        stdio: 'inherit',
+        cwd: process.cwd(),
+        env: process.env
+      })
     } else {
       console.warn(`You can run the command '${command}' to install it manually.`)
       process.exit(1)

package/src/utils/filterSupport.ts

@@ -1,5 +1,4 @@
 import fs from 'node:fs'
-import { createRequire } from 'node:module'
 import path from 'node:path'
 
 import { program } from 'commander'
@@ -11,7 +10,6 @@ import { getWD } from '#~/utils/getWD.ts'
 export let type = ''
 
 try {
-  const require = createRequire(import.meta.url)
   require.resolve('@pnpm/filter-workspace-packages')
   type = 'pnpm'
 } catch { /* empty */ }
@@ -26,7 +24,7 @@ export interface ProjectsGraph {
   }>
 }
 
-export function filterPackagesGraph(filters: string[]): Promise<ProjectsGraph[]> {
+export async function filterPackagesGraph(filters: string[]): Promise<ProjectsGraph[]> {
   return Promise.all(filters.map(async filter => getSelectedProjectsGraph(filter)))
 }
 

package/src/utils/getExports.ts

@@ -1,11 +1,12 @@
 import { isAbsolute, relative, resolve } from 'node:path'
+import process from 'node:process'
 
 import {
+  type Entrypoints2ExportsOptions,
+  type RecursiveRecord,
   DEFAULT_SKIP_VALUES,
   entrypoints2Exports,
-  type Entrypoints2ExportsOptions,
   filterLeafs,
-  type RecursiveRecord,
   resolveEntrypoints
 } from '@jiek/pkger/entrypoints'
 import type { Config } from 'jiek'
@@ -14,10 +15,14 @@ import { isMatch } from 'micromatch'
 const intersection = <T>(a: Set<T>, b: Set<T>) => new Set([...a].filter(i => b.has(i)))
 
 const {
-  JIEK_OUT_DIR
+  JIEK_OUT_DIR,
+  JIEK_CROSS_MODULE_CONVERTOR
 } = process.env
 
 const OUTDIR = JIEK_OUT_DIR ?? 'dist'
+const crossModuleConvertorDefault = JIEK_CROSS_MODULE_CONVERTOR === undefined
+  ? true
+  : JIEK_CROSS_MODULE_CONVERTOR === 'true'
 
 export function getOutDirs({
   cwd = process.cwd(),
@@ -85,7 +90,7 @@ export function getExports({
     } = {}
   } = config ?? {}
   const {
-    crossModuleConvertor = true
+    crossModuleConvertor = crossModuleConvertorDefault
   } = build
   const [, resolvedEntrypoints] = resolveEntrypoints(entrypoints)
   if (entries) {
@@ -109,20 +114,30 @@ export function getExports({
   )
   const crossModuleWithConditional: Entrypoints2ExportsOptions['withConditional'] = crossModuleConvertor
     ? {
-      import: opts =>
-        !pkgIsModule && intersection(
-              new Set(opts.conditionals),
-              new Set(['import', 'module'])
-            ).size === 0
-          ? opts.dist.replace(/\.js$/, '.mjs')
-          : false,
-      require: opts =>
-        pkgIsModule && intersection(
-              new Set(opts.conditionals),
-              new Set(['require', 'node'])
-            ).size === 0
-          ? opts.dist.replace(/\.js$/, '.cjs')
-          : false
+      import: opts => {
+        if (pkgIsModule) return false
+        if (opts.src.endsWith('.cts')) return false
+        if (
+          intersection(
+            new Set(opts.conditionals),
+            new Set(['import', 'module'])
+          ).size !== 0
+        ) return false
+
+        return opts.dist.replace(/\.js$/, '.mjs')
+      },
+      require: opts => {
+        if (!pkgIsModule) return false
+        if (opts.src.endsWith('.mts')) return false
+        if (
+          intersection(
+            new Set(opts.conditionals),
+            new Set(['require', 'node'])
+          ).size !== 0
+        ) return false
+
+        return opts.dist.replace(/\.js$/, '.cjs')
+      }
     }
     : {}
   return [

package/src/utils/loadConfig.ts

@@ -1,5 +1,4 @@
 import fs from 'node:fs'
-import { createRequire } from 'node:module'
 import path from 'node:path'
 
 import { program } from 'commander'
@@ -9,8 +8,6 @@ import { load } from 'js-yaml'
 import { getWD } from './getWD'
 import { tsRegisterName } from './tsRegister'
 
-const require = createRequire(import.meta.url)
-
 let configName = 'jiek.config'
 
 function getConfigPath(root: string, dir?: string) {

package/src/utils/tsRegister.ts

@@ -1,7 +1,3 @@
-import { createRequire } from 'node:module'
-
-const require = createRequire(import.meta.url)
-
 function packageIsExist(name: string) {
   try {
     require.resolve(name)