fix: move to packages/rolldown

rolldown · Mar 20, 2024 · cf844b1 · cf844b1
1 parent 872d974
commit cf844b1
Show file tree

Hide file tree

Showing 20 changed files with 29 additions and 101 deletions.
diff --git a/.ls-lint.yml b/.ls-lint.yml
@@ -13,7 +13,6 @@ ignore:
  - 'crates/rolldown/tests/fixtures/**/_test.js' # `_test.js` is a special file, which will be treat as the entry file while executing the build output of fixture.
  - packages/rolldown/build.config.ts # convention name for using unbuild
  - packages/rolldown/vitest.config.ts
- - packages/cli/test/**/*.test.js
  - web/docs/.vitepress/cache # cache files generated by vitepress
  # FIXME: should not ignore following folders
  - web
diff --git a/packages/cli/bin/cli.js b/packages/cli/bin/cli.js
diff --git a/packages/cli/lib/utils.js b/packages/cli/lib/utils.js
diff --git a/packages/cli/package.json b/packages/cli/package.json
diff --git a/packages/cli/test/fixtures/package.json b/packages/cli/test/fixtures/package.json
diff --git a/packages/cli/test/utils.test.js b/packages/cli/test/utils.test.js
diff --git a/packages/rolldown/bin/cli.js b/packages/rolldown/bin/cli.js
@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+import('../cli/main.js')
diff --git a/packages/cli/lib/config.js → packages/rolldown/cli/config.js b/packages/cli/lib/config.js → packages/rolldown/cli/config.js
diff --git a/packages/cli/lib/errors.js → packages/rolldown/cli/errors.js b/packages/cli/lib/errors.js → packages/rolldown/cli/errors.js
@@ -1,3 +1,2 @@
-export const ERR_CLI_META_DATA = 'cli meta data error'
 export const ERR_UNSUPPORTED_CONFIG_FORMAT =
  "Unsupported config format. please use '.js', '.mjs' and '.ts' format"
diff --git a/packages/cli/lib/main.js → packages/rolldown/cli/main.js b/packages/cli/lib/main.js → packages/rolldown/cli/main.js
@@ -1,11 +1,6 @@
 import { defineCommand, runMain, showUsage } from 'citty'
 import { colors } from 'consola/utils'
-import path from 'node:path'
-import { URL } from 'node:url'
-import { getPackageJSON } from './utils.js'
-
-const __dirname = path.dirname(new URL(import.meta.url).pathname)
-const { version, description } = getPackageJSON(path.resolve(__dirname, '..'))
+import pkgJson from '../package.json' assert { type: 'json' }
 
 /**
  * NOTE:
@@ -16,8 +11,8 @@ const { version, description } = getPackageJSON(path.resolve(__dirname, '..'))
 const main = defineCommand({
  meta: {
  name: 'rolldown',
- version,
- description,
+ version: pkgJson.version,
+ description: pkgJson.description,
  },
  args: {
  config: {

diff --git a/packages/rolldown/package.json b/packages/rolldown/package.json
@@ -13,9 +13,14 @@
  "rolldown"
  ],
  "files": [
+ "bin",
  "dist",
  "!dist/*.node"
  ],
+ "bin": {
+ "rolldown": "./bin/cli.js"
+ },
+ "type": "module",
  "main": "./dist/index.cjs",
  "types": "./dist/index.d.ts",
  "exports": {
@@ -61,6 +66,11 @@
  "armv7-linux-androideabi"
  ]
  },
+ "dependencies": {
+ "citty": "^0.1.6",
+ "consola": "^3.2.3",
+ "jiti": "^1.21.0"
+ },
  "devDependencies": {
  "@napi-rs/cli": "^3.0.0-alpha.43",
  "colorette": "^2.0.20",

diff --git a/packages/cli/test/config.test.js → packages/rolldown/test/config.test.js b/packages/cli/test/config.test.js → packages/rolldown/test/config.test.js
@@ -1,9 +1,8 @@
-import assert from 'node:assert'
-import { describe, test } from 'node:test'
+import { describe, test, assert } from 'vitest'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
-import { loadConfig } from '../lib/config.js'
-import { ERR_UNSUPPORTED_CONFIG_FORMAT } from '../lib/errors.js'
+import { loadConfig } from '../cli/config.js'
+import { ERR_UNSUPPORTED_CONFIG_FORMAT } from '../cli/errors.js'
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 

diff --git a/...ges/cli/test/fixtures/rolldown.config.cjs → ...olldown/test/fixtures/rolldown.config.cjs b/...ges/cli/test/fixtures/rolldown.config.cjs → ...olldown/test/fixtures/rolldown.config.cjs
diff --git a/...ages/cli/test/fixtures/rolldown.config.js → ...rolldown/test/fixtures/rolldown.config.js b/...ages/cli/test/fixtures/rolldown.config.js → ...rolldown/test/fixtures/rolldown.config.js
diff --git a/...es/cli/test/fixtures/rolldown.config.json → ...lldown/test/fixtures/rolldown.config.json b/...es/cli/test/fixtures/rolldown.config.json → ...lldown/test/fixtures/rolldown.config.json
diff --git a/...ges/cli/test/fixtures/rolldown.config.mjs → ...olldown/test/fixtures/rolldown.config.mjs b/...ges/cli/test/fixtures/rolldown.config.mjs → ...olldown/test/fixtures/rolldown.config.mjs
diff --git a/...ages/cli/test/fixtures/rolldown.config.ts → ...rolldown/test/fixtures/rolldown.config.ts b/...ages/cli/test/fixtures/rolldown.config.ts → ...rolldown/test/fixtures/rolldown.config.ts
diff --git a/packages/cli/test/fixtures/transform.ts → packages/rolldown/test/fixtures/transform.ts b/packages/cli/test/fixtures/transform.ts → packages/rolldown/test/fixtures/transform.ts
diff --git a/packages/rolldown/vitest.config.mts b/packages/rolldown/vitest.config.mts
@@ -2,7 +2,7 @@ import { defineConfig } from 'vitest/config'
 
 export default defineConfig({
  test: {
- include: ['./test/runner.ts'],
+ include: ['./test/runner.ts', './test/*.test.js'],
  testTimeout: 20000,
  },
  esbuild: {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml