From e5702c69160cd00bd54c828ae2c8641255aa2d36 Mon Sep 17 00:00:00 2001
From: hemengke <23536175@qq.com>
Date: Tue, 30 Apr 2024 18:40:18 +0800
Subject: [PATCH] chore: release

---
 .npmrc                                        |  0
 package.json                                  |  2 +-
 packages/istanbul-widget/CHANGELOG.md         |  6 +++
 packages/istanbul-widget/bundle.d.ts          |  1 +
 packages/istanbul-widget/dev.tsx              |  2 +-
 packages/istanbul-widget/package.json         | 22 ++++++---
 .../istanbul-widget/src/components/index.ts   |  1 +
 packages/istanbul-widget/tsup.config.ts       | 24 +++++++---
 .../vite-plugin-istanbul-widget/CHANGELOG.md  |  8 ++++
 .../vite-plugin-istanbul-widget/package.json  |  2 +-
 .../src/astro/index.ts                        |  2 +-
 .../src/utils/index.ts                        |  4 +-
 patches/vite-plugin-istanbul@6.0.0.patch      |  6 +--
 pnpm-lock.yaml                                | 46 +++++++++++++++++--
 14 files changed, 102 insertions(+), 24 deletions(-)
 create mode 100644 .npmrc
 create mode 100644 packages/istanbul-widget/bundle.d.ts
 create mode 100644 packages/istanbul-widget/src/components/index.ts

diff --git a/.npmrc b/.npmrc
new file mode 100644
index 0000000..e69de29
diff --git a/package.json b/package.json
index 8739399..42672df 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "istanbul",
     "istanbul-toolkit",
     "coverage",
-    "vite"
+    "nyc"
   ],
   "license": "MIT",
   "repository": {
diff --git a/packages/istanbul-widget/CHANGELOG.md b/packages/istanbul-widget/CHANGELOG.md
index 5bfdc72..ba38f5b 100644
--- a/packages/istanbul-widget/CHANGELOG.md
+++ b/packages/istanbul-widget/CHANGELOG.md
@@ -1,5 +1,11 @@
 # istanbul-widget
 
+## 1.5.1
+
+### Patch Changes
+
+- fix: es bundle less mode ts alias
+
 ## 1.5.0
 
 ### Minor Changes
diff --git a/packages/istanbul-widget/bundle.d.ts b/packages/istanbul-widget/bundle.d.ts
new file mode 100644
index 0000000..f4b6488
--- /dev/null
+++ b/packages/istanbul-widget/bundle.d.ts
@@ -0,0 +1 @@
+export * from './dist/istanbul-widget'
diff --git a/packages/istanbul-widget/dev.tsx b/packages/istanbul-widget/dev.tsx
index 72fa6fc..8081b90 100644
--- a/packages/istanbul-widget/dev.tsx
+++ b/packages/istanbul-widget/dev.tsx
@@ -1,4 +1,4 @@
-import { Button } from './src/components/ui'
+import { Button } from './src/components'
 import { IstanbulWidget } from './src/istanbul-widget'
 
 function ReactPlugin() {
diff --git a/packages/istanbul-widget/package.json b/packages/istanbul-widget/package.json
index e95d935..d4d3ea2 100644
--- a/packages/istanbul-widget/package.json
+++ b/packages/istanbul-widget/package.json
@@ -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"
     },
     "./*": "./*"
   },
@@ -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"
   }
 }
diff --git a/packages/istanbul-widget/src/components/index.ts b/packages/istanbul-widget/src/components/index.ts
new file mode 100644
index 0000000..ed58495
--- /dev/null
+++ b/packages/istanbul-widget/src/components/index.ts
@@ -0,0 +1 @@
+export * from './ui'
diff --git a/packages/istanbul-widget/tsup.config.ts b/packages/istanbul-widget/tsup.config.ts
index 8ae3d3b..a02711b 100644
--- a/packages/istanbul-widget/tsup.config.ts
+++ b/packages/istanbul-widget/tsup.config.ts
@@ -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'
 
@@ -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
@@ -133,7 +134,9 @@ 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
@@ -141,21 +144,30 @@ const esmBundleless = (option: Options): Options => ({
         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),
diff --git a/packages/vite-plugin-istanbul-widget/CHANGELOG.md b/packages/vite-plugin-istanbul-widget/CHANGELOG.md
index 25f9364..521801a 100644
--- a/packages/vite-plugin-istanbul-widget/CHANGELOG.md
+++ b/packages/vite-plugin-istanbul-widget/CHANGELOG.md
@@ -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
diff --git a/packages/vite-plugin-istanbul-widget/package.json b/packages/vite-plugin-istanbul-widget/package.json
index 27b6d57..c374dc6 100644
--- a/packages/vite-plugin-istanbul-widget/package.json
+++ b/packages/vite-plugin-istanbul-widget/package.json
@@ -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",
diff --git a/packages/vite-plugin-istanbul-widget/src/astro/index.ts b/packages/vite-plugin-istanbul-widget/src/astro/index.ts
index 629e0db..72e8936 100644
--- a/packages/vite-plugin-istanbul-widget/src/astro/index.ts
+++ b/packages/vite-plugin-istanbul-widget/src/astro/index.ts
@@ -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}`
diff --git a/packages/vite-plugin-istanbul-widget/src/utils/index.ts b/packages/vite-plugin-istanbul-widget/src/utils/index.ts
index 7d2d679..da5eeb9 100644
--- a/packages/vite-plugin-istanbul-widget/src/utils/index.ts
+++ b/packages/vite-plugin-istanbul-widget/src/utils/index.ts
@@ -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)})`,
diff --git a/patches/vite-plugin-istanbul@6.0.0.patch b/patches/vite-plugin-istanbul@6.0.0.patch
index 07a7448..af0db0a 100644
--- a/patches/vite-plugin-istanbul@6.0.0.patch
+++ b/patches/vite-plugin-istanbul@6.0.0.patch
@@ -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'.`)}`
@@ -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(
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8473863..c1613a3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6,7 +6,7 @@ settings:
 
 patchedDependencies:
   vite-plugin-istanbul@6.0.0:
-    hash: p6l4itvaj2j2zykm76quocjzbm
+    hash: p2tl43ds32rdbxssgiow2i7vam
     path: patches/vite-plugin-istanbul@6.0.0.patch
 
 importers:
@@ -231,6 +231,9 @@ importers:
       fast-glob:
         specifier: ^3.3.2
         version: 3.3.2
+      istanbul-widget:
+        specifier: 'link: ./'
+        version: 'link: .'
       npm-run-all:
         specifier: ^4.1.5
         version: 4.1.5
@@ -249,6 +252,9 @@ importers:
       tailwindcss-rem-to-px:
         specifier: ^0.1.0
         version: 0.1.0
+      tsc-alias:
+        specifier: ^1.8.8
+        version: 1.8.8
       vite:
         specifier: ^5.0.8
         version: 5.2.8(@types/node@20.12.5)
@@ -263,7 +269,7 @@ importers:
         version: link:../istanbul-widget
       vite-plugin-istanbul:
         specifier: ^6.0.0
-        version: 6.0.0(patch_hash=p6l4itvaj2j2zykm76quocjzbm)(vite@5.2.8)
+        version: 6.0.0(patch_hash=p2tl43ds32rdbxssgiow2i7vam)(vite@5.2.8)
     devDependencies:
       '@types/node':
         specifier: ^20.11.30
@@ -5659,6 +5665,11 @@ packages:
     engines: {node: '>= 6'}
     dev: true
 
+  /commander@9.5.0:
+    resolution: {integrity: sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==}
+    engines: {node: ^12.20.0 || >=14}
+    dev: true
+
   /common-ancestor-path@1.0.1:
     resolution: {integrity: sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w==}
 
@@ -9535,6 +9546,11 @@ packages:
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: false
 
+  /mylas@2.1.13:
+    resolution: {integrity: sha512-+MrqnJRtxdF+xngFfUUkIMQrUUL0KsxbADUkn23Z/4ibGg192Q+z+CQyiYwvWTsYjJygmMR8+w3ZDa98Zh6ESg==}
+    engines: {node: '>=12.0.0'}
+    dev: true
+
   /mz@2.7.0:
     resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==}
     dependencies:
@@ -10223,6 +10239,13 @@ packages:
       mlly: 1.6.1
       pathe: 1.1.2
 
+  /plimit-lit@1.6.1:
+    resolution: {integrity: sha512-B7+VDyb8Tl6oMJT9oSO2CW8XC/T4UcJGrwOVoNGwOQsQYhlpfajmrMj5xeejqaASq3V/EqThyOeATEOMuSEXiA==}
+    engines: {node: '>=12'}
+    dependencies:
+      queue-lit: 1.5.2
+    dev: true
+
   /pluralize@8.0.0:
     resolution: {integrity: sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==}
     engines: {node: '>=4'}
@@ -10672,6 +10695,11 @@ packages:
       side-channel: 1.0.6
     dev: false
 
+  /queue-lit@1.5.2:
+    resolution: {integrity: sha512-tLc36IOPeMAubu8BkW8YDBV+WyIgKlYU7zUNs0J5Vk9skSZ4JfGlPOqplP0aHdfv7HL0B2Pg6nwiq60Qc6M2Hw==}
+    engines: {node: '>=12'}
+    dev: true
+
   /queue-microtask@1.2.3:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
 
@@ -12306,6 +12334,18 @@ packages:
     resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==}
     dev: true
 
+  /tsc-alias@1.8.8:
+    resolution: {integrity: sha512-OYUOd2wl0H858NvABWr/BoSKNERw3N9GTi3rHPK8Iv4O1UyUXIrTTOAZNHsjlVpXFOhpJBVARI1s+rzwLivN3Q==}
+    hasBin: true
+    dependencies:
+      chokidar: 3.6.0
+      commander: 9.5.0
+      globby: 11.1.0
+      mylas: 2.1.13
+      normalize-path: 3.0.0
+      plimit-lit: 1.6.1
+    dev: true
+
   /tsconfck@3.0.3(typescript@5.4.5):
     resolution: {integrity: sha512-4t0noZX9t6GcPTfBAbIbbIU4pfpCwh0ueq3S4O/5qXI1VwK1outmxhe9dOiEWqMz3MW2LKgDTpqWV+37IWuVbA==}
     engines: {node: ^18 || >=20}
@@ -12901,7 +12941,7 @@ packages:
       unist-util-stringify-position: 4.0.0
       vfile-message: 4.0.2
 
-  /vite-plugin-istanbul@6.0.0(patch_hash=p6l4itvaj2j2zykm76quocjzbm)(vite@5.2.8):
+  /vite-plugin-istanbul@6.0.0(patch_hash=p2tl43ds32rdbxssgiow2i7vam)(vite@5.2.8):
     resolution: {integrity: sha512-Vwh2XdesjcLwaPbHSOiWHh+0s7CNovQTPEjUCTkqmJUe0FN2TKsOp0qpoaklOuwrKlL9elhD5fPFxi5lmG62zA==}
     peerDependencies:
       vite: '>=4 <=6'