Skip to content

chore: fix package export types #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
webfansplz merged 6 commits into from
Jan 28, 2024
Merged

chore: fix package export types #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f608b14
chore: fix package export types
brc-dd Jan 27, 2024
077a50a
Merge branch 'main' into fix-types
brc-dd Jan 27, 2024
272e4c1
build schema before others
brc-dd Jan 27, 2024
a949f5f
revert
brc-dd Jan 27, 2024
022dab6
revert
brc-dd Jan 27, 2024
af43351
remove schema from attw checks for now
brc-dd Jan 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,6 @@ docs/.vitepress/cache/

# for scripts
clones

.DS_Store
*.timestamp-*.*
5 changes: 4 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,11 @@
"dev:ui-play": "nr -C packages/ui-playground dev",
"prepare:type": "pnpm -r --filter='./packages/**' run prepare:type",
"dev": "NODE_OPTIONS=\"--max-old-space-size=8192\" nr prepare:type && nr build:ui && pnpm -r --parallel --filter='./packages/**' run stub",
"build": "pnpm -r --filter='./packages/{schema,shared,core,ui,devtools-kit,vite}' run build && pnpm build:client && pnpm build:overlay && pnpm build:browser-extension && pnpm build:electron && pnpm build:devtools && pnpm build:devtools-api",
"build": "pnpm build:schema && pnpm -r --filter='./packages/{shared,core,ui,devtools-kit,vite}' run build && pnpm build:client && pnpm build:overlay && pnpm build:browser-extension && pnpm build:electron && pnpm build:devtools && pnpm build:devtools-api",
"build:browser-extension": "nr -C packages/browser-extension build",
"lint": "eslint .",
"lint:fix": "eslint . --fix",
"lint:packages": "pnpm -r --filter='./packages/{core,devtools,devtools-api,devtools-kit,electron,shared}' exec publint && pnpm -r --filter='./packages/{core,devtools,devtools-api,devtools-kit,electron,shared}' exec attw --pack",
"prepublishOnly": "npm run build",
"release": "bumpp -r && nr build && pnpm -r publish --access public",
"release:beta": "bumpp -r && nr build && pnpm -r publish --access public --tag beta",
Expand All @@ -67,6 +68,7 @@
"devDependencies": {
"@antfu/eslint-config": "2.4.2",
"@antfu/ni": "^0.21.12",
"@arethetypeswrong/cli": "^0.13.6",
"@types/chrome": "^0.0.258",
"@types/degit": "^2.8.6",
"@types/fs-extra": "^11.0.4",
Expand All @@ -87,6 +89,7 @@
"npm-run-all": "^4.1.5",
"pnpm": "^8.14.3",
"progress": "^2.0.3",
"publint": "^0.2.7",
"readdir-glob": "^1.1.3",
"regex-extra": "^0.2.2",
"simple-git-hooks": "^2.9.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/browser-extension/tsup.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Options } from 'tsup'
import { defineConfig } from 'tsup'

export default <Options>{
export default defineConfig({
entryPoints: [
'src/*.ts',
],
Expand All @@ -17,4 +17,4 @@ export default <Options>{
format: ['iife'],
dts: true,
shims: true,
}
})
11 changes: 5 additions & 6 deletions packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,19 @@
"license": "MIT",
"exports": {
".": {
"import": "./dist/index.mjs",
"import": "./dist/index.js",
"require": "./dist/index.cjs"
},
"./server": {
"types": "./dist/server/index.d.ts",
"import": "./dist/server/index.mjs",
"import": "./dist/server/index.js",
"require": "./dist/server/index.cjs"
}
},
"main": "./dist/index.cjs",
"module": "./dist/index.mjs",
"types": "./dist/index.d.ts",
"module": "./dist/index.js",
"files": [
"dist"
"dist",
"server.d.ts"
],
"scripts": {
"build": "tsup --clean",
Expand Down
10 changes: 3 additions & 7 deletions packages/core/tsup.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
import type { Options } from 'tsup'
import { defineConfig } from 'tsup'

export default <Options>{
export default defineConfig({
entryPoints: [
'src/index.ts',
'src/server/index.ts',
],
esbuildOptions(options) {
if (options.format === 'esm')
options.outExtension = { '.js': '.mjs' }
},
external: [
'vue',
'node:fs/promises',
Expand All @@ -20,4 +16,4 @@ export default <Options>{
format: ['esm', 'cjs'],
dts: true,
shims: true,
}
})
6 changes: 2 additions & 4 deletions packages/devtools-api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,12 @@
},
"exports": {
".": {
"types": "./dist/index.d.ts",
"import": "./dist/index.mjs",
"import": "./dist/index.js",
"require": "./dist/index.cjs"
}
},
"main": "./dist/index.cjs",
"module": "./dist/index.mjs",
"types": "./dist/index.d.ts",
"module": "./dist/index.js",
"files": [
"dist"
],
Expand Down
10 changes: 3 additions & 7 deletions packages/devtools-api/tsup.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
import type { Options } from 'tsup'
import { defineConfig } from 'tsup'

export default <Options>{
export default defineConfig({
entryPoints: [
'src/index.ts',
],
esbuildOptions(options) {
if (options.format === 'esm')
options.outExtension = { '.js': '.mjs' }
},
external: [
'vue',
],
clean: true,
format: ['esm', 'cjs'],
dts: true,
shims: true,
}
})
6 changes: 2 additions & 4 deletions packages/devtools-kit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,12 @@
"license": "MIT",
"exports": {
".": {
"types": "./dist/index.d.ts",
"import": "./dist/index.mjs",
"import": "./dist/index.js",
"require": "./dist/index.cjs"
}
},
"main": "./dist/index.cjs",
"module": "./dist/index.mjs",
"types": "./dist/index.d.ts",
"module": "./dist/index.js",
"files": [
"dist"
],
Expand Down
10 changes: 3 additions & 7 deletions packages/devtools-kit/tsup.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
import type { Options } from 'tsup'
import { defineConfig } from 'tsup'

export default <Options>{
export default defineConfig({
entryPoints: [
'src/index.ts',
],
esbuildOptions(options) {
if (options.format === 'esm')
options.outExtension = { '.js': '.mjs' }
},
external: [
'vue',
],
Expand All @@ -16,4 +12,4 @@ export default <Options>{
format: ['esm', 'cjs'],
dts: true,
shims: true,
}
})
1 change: 1 addition & 0 deletions packages/devtools/hook.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './dist/hook'
12 changes: 5 additions & 7 deletions packages/devtools/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,22 @@
},
"exports": {
".": {
"types": "./dist/index.d.ts",
"import": "./dist/index.mjs",
"import": "./dist/index.js",
"require": "./dist/index.cjs"
},
"./hook": {
"types": "./dist/hook.d.ts",
"import": "./dist/hook.mjs",
"import": "./dist/hook.js",
"require": "./dist/hook.cjs"
}
},
"main": "./dist/index.cjs",
"module": "./dist/index.mjs",
"types": "./dist/index.d.ts",
"module": "./dist/index.js",
"bin": {
"vue-devtools": "./cli.mjs"
},
"files": [
"dist"
"dist",
"hook.d.ts"
],
"scripts": {
"build": "tsup --clean",
Expand Down
10 changes: 3 additions & 7 deletions packages/devtools/tsup.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
import type { Options } from 'tsup'
import { defineConfig } from 'tsup'

export default <Options>{
export default defineConfig({
entryPoints: [
'src/index.ts',
'src/hook.ts',
],
esbuildOptions(options) {
if (options.format === 'esm')
options.outExtension = { '.js': '.mjs' }
},
external: [
'vue',
],
clean: true,
format: ['esm', 'cjs'],
dts: true,
shims: true,
}
})
1 change: 1 addition & 0 deletions packages/electron/cli.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './dist/cli'
6 changes: 3 additions & 3 deletions packages/electron/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"license": "MIT",
"exports": {
".": {
"import": "./dist/index.mjs",
"import": "./dist/index.js",
"require": "./dist/index.cjs"
},
"./*": "./*",
Expand All @@ -16,10 +16,10 @@
}
},
"main": "dist/index.cjs",
"module": "dist/index.mjs",
"types": "dist/index.d.ts",
"module": "dist/index.js",
"files": [
"app.html",
"cli.d.ts",
"client",
"dist",
"icons"
Expand Down
7 changes: 4 additions & 3 deletions packages/electron/scripts/build.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import fs from 'node:fs/promises'
import { resolve as _resolve } from 'pathe'
import type { Options } from 'tsup'
import { build } from 'tsup'
Expand All @@ -12,9 +13,7 @@ const baseOptions = {
dts: true,
format: ['cjs', 'esm'],
esbuildOptions(options) {
if (options.format === 'esm')
options.outExtension = { '.js': '.mjs' }
else if (options.format === 'iife')
if (options.format === 'iife')
options.outExtension = { '.js': '.js' }
},
watch: enableWatch,
Expand All @@ -29,6 +28,8 @@ function resolve(path: string) {
}

async function buildBundle() {
await fs.rm(resolve('./dist'), { recursive: true, force: true })

unbuild('', enableWatch, {
declaration: true,
clean: false,
Expand Down
10 changes: 6 additions & 4 deletions packages/schema/global.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import type { BridgeInstanceType } from '../core/src/bridge/core'
import type { DevToolsContext } from './src/types/context'
import type { DevtoolsHook } from './src/types/hook'
import type { AppRecord, DevToolsState } from './src/types/vue'
Expand All @@ -7,9 +6,12 @@ import type { AppRecord, DevToolsState } from './src/types/vue'
declare global {
var __VUE_DEVTOOLS_GLOBAL_HOOK__: DevtoolsHook
var __VUE_DEVTOOLS_CLIENT_URL__: string
var __VUE_DEVTOOLS_BRIDGE__: BridgeInstanceType
var __VUE_DEVTOOLS_OVERLAY_BRIDGE__: BridgeInstanceType
var __VUE_DEVTOOLS_PANEL_BRIDGE__: BridgeInstanceType

// FIXME: the type should be BridgeInstanceType
var __VUE_DEVTOOLS_BRIDGE__: any
var __VUE_DEVTOOLS_OVERLAY_BRIDGE__: any
var __VUE_DEVTOOLS_PANEL_BRIDGE__: any

var __VUE_DEVTOOLS_CLIENT_CONNECTED__: boolean
// app record info
var __VUE_DEVTOOLS_APP_RECORDS__: AppRecord[]
Expand Down
4 changes: 2 additions & 2 deletions packages/schema/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
"sideEffects": false,
"exports": {
".": {
"import": "./dist/index.mjs",
"import": "./dist/index.js",
"require": "./dist/index.cjs"
}
},
"main": "./dist/index.cjs",
"module": "./dist/index.mjs",
"module": "./dist/index.js",
"types": "./types.d.ts",
"files": [
"**.d.ts",
Expand Down
10 changes: 3 additions & 7 deletions packages/schema/tsup.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
import type { Options } from 'tsup'
import { defineConfig } from 'tsup'

export default <Options>{
export default defineConfig({
entryPoints: [
'src/index.ts',
'src/types/index',
],
esbuildOptions(options) {
if (options.format === 'esm')
options.outExtension = { '.js': '.mjs' }
},
external: [
'vue',
],
format: ['esm', 'cjs'],
dts: true,
shims: true,
}
})
5 changes: 2 additions & 3 deletions packages/shared/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@
"license": "MIT",
"exports": {
".": {
"import": "./dist/index.mjs",
"import": "./dist/index.js",
"require": "./dist/index.cjs"
}
},
"main": "./dist/index.cjs",
"module": "./dist/index.mjs",
"types": "./dist/index.d.cts",
"module": "./dist/index.js",
"files": [
"dist"
],
Expand Down
10 changes: 3 additions & 7 deletions packages/shared/tsup.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
import type { Options } from 'tsup'
import { defineConfig } from 'tsup'

export default <Options>{
export default defineConfig({
entryPoints: [
'src/index.ts',
],
esbuildOptions(options) {
if (options.format === 'esm')
options.outExtension = { '.js': '.mjs' }
},
clean: true,
format: ['esm', 'cjs'],
dts: true,
shims: true,
noExternal: ['rfdc'],
}
})
Loading