resolve peer conflict

Author: Brooooooklyn

packages/cli/build-support/rewrite-imports.ts

@@ -0,0 +1,16 @@
+import pkgJson from '../package.json' with { type: 'json' };
+
+export const RewriteImportsPlugin = {
+  name: 'externalize-vite-and-rolldown',
+  resolveId(id: string) {
+    if (id.startsWith('vite/')) {
+      return { id: id.replace(/^vite\//, `${pkgJson.name}/`), external: true };
+    }
+    if (id === 'rolldown') {
+      return { id: `${pkgJson.name}/rolldown`, external: true };
+    }
+    if (id.startsWith('rolldown/')) {
+      return { id: id.replace(/^rolldown\//, `${pkgJson.name}/rolldown/`), external: true };
+    }
+  },
+};

packages/cli/build.ts

@@ -1,4 +1,4 @@
-import { chmod, copyFile, cp, mkdir, readFile, writeFile } from 'node:fs/promises';
+import { chmod, copyFile, cp, mkdir, readFile, stat, writeFile } from 'node:fs/promises';
 import { join, parse, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
@@ -7,7 +7,7 @@ import { build, type BuildOptions } from 'rolldown';
 import { dts } from 'rolldown-plugin-dts';
 import { glob } from 'tinyglobby';
 
-import { CopyAddonPlugin } from './copy-addon-plugin';
+import { RewriteImportsPlugin } from './build-support/rewrite-imports';
 import pkgJson from './package.json' with { type: 'json' };
 import viteRolldownConfig from './vite-rolldown.config';
 
@@ -32,12 +32,13 @@ await build({
   external: [/^node:/, 'vitest'],
   plugins: [
     {
-      name: 'rewrite-vite-import-path',
+      name: 'rewrite-import-path',
       transform(_, id, meta) {
         const moduleInfo = this.getModuleInfo(id);
         const { magicString } = meta;
         if (moduleInfo?.isEntry && magicString) {
           magicString.replaceAll(`'vite'`, `'${pkgJson.name}/vite'`);
+          magicString.replaceAll(`resolve('tsdown/run')`, `resolve('${pkgJson.name}/tsdown/run')`);
           return {
             code: magicString,
           };
@@ -72,8 +73,8 @@ const newViteRolldownConfig = viteRolldownConfig.map((config) => {
   if (Array.isArray(config.external)) {
     config.external = config.external.filter((external) => {
       return !(typeof external === 'string' &&
-        (external.includes('rolldown') || external === 'picomatch' || external === 'tinyglobby' ||
-          external === 'fdir')) && !(external instanceof RegExp && external.test('rolldown/'));
+        (external === 'picomatch' || external === 'tinyglobby' ||
+          external === 'fdir'));
     });
   }
 
@@ -108,7 +109,7 @@ const newViteRolldownConfig = viteRolldownConfig.map((config) => {
   fileURLToPath(import.meta.url),
   '../../..',
 )`,
-                `export const VITE_PACKAGE_DIR: string = path.join(fileURLToPath(import.meta.url), '../../../../../../packages/cli')`,
+                `export const VITE_PACKAGE_DIR: string = path.join(fileURLToPath(/** #__KEEP__ */import.meta.url), '..', '..', '..', '..', '..')`,
               );
               magicString.replace(
                 `export const CLIENT_ENTRY: string = resolve(
@@ -124,6 +125,12 @@ const newViteRolldownConfig = viteRolldownConfig.map((config) => {
 )`,
                 `export const ENV_ENTRY = path.join(VITE_PACKAGE_DIR, 'dist/vite/client/env.mjs')`,
               );
+              magicString.replace(
+                `const { version } = JSON.parse(
+  readFileSync(new URL('../../package.json', import.meta.url)).toString(),
+)`,
+                `import { version } from '../../package.json' with { type: 'json' }`,
+              );
               return {
                 code: magicString,
               };
@@ -136,26 +143,11 @@ const newViteRolldownConfig = viteRolldownConfig.map((config) => {
           plugin.name === 'rollup-plugin-license');
       }).map((plugin) => {
         if (typeof plugin === 'object' && plugin !== null && 'name' in plugin && plugin.name === 'externalize-vite') {
-          return {
-            name: 'externalize-vite',
-            resolveId(id) {
-              if (id.startsWith('vite/')) {
-                return { id: id.replace(/^vite\//, `${pkgJson.name}/vite/`), external: true };
-              }
-            },
-          };
+          return RewriteImportsPlugin;
         }
         return plugin;
       }),
     ];
-    // cli config
-    if (typeof config.input === 'object' && config.input['cli']) {
-      config.plugins.push(CopyAddonPlugin({
-        isCI: !!process.env.CI,
-        isReleasingPkgInCI: !!process.env.RELEASING,
-        desireWasmFiles: false,
-      }));
-    }
   }
 
   if (config.experimental) {
@@ -171,9 +163,38 @@ const newViteRolldownConfig = viteRolldownConfig.map((config) => {
 
 await build(newViteRolldownConfig as BuildOptions[]);
 
-const rolldownViteSourceDir = resolve(projectDir, '..', '..', 'rolldown-vite', 'packages', 'vite');
+const rolldownPluginUtilsDir = resolve(projectDir, '..', '..', 'rolldown', 'packages', 'pluginutils');
+
+await mkdir(join(projectDir, 'dist', 'pluginutils'), { recursive: true });
+
+await cp(join(rolldownPluginUtilsDir, 'dist'), join(projectDir, 'dist', 'pluginutils'), {
+  recursive: true,
+});
+
+const rolldownSourceDir = resolve(projectDir, '..', '..', 'rolldown', 'packages', 'rolldown');
+
+await mkdir(join(projectDir, 'dist/rolldown'), { recursive: true });
+
+const rolldownFiles = new Set<string>();
+
+await cp(join(rolldownSourceDir, 'dist'), join(projectDir, 'dist/rolldown'), {
+  recursive: true,
+  filter: async (from, to) => {
+    if ((await stat(from)).isFile()) {
+      rolldownFiles.add(to);
+    }
+    return true;
+  },
+});
 
-console.log(rolldownViteSourceDir);
+for (const file of rolldownFiles) {
+  const source = await readFile(file, 'utf-8');
+  if (source.includes('"@rolldown/pluginutils"')) {
+    await writeFile(file, source.replaceAll('"@rolldown/pluginutils"', `"${pkgJson.name}/rolldown/pluginutils"`));
+  }
+}
+
+const rolldownViteSourceDir = resolve(projectDir, '..', '..', 'rolldown-vite', 'packages', 'vite');
 
 await cp(join(rolldownViteSourceDir, 'misc'), join(projectDir, 'dist/vite/misc'), {
   recursive: true,
@@ -194,9 +215,12 @@ for (const dtsFile of dtsFiles) {
   );
   await writeFile(
     dstFilePath,
-    file.replaceAll(`"rolldown-vite/`, `"${pkgJson.name}/vite/`).replaceAll(
+    file.replaceAll(`"rolldown-vite/`, `"${pkgJson.name}/`).replaceAll(
       `"rolldown-vite"`,
       `"${pkgJson.name}/vite"`,
+    ).replaceAll(`"rolldown/`, `"${pkgJson.name}/rolldown/`).replaceAll(
+      `"rolldown"`,
+      `"${pkgJson.name}/rolldown"`,
     ),
   );
 }
@@ -217,3 +241,22 @@ for (const srcDtsFile of srcTypeFiles) {
 await writeFile('./dist/vite/node/vite', `#!/usr/bin/env node\n\nimport './cli.js'\n`);
 
 await chmod('./dist/vite/node/vite', 0o755);
+
+await mkdir(join(projectDir, 'dist/tsdown/dist'), { recursive: true });
+
+const tsdownExternal = Object.keys(pkgJson.peerDependencies);
+
+// re-build tsdown cli
+await build({
+  input: resolve(projectDir, 'node_modules/tsdown/dist/run.mjs'),
+  output: {
+    format: 'esm',
+    cleanDir: true,
+    dir: join(projectDir, 'dist/tsdown'),
+  },
+  platform: 'node',
+  external: (id: string) => tsdownExternal.some((e) => id.startsWith(e)),
+  plugins: [
+    RewriteImportsPlugin,
+  ],
+});

packages/cli/package.json

@@ -14,17 +14,59 @@
     "./bin": {
       "import": "./dist/bin.js"
     },
-    "./client": {
-      "types": "./dist/client.d.ts"
-    },
     "./test": {
       "import": "./dist/test.js",
       "types": "./dist/test.d.ts"
     },
-    "./vite/module-runner": "./dist/vite/node/module-runner.js",
+    "./client": {
+      "types": "./dist/client.d.ts"
+    },
+    "./internal": {
+      "import": "./dist/vite/node/internal.js",
+      "types": "./dist/vite/node/internal.d.ts"
+    },
+    "./module-runner": {
+      "import": "./dist/vite/node/module-runner.js",
+      "types": "./dist/vite/node/module-runner.d.ts"
+    },
+    "./dist/client/*": "./dist/vite/client/*",
     "./vite": {
       "import": "./dist/vite/node/index.js",
       "types": "./dist/vite/node/index.d.ts"
+    },
+    "./rolldown": {
+      "import": "./dist/rolldown/index.mjs",
+      "types": "./dist/rolldown/index.d.mts"
+    },
+    "./rolldown/parseAst": {
+      "import": "./dist/rolldown/parse-ast-index.mjs",
+      "types": "./dist/rolldown/parse-ast-index.d.mts"
+    },
+    "./rolldown/experimental": {
+      "import": "./dist/rolldown/experimental-index.mjs",
+      "types": "./dist/rolldown/experimental-index.d.mts"
+    },
+    "./rolldown/config": {
+      "import": "./dist/rolldown/config.mjs",
+      "types": "./dist/rolldown/config.d.mts"
+    },
+    "./rolldown/experimental/runtime-types": {
+      "types": "./dist/rolldown/experimental-runtime-types.d.ts"
+    },
+    "./rolldown/filter": {
+      "import": "./dist/rolldown/filter-index.mjs",
+      "types": "./dist/rolldown/filter-index.d.mts"
+    },
+    "./rolldown/parallelPlugin": {
+      "import": "./dist/rolldown/parallel-plugin.mjs",
+      "types": "./dist/rolldown/parallel-plugin.d.mts"
+    },
+    "./rolldown/pluginutils": {
+      "import": "./dist/pluginutils/index.js",
+      "types": "./dist/pluginutils/index.d.ts"
+    },
+    "./tsdown/run": {
+      "default": "./dist/tsdown/run.js"
     }
   },
   "imports": {
@@ -47,14 +89,45 @@
     "dist"
   ],
   "dependencies": {
+    "@oxc-project/types": "catalog:",
+    "debug": "catalog:",
     "oxfmt": "catalog:",
     "oxlint": "catalog:",
     "oxlint-tsgolint": "catalog:",
     "postcss": "^8.5.6",
-    "tsdown": "catalog:",
+    "semver": "catalog:",
+    "tree-kill": "^1.2.2",
     "vitepress": "catalog:",
     "vitest": "catalog:"
   },
+  "peerDependencies": {
+    "@arethetypeswrong/core": "^0.18.1",
+    "publint": "^0.3.0",
+    "typescript": "^5.0.0",
+    "unplugin-lightningcss": "^0.4.0",
+    "unplugin-unused": "^0.5.0",
+    "unrun": "^0.2.1"
+  },
+  "peerDependenciesMeta": {
+    "@arethetypeswrong/core": {
+      "optional": true
+    },
+    "publint": {
+      "optional": true
+    },
+    "typescript": {
+      "optional": true
+    },
+    "unplugin-lightningcss": {
+      "optional": true
+    },
+    "unplugin-unused": {
+      "optional": true
+    },
+    "unrun": {
+      "optional": true
+    }
+  },
   "devDependencies": {
     "@babel/parser": "^7.28.4",
     "@napi-rs/cli": "catalog:",
@@ -73,7 +146,8 @@
     "rolldown": "workspace:*",
     "rolldown-plugin-dts": "catalog:",
     "rollup-plugin-license": "^3.6.0",
-    "tinyglobby": "^0.2.15"
+    "tinyglobby": "^0.2.15",
+    "tsdown": "catalog:"
   },
   "napi": {
     "binaryName": "vite-plus",