jiek 0.4.7-alpha.14 → 0.4.7-alpha.3

package/package.json

@@ -1,7 +1,6 @@
 {
   "name": "jiek",
-  "type": "module",
-  "version": "0.4.7-alpha.14",
+  "version": "0.4.7-alpha.3",
   "description": "YiJie's personal kits.",
   "bin": {
     "jiek": "bin/jiek.js",
@@ -27,17 +26,27 @@
     "./package.json": "./package.json",
     ".": {
       "source": "./src/index.ts",
-      "require": "./dist/index.cjs",
+      "import": "./dist/index.mjs",
       "default": "./dist/index.js"
     },
     "./cli": {
       "source": "./src/cli.ts",
-      "require": "./dist/cli.cjs",
+      "import": "./dist/cli.mjs",
       "default": "./dist/cli.js"
     },
     "./rollup": {
       "source": "./src/rollup/index.ts",
-      "require": "./dist/rollup/index.cjs",
+      "import": "./dist/rollup/index.mjs",
+      "default": "./dist/rollup/index.js"
+    },
+    "./cli.js": {
+      "source": "./src/cli.ts",
+      "import": "./dist/cli.mjs",
+      "default": "./dist/cli.js"
+    },
+    "./rollup.js": {
+      "source": "./src/rollup/index.ts",
+      "import": "./dist/rollup/index.mjs",
       "default": "./dist/rollup/index.js"
     }
   },
@@ -46,7 +55,6 @@
   },
   "dependencies": {
     "@jiek/rollup-plugin-dts": "^6.1.1",
-    "@rollup/plugin-commonjs": "^28.0.0",
     "@rollup/plugin-json": "^6.0.1",
     "@rollup/plugin-node-resolve": "^15.3.0",
     "@rollup/plugin-terser": "^0.4.4",
@@ -58,12 +66,13 @@
     "inquirer": "^8.2.6",
     "js-yaml": "^4.1.0",
     "jsonc-parser": "^3.2.1",
+    "micromatch": "^4.0.5",
     "rollup": "^4.1.5",
     "rollup-plugin-copy": "^3.5.0",
     "rollup-plugin-esbuild": "^6.1.0",
     "typescript": "^5.0.0",
-    "@jiek/pkger": "^0.2.0",
-    "@jiek/utils": "^0.2.1"
+    "@jiek/pkger": "^0.1.11",
+    "@jiek/utils": "^0.2.0"
   },
   "optionalDependencies": {
     "@pnpm/filter-workspace-packages": "^7.2.13",
@@ -80,11 +89,10 @@
     "@types/js-yaml": "^4.0.9",
     "@types/micromatch": "^4.0.6",
     "esbuild-register": "^3.5.0",
-    "micromatch": "^4.0.5",
     "node-sass": "^9.0.0",
     "postcss": "^8.4.47",
     "rollup-plugin-postcss": "^4.0.2"
   },
-  "main": "./dist/index.cjs",
-  "module": "./dist/index.js"
+  "main": "./dist/index.js",
+  "module": "./dist/index.mjs"
 }

package/src/commands/base.ts

@@ -1,5 +1,6 @@
 import { program } from 'commander'
-import pkg from 'jiek/package.json'
+
+import pkg from '../pkg'
 
 program
   .version(pkg.version)

package/src/commands/build.ts

@@ -1,7 +1,6 @@
 import '../rollup/base'
 
 import fs from 'node:fs'
-import { createRequire } from 'node:module'
 import path from 'node:path'
 
 import { MultiBar, Presets } from 'cli-progress'
@@ -15,11 +14,10 @@ import { loadConfig } from '../utils/loadConfig'
 import { tsRegisterName } from '../utils/tsRegister'
 
 const FILE_TEMPLATE = (manifest: unknown) => (`
-module.exports = require('jiek/rollup').template(${JSON.stringify(manifest, null, 2)})
+const manifest = ${JSON.stringify(manifest, null, 2)}
+module.exports = require('jiek/rollup').template(manifest)
 `.trimStart())
 
-const require = createRequire(import.meta.url)
-
 program
   .command('build')
   .option('-s, --silent', "Don't display logs.")

package/src/commands/publish.ts

@@ -12,21 +12,6 @@ import { getSelectedProjectsGraph } from '../utils/filterSupport'
 import { getExports } from '../utils/getExports'
 import { loadConfig } from '../utils/loadConfig'
 
-declare module 'jiek' {
-  export interface Config {
-    publish?: {
-      /**
-       * @default false
-       */
-      withSuffix?: boolean
-      /**
-       * @default true
-       */
-      withSource?: boolean
-    }
-  }
-}
-
 program
   .command('publish')
   .aliases(['pub', 'p'])
@@ -54,7 +39,8 @@ program
           config: loadConfig(dir),
           dir,
           noFilter: true,
-          isPublish: true
+          withSource: true,
+          withSuffix: true
         })
         newManifest.exports = {
           ...resolvedEntrypoints,

package/src/pkg.ts

@@ -0,0 +1 @@
+export default require('../package.json')

package/src/rollup/index.ts

@@ -7,7 +7,6 @@ import type { RecursiveRecord } from '@jiek/pkger/entrypoints'
 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 json from '@rollup/plugin-json'
 import { nodeResolve } from '@rollup/plugin-node-resolve'
 import terser from '@rollup/plugin-terser'
@@ -64,6 +63,8 @@ const debug = (...args: unknown[]) => sendMessage({ type: 'debug', data: args }
 
 const resolveWorkspacePath = (p: string) => resolve(WORKSPACE_ROOT, p)
 
+const intersection = <T>(a: Set<T>, b: Set<T>) => new Set([...a].filter(i => b.has(i)))
+
 const pascalCase = (str: string) =>
   str
     .replace(/[@|/-](\w)/g, (_, $1) => $1.toUpperCase())
@@ -133,7 +134,6 @@ const getExtendTSConfig = (tsconfigPath: string): TSConfig => {
   if (extendsPaths.length === 0) return tsconfig
   return extendsPaths
     .map(getExtendTSConfig)
-    .concat(tsconfig)
     // https://www.typescriptlang.org/tsconfig/#files:~:text=Currently%2C%20the%20only%20top%2Dlevel%20property%20that%20is%20excluded%20from%20inheritance%20is%20references.
     // Currently, the only top-level property that is excluded from inheritance is references.
     .reduce((acc, { compilerOptions = {}, references: _, ...curr }) => ({
@@ -143,7 +143,7 @@ const getExtendTSConfig = (tsconfigPath: string): TSConfig => {
         ...acc.compilerOptions,
         ...compilerOptions
       }
-    }), {})
+    }), tsconfig)
 }
 
 const getCompilerOptionsByFilePath = (tsconfigPath: string, filePath: string): Record<string, unknown> | undefined => {
@@ -249,7 +249,6 @@ const generateConfigs = ({
         ...withMinify({
           file: output,
           name,
-          interop: 'auto',
           sourcemap: typeof options?.output?.sourcemap === 'object'
             ? options.output.sourcemap.js
             : options?.output?.sourcemap,
@@ -276,7 +275,6 @@ const generateConfigs = ({
           )
           .catch(() => void 0),
         esbuild(),
-        commonjs(),
         progress({
           onEvent: (event, message) =>
             sendMessage(

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 { filterPackagesFromDir } from '@pnpm/filter-workspace-packages'
@@ -12,7 +11,6 @@ import { getWD } from './getWD'
 export let type = ''
 
 try {
-  const require = createRequire(import.meta.url)
   require.resolve('@pnpm/filter-workspace-packages')
   type = 'pnpm'
 } catch { /* empty */ }

package/src/utils/getExports.ts

@@ -20,7 +20,8 @@ export function getExports({
   config,
   dir,
   noFilter,
-  isPublish
+  withSource,
+  withSuffix
 }: {
   entrypoints: string | string[] | Record<string, unknown>
   pkgIsModule: boolean
@@ -28,17 +29,12 @@ export function getExports({
   config?: Config
   dir?: string
   noFilter?: boolean
-  isPublish?: boolean
+  withSource?: boolean
+  withSuffix?: boolean
 }) {
   const dirResolve = (...paths: string[]) => resolve(dir ?? process.cwd(), ...paths)
   const dirRelative = (path: string) => relative(dir ?? process.cwd(), path)
-  const {
-    build = {},
-    publish: {
-      withSuffix = false,
-      withSource = true
-    } = {}
-  } = config ?? {}
+  const { build = {} } = config ?? {}
   const {
     crossModuleConvertor = true
   } = build
@@ -94,8 +90,8 @@ export function getExports({
     filteredResolvedEntrypoints,
     entrypoints2Exports(filteredResolvedEntrypoints, {
       outdir: jsOutdir,
-      withSuffix: isPublish ? withSuffix : undefined,
-      withSource: isPublish ? withSource : undefined,
+      withSource,
+      withSuffix,
       withConditional: {
         ...crossModuleWithConditional
       }

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)