From 60286b93df99446b85ccb657a9a205620ec1e115 Mon Sep 17 00:00:00 2001 From: _Kerman Date: Sun, 6 Jul 2025 21:50:30 +0800 Subject: [PATCH] refactor!: emit esm only package --- demo/package.json | 2 +- demo/src/extension.ts | 2 +- demo/tsconfig.json | 2 +- demo/tsdown.config.ts | 4 ++-- packages/core/package.json | 5 ++--- packages/core/vite.config.ts | 2 +- packages/creator/package.json | 4 ++-- packages/creator/templates/package.ts | 4 ++-- packages/creator/templates/src.ts | 2 +- packages/creator/templates/tsconfig.ts | 2 +- packages/creator/templates/tsdownConfig.ts | 4 ++-- packages/creator/tsdown.config.ts | 2 +- packages/reactivity/package.json | 5 ++--- packages/reactivity/vite.config.ts | 2 +- packages/vueuse/package.json | 5 ++--- packages/vueuse/vite.config.ts | 2 +- 16 files changed, 23 insertions(+), 26 deletions(-) diff --git a/demo/package.json b/demo/package.json index 55a2867..0327af1 100644 --- a/demo/package.json +++ b/demo/package.json @@ -9,7 +9,7 @@ "categories": [ "Other" ], - "main": "./dist/extension.cjs", + "main": "./dist/extension.js", "engines": { "vscode": "^1.101.0" }, diff --git a/demo/src/extension.ts b/demo/src/extension.ts index 69c88d3..813181a 100644 --- a/demo/src/extension.ts +++ b/demo/src/extension.ts @@ -7,7 +7,7 @@ import { useDemoWebviewView } from './webviewView' const logger = useLogger('Reactive VSCode') -export = defineExtension(() => { +export const { activate, deactivate } = defineExtension(() => { logger.info('Extension Activated') logger.show() diff --git a/demo/tsconfig.json b/demo/tsconfig.json index f435862..97ac298 100644 --- a/demo/tsconfig.json +++ b/demo/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../tsconfig.base.json", "compilerOptions": { - "module": "Preserve", + "module": "ESNext", "strict": true }, "exclude": [ diff --git a/demo/tsdown.config.ts b/demo/tsdown.config.ts index 98c7467..fe4d329 100644 --- a/demo/tsdown.config.ts +++ b/demo/tsdown.config.ts @@ -2,8 +2,8 @@ import { defineConfig } from 'tsdown' export default defineConfig({ entry: ['src/extension.ts'], - format: ['cjs'], - target: 'node18', + format: ['esm'], + target: 'node20', minify: true, external: [ 'vscode', diff --git a/packages/core/package.json b/packages/core/package.json index 3f868e3..2cac463 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -55,11 +55,10 @@ "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.js", - "require": "./dist/index.cjs" + "import": "./dist/index.js" } }, - "main": "./dist/index.cjs", + "main": "./dist/index.js", "types": "./dist/index.d.ts" } } diff --git a/packages/core/vite.config.ts b/packages/core/vite.config.ts index 414de14..f6fa84c 100644 --- a/packages/core/vite.config.ts +++ b/packages/core/vite.config.ts @@ -31,7 +31,7 @@ export default defineConfig({ build: { lib: { entry: 'src/index.ts', - formats: ['es', 'cjs'], + formats: ['es'], fileName: 'index', }, rollupOptions: { diff --git a/packages/creator/package.json b/packages/creator/package.json index 6e236b9..36a78a6 100644 --- a/packages/creator/package.json +++ b/packages/creator/package.json @@ -16,11 +16,11 @@ "creator" ], "bin": { - "create-reactive-vscode": "./dist/index.cjs" + "create-reactive-vscode": "./dist/index.js" }, "files": [ "README.md", - "dist/index.cjs", + "dist/index.js", "template" ], "scripts": { diff --git a/packages/creator/templates/package.ts b/packages/creator/templates/package.ts index 986bbcc..a55e0ac 100644 --- a/packages/creator/templates/package.ts +++ b/packages/creator/templates/package.ts @@ -8,9 +8,9 @@ export default (publisher: string, identifier: string, displayName: string, core "categories": [ "Other" ], - "main": "./dist/extension.cjs", + "main": "./dist/extension.js", "engines": { - "vscode": "^1.89.0" + "vscode": "^1.100.0" }, "activationEvents": [ "onStartupFinished" diff --git a/packages/creator/templates/src.ts b/packages/creator/templates/src.ts index 6f39de2..2bde34d 100644 --- a/packages/creator/templates/src.ts +++ b/packages/creator/templates/src.ts @@ -4,7 +4,7 @@ import { window } from 'vscode' import { message } from './configs' import { logger } from './utils' -export = defineExtension(() => { +export const { activate, deactivate } = defineExtension(() => { logger.info('Extension Activated') useCommand('${identifier}.helloWorld', () => { diff --git a/packages/creator/templates/tsconfig.ts b/packages/creator/templates/tsconfig.ts index 76f1438..e062e6f 100644 --- a/packages/creator/templates/tsconfig.ts +++ b/packages/creator/templates/tsconfig.ts @@ -2,7 +2,7 @@ export default `{ "compilerOptions": { "target": "ES2022", "lib": ["ES2022"], - "module": "Preserve", + "module": "ESNext", "moduleResolution": "Bundler", "resolveJsonModule": true, "strict": true, diff --git a/packages/creator/templates/tsdownConfig.ts b/packages/creator/templates/tsdownConfig.ts index 384ecb9..91c4836 100644 --- a/packages/creator/templates/tsdownConfig.ts +++ b/packages/creator/templates/tsdownConfig.ts @@ -2,8 +2,8 @@ export default `import { defineConfig } from 'tsdown' export default defineConfig({ entry: ['src/extension.ts'], - format: ['cjs'], - target: 'node18', + format: ['esm'], + target: 'node20', minify: true, external: [ 'vscode', diff --git a/packages/creator/tsdown.config.ts b/packages/creator/tsdown.config.ts index 11d893f..d029ff3 100644 --- a/packages/creator/tsdown.config.ts +++ b/packages/creator/tsdown.config.ts @@ -3,7 +3,7 @@ import { defineConfig } from 'tsdown' export default defineConfig({ entry: ['./index.ts'], outDir: './dist', - format: ['cjs'], + format: ['esm'], target: 'node18', clean: true, minify: true, diff --git a/packages/reactivity/package.json b/packages/reactivity/package.json index 1ade0ef..27a692a 100644 --- a/packages/reactivity/package.json +++ b/packages/reactivity/package.json @@ -44,11 +44,10 @@ "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.js", - "require": "./dist/index.cjs" + "import": "./dist/index.js" } }, - "main": "./dist/index.cjs", + "main": "./dist/index.js", "types": "./dist/index.d.ts" } } diff --git a/packages/reactivity/vite.config.ts b/packages/reactivity/vite.config.ts index 3a80cca..021e46c 100644 --- a/packages/reactivity/vite.config.ts +++ b/packages/reactivity/vite.config.ts @@ -27,7 +27,7 @@ export default defineConfig({ build: { lib: { entry: 'src/index.ts', - formats: ['es', 'cjs'], + formats: ['es'], fileName: 'index', }, minify: false, diff --git a/packages/vueuse/package.json b/packages/vueuse/package.json index 70dabfc..46f331f 100644 --- a/packages/vueuse/package.json +++ b/packages/vueuse/package.json @@ -50,11 +50,10 @@ "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.js", - "require": "./dist/index.cjs" + "import": "./dist/index.js" } }, - "main": "./dist/index.cjs", + "main": "./dist/index.js", "types": "./dist/index.d.ts" } } diff --git a/packages/vueuse/vite.config.ts b/packages/vueuse/vite.config.ts index e0c2757..873ebd3 100644 --- a/packages/vueuse/vite.config.ts +++ b/packages/vueuse/vite.config.ts @@ -41,7 +41,7 @@ export default defineConfig({ build: { lib: { entry: 'src/index.ts', - formats: ['es', 'cjs'], + formats: ['es'], fileName: 'index', }, rollupOptions: {