Skip to content

Commit

Permalink
chore: release
Browse files Browse the repository at this point in the history
  • Loading branch information
hemengke1997 committed Apr 30, 2024
1 parent 02b32a7 commit e5702c6
Show file tree
Hide file tree
Showing 14 changed files with 102 additions and 24 deletions.
Empty file added .npmrc
Empty file.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"istanbul",
"istanbul-toolkit",
"coverage",
"vite"
"nyc"
],
"license": "MIT",
"repository": {
Expand Down
6 changes: 6 additions & 0 deletions packages/istanbul-widget/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# istanbul-widget

## 1.5.1

### Patch Changes

- fix: es bundle less mode ts alias

## 1.5.0

### Minor Changes
Expand Down
1 change: 1 addition & 0 deletions packages/istanbul-widget/bundle.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './dist/istanbul-widget'
2 changes: 1 addition & 1 deletion packages/istanbul-widget/dev.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Button } from './src/components/ui'
import { Button } from './src/components'
import { IstanbulWidget } from './src/istanbul-widget'

function ReactPlugin() {
Expand Down
22 changes: 16 additions & 6 deletions packages/istanbul-widget/package.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,33 @@
{
"name": "istanbul-widget",
"version": "1.5.0",
"version": "1.5.1",
"type": "module",
"files": [
"**"
"components.d.ts",
"dist",
"lib.d.ts"
],
"main": "./dist/es/istanbul-widget.js",
"main": "./dist/istanbul-widget.lib.js",
"module": "./dist/es/istanbul-widget.js",
"types": "./dist/istanbul-widget.d.ts",
"exports": {
"./package.json": "./package.json",
".": {
"types": "./dist/istanbul-widget.d.ts",
"require": "./dist/istanbul-widget.lib.js",
"import": "./dist/es/istanbul-widget.js",
"default": "./dist/istanbul-widget.esm.js"
"default": "./dist/es/istanbul-widget.js"
},
"./components": {
"types": "./component.d.ts",
"import": "./dist/es/components/ui/index.js",
"default": "./dist/es/components/ui/index.js"
"import": "./dist/es/components/index.js",
"default": "./dist/es/components/index.js"
},
"./lib": {
"types": "./dist/istanbul-widget.d.ts",
"require": "./dist/istanbul-widget.lib.js",
"import": "./dist/istanbul-widget.lib.js",
"default": "./dist/istanbul-widget.lib.js"
},
"./*": "./*"
},
Expand Down Expand Up @@ -75,6 +84,7 @@
"strip-dirs": "^3.0.0",
"tailwindcss": "3.2.7",
"tailwindcss-rem-to-px": "^0.1.0",
"tsc-alias": "^1.8.8",
"vite": "^5.0.8"
}
}
1 change: 1 addition & 0 deletions packages/istanbul-widget/src/components/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './ui'
24 changes: 18 additions & 6 deletions packages/istanbul-widget/tsup.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import glob from 'fast-glob'
import fs from 'node:fs'
import path from 'node:path'
import stripDirs from 'strip-dirs'
import { replaceTscAliasPaths } from 'tsc-alias'
import { type Options, defineConfig } from 'tsup'
import pkg from './package.json'

Expand Down Expand Up @@ -101,10 +102,10 @@ const common = (option: Options): Options => ({
},
})

const esmBundle = (option: Options): Options => ({
const lib = (option: Options): Options => ({
format: 'esm',
entry: {
'istanbul-widget.esm': 'src/istanbul-widget.ts',
'istanbul-widget.lib': 'src/istanbul-widget.ts',
},
dts: option.watch
? false
Expand Down Expand Up @@ -133,29 +134,40 @@ const iife = (_option: Options): Options => ({
dts: false,
})

const esmBundleless = (option: Options): Options => ({
const esOutDir = 'dist/es'

const es = (option: Options): Options => ({
entry: ['src/**/*.{ts,tsx,css}'],
dts: option.watch
? false
: {
entry: getEntry('src/**/*.{ts,tsx}'),
},
format: 'esm',
outDir: 'dist/es',
outDir: esOutDir,
bundle: false,
outExtension: () => ({ js: '.js' }),
esbuildPlugins: [fileSuffixPlugin('esm')],
splitting: false,
minify: false,
skipNodeModulesBundle: true,
async onSuccess() {
replaceTscAliasPaths({
configFile: './tsconfig.json',
outDir: esOutDir,
})
},
})

export default defineConfig((option) => {
return [
{
...common(option),
...esmBundleless(option),
...es(option),
},
{
...common(option),
...esmBundle(option),
...lib(option),
},
{
...common(option),
Expand Down
8 changes: 8 additions & 0 deletions packages/vite-plugin-istanbul-widget/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# vite-plugin-istanbul-widget

## 1.5.2

### Patch Changes

- update istanbul-widget import path
- Updated dependencies
- istanbul-widget@1.5.1

## 1.5.1

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/vite-plugin-istanbul-widget/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vite-plugin-istanbul-widget",
"version": "1.5.1",
"version": "1.5.2",
"type": "module",
"main": "./dist/index.cjs",
"module": "./dist/index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/vite-plugin-istanbul-widget/src/astro/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export function istanbulWidget(opts: VitePluginIstanbulWidgetOptions): any {
transform(code, id) {
if (opts.istanbulWidgetConfig !== false) {
if (id === 'astro:scripts/page.js') {
const { script } = resolveInlineScript('esm', opts.istanbulWidgetConfig)
const { script } = resolveInlineScript('lib', opts.istanbulWidgetConfig)

code = /*js*/ `${script}
\n${code}`
Expand Down
4 changes: 2 additions & 2 deletions packages/vite-plugin-istanbul-widget/src/utils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ export function getCommitId() {
}
}

export function resolveInlineScript(mode: 'esm' | 'min', config: IstanbulWidgetOptions) {
export function resolveInlineScript(mode: 'lib' | 'min', config: IstanbulWidgetOptions) {
const require = createRequire(import.meta.url)

const istanbulWidgetPath = path.join(path.dirname(require.resolve('istanbul-widget')), `istanbul-widget.${mode}.js`)

const map = {
esm: {
lib: {
src: istanbulWidgetPath,
script: /*js*/ `import { IstanbulWidget } from "${istanbulWidgetPath}";
new IstanbulWidget(${serialize(config)})`,
Expand Down
6 changes: 3 additions & 3 deletions patches/vite-plugin-istanbul@6.0.0.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/dist/index.cjs b/dist/index.cjs
index e552163df832aa02286da63d90b6a83dfd3fc392..cbd46bddd202e4a329bea55ae3f93ab3f61229ec 100644
index e552163df832aa02286da63d90b6a83dfd3fc392..4fb5258d4500e8ba0346ee5639655cc729342902 100644
--- a/dist/index.cjs
+++ b/dist/index.cjs
@@ -182,6 +182,9 @@ To hide this message set build.sourcemap to true, 'inline' or 'hidden'.`)}`
Expand All @@ -13,14 +13,14 @@ index e552163df832aa02286da63d90b6a83dfd3fc392..cbd46bddd202e4a329bea55ae3f93ab3
srcCode,
filename,
diff --git a/dist/index.mjs b/dist/index.mjs
index 34e886906b6527286eae6978ce6e73bde396470f..b7bb82857dcd59eabc48271f1316bbc95006f504 100644
index 34e886906b6527286eae6978ce6e73bde396470f..6d224c417b00523d5ab7ddc7a4022f389e8cfd4b 100644
--- a/dist/index.mjs
+++ b/dist/index.mjs
@@ -162,6 +162,9 @@ To hide this message set build.sourcemap to true, 'inline' or 'hidden'.`)}`
const combinedSourceMap = sanitizeSourceMap(
this.getCombinedSourcemap()
);
+ combinedSourceMap.sources.forEach((_, index) => {
+ combinedSourceMap.sources.forEach((code, index) => {
+ combinedSourceMap.sources[index] = code.replace(/\?.*$/, '');
+ })
const code = instrumenter.instrumentSync(
Expand Down
46 changes: 43 additions & 3 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e5702c6

Please sign in to comment.