Merge pull request #41 from zernonia/use-unbuild

chore: update bundler to unbuild
zernonia · May 9, 2023 · 4879d8a · 4879d8a · vercel · May 9, 2023
2 parents 1e6b447 + 435f7f7
commit 4879d8a
Show file tree

Hide file tree

Showing 25 changed files with 1,106 additions and 1,900 deletions.
diff --git a/build.config.ts b/build.config.ts
@@ -0,0 +1,16 @@
+import { resolve } from "path";
+import { defineBuildConfig } from "unbuild";
+
+export default defineBuildConfig({
+  entries: [
+    { builder: "mkdist", input: "./src/" },
+    { builder: "mkdist", input: "./src/", format: "cjs", ext: "js" },
+  ],
+
+  alias: {
+    "@": resolve(__dirname, "./src"),
+  },
+
+  declaration: true,
+  clean: true,
+});
diff --git a/demo/vue/src/env.d.ts b/demo/vue/src/env.d.ts
diff --git a/env.d.ts b/env.d.ts
@@ -0,0 +1,5 @@
+declare module "*.vue" {
+  import { DefineComponent } from "vue";
+  const component: DefineComponent<{}, {}, any>;
+  export default component;
+}
diff --git a/nuxt/plugin.ts b/nuxt/plugin.ts
@@ -1,13 +1,13 @@
-import VueNotion from "vue3-notion"
-import { getPageBlocks, getPageTable } from "vue3-notion"
-import { defineNuxtPlugin } from "#app"
+import VueNotion from "vue3-notion";
+import { getPageBlocks, getPageTable } from "vue3-notion";
+import { defineNuxtPlugin } from "#app";
 
 export default defineNuxtPlugin(({ vueApp }) => {
-  const notion = { getPageBlocks, getPageTable }
-  vueApp.use(VueNotion)
+  const notion = { getPageBlocks, getPageTable };
+  vueApp.use(VueNotion);
   return {
     provide: {
       notion,
     },
-  }
-})
+  };
+});
diff --git a/package.json b/package.json
@@ -4,13 +4,13 @@
   "description": "Vue 3 Unofficial Notion Renderer",
   "homepage": "https://vue3-notion.vercel.app/",
   "repository": "github:zernonia/vue3-notion",
-  "main": "./dist/index.umd.js",
-  "module": "./dist/index.es.js",
+  "type": "module",
+  "main": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
-      "import": "./dist/index.es.js",
-      "require": "./dist/index.umd.js"
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.js"
     },
     "./nuxt": {
       "require": "./nuxt/index.ts",
@@ -22,11 +22,8 @@
     }
   },
   "files": [
-    "dist/**/*.ts",
-    "dist/**/*.js",
-    "dist/**/*.d.ts",
-    "dist/*.css",
-    "nuxt/*.ts"
+    "dist",
+    "nuxt"
   ],
   "keywords": [
     "vue",
@@ -37,45 +34,30 @@
   ],
   "license": "MIT",
   "scripts": {
-    "dev": "vite -c vite-dev.config.ts",
-    "dev:build": "vue-tsc --noEmit && vite build -c vite-dev.config.ts",
-    "build": "vue-tsc --noEmit && vite build && rollup -c",
-    "build:rollup": "rollup -c",
-    "build:types": "vue-tsc --noEmit",
+    "dev": "vite serve playground",
+    "dev:build": "vite build playground",
+    "build": "unbuild",
     "preview": "vite preview",
     "version": " git add -A src",
     "postversion": "git push && git push --tags",
     "deploy": "npm run build && npm version patch && npm publish"
   },
   "dependencies": {
-    "@nuxt/kit": "^3.0.0-rc.1",
+    "@nuxt/kit": "^3.4.3",
     "@vueuse/core": "^8.7.5",
     "katex": "^0.15.1",
-    "pathe": "^0.2.0",
     "prismjs": "^1.25.0",
     "vue": "^3.2.26",
     "vue-router": "4"
   },
   "devDependencies": {
-    "@rollup/plugin-alias": "^3.1.8",
-    "@rollup/plugin-commonjs": "^21.0.2",
-    "@rollup/plugin-node-resolve": "^13.1.3",
-    "@rollup/plugin-replace": "^3.0.0",
     "@types/katex": "^0.11.1",
     "@types/node": "^17.0.5",
     "@types/prismjs": "^1.16.6",
-    "@vitejs/plugin-vue": "^2.0.0",
-    "postcss": "^8.4.5",
-    "rollup": "^2.62.0",
-    "rollup-plugin-peer-deps-external": "^2.2.4",
-    "rollup-plugin-postcss": "^4.0.2",
-    "rollup-plugin-typescript": "^1.0.1",
-    "rollup-plugin-vue": "^6.0.0",
-    "tslib": "^2.3.1",
-    "typescript": "^4.4.4",
-    "vite": "^2.9.7",
-    "vite-plugin-dts": "^0.9.10",
-    "vue-tsc": "^0.34.11"
+    "@vitejs/plugin-vue": "^4.2.1",
+    "typescript": "^5.0.4",
+    "unbuild": "^1.2.1",
+    "vite": "^4.3.5"
   },
   "peerDependencies": {
     "katex": "^0.15.1",

diff --git a/playground/App.vue b/playground/App.vue
@@ -0,0 +1,5 @@
+<template>
+  <div id="app">
+    <router-view :key="$route.params.id?.toString()"></router-view>
+  </div>
+</template>
diff --git a/src/assets/logo.png → playground/assets/logo.png b/src/assets/logo.png → playground/assets/logo.png
diff --git a/index.html → playground/index.html b/index.html → playground/index.html
@@ -8,6 +8,6 @@
   </head>
   <body>
     <div id="app"></div>
-    <script type="module" src="/src/main.ts"></script>
+    <script type="module" src="/main.ts"></script>
   </body>
 </html>
diff --git a/playground/main.ts b/playground/main.ts
@@ -0,0 +1,6 @@
+import { createApp } from "vue";
+import App from "./App.vue";
+import { router } from "./router";
+import "@/style.css";
+
+createApp(App).use(router).mount("#app");
diff --git a/public/favicon.ico → playground/public/favicon.ico b/public/favicon.ico → playground/public/favicon.ico
diff --git a/src/router/index.ts → playground/router/index.ts b/src/router/index.ts → playground/router/index.ts
diff --git a/playground/tsconfig.json b/playground/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "types": ["vite/client"]
+  }
+}
diff --git a/src/view/Index.vue → playground/view/Index.vue b/src/view/Index.vue → playground/view/Index.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import { NotionRenderer } from "../components"
-import { useGetPageBlocks } from "../lib/composables"
-import { mapPageUrl, pageLinkOptions } from "../lib/props"
+import { NotionRenderer } from "@/components";
+import { useGetPageBlocks } from "@/lib/composables";
+import { mapPageUrl, pageLinkOptions } from "@/lib/props";
 
 // const blockMap = ref()
 
@@ -13,7 +13,7 @@ import { mapPageUrl, pageLinkOptions } from "../lib/props"
 //   blockMap.value = await getPageBlocks("4b2dc28a5df74034a943f8c8e639066a")
 // })
 
-const { data: blockMap } = useGetPageBlocks("4b2dc28a5df74034a943f8c8e639066a")
+const { data: blockMap } = useGetPageBlocks("4b2dc28a5df74034a943f8c8e639066a");
 </script>
 
 <template>
@@ -28,4 +28,3 @@ const { data: blockMap } = useGetPageBlocks("4b2dc28a5df74034a943f8c8e639066a")
     />
   </div>
 </template>
-
diff --git a/src/view/Page.vue → playground/view/Page.vue b/src/view/Page.vue → playground/view/Page.vue
@@ -1,15 +1,15 @@
 <script setup lang="ts">
-import { NotionRenderer } from "../components"
-import { getPageBlocks } from "../lib/api"
-import { onMounted, ref } from "vue"
-import { useRoute } from "vue-router"
-import { mapPageUrl, pageLinkOptions } from "../lib/props"
+import { NotionRenderer } from "@/components";
+import { getPageBlocks } from "@/lib/api";
+import { onMounted, ref } from "vue";
+import { useRoute } from "vue-router";
+import { mapPageUrl, pageLinkOptions } from "@/lib/props";
 
-const route = useRoute()
-const blockMap = ref()
+const route = useRoute();
+const blockMap = ref();
 onMounted(async () => {
-  blockMap.value = await getPageBlocks(route.params.id as string)
-})
+  blockMap.value = await getPageBlocks(route.params.id as string);
+});
 </script>
 
 <template>
@@ -24,4 +24,3 @@ onMounted(async () => {
     />
   </div>
 </template>
-
diff --git a/playground/vite.config.ts b/playground/vite.config.ts
@@ -0,0 +1,13 @@
+import path from "path";
+import { defineConfig } from "vite";
+import vue from "@vitejs/plugin-vue";
+
+// https://vitejs.dev/config/
+export default defineConfig({
+  plugins: [vue()],
+  resolve: {
+    alias: {
+      "@": path.resolve(__dirname, "../src"),
+    },
+  },
+});
diff --git a/shim/vue.d.ts b/shim/vue.d.ts
diff --git a/src/App.vue b/src/App.vue
diff --git a/src/components/notion-renderer.vue b/src/components/notion-renderer.vue
@@ -1,20 +1,19 @@
 <script setup lang="ts">
-import { defineNotionProps, useNotionBlock } from "@/lib/blockable"
-import NotionBlock from "@/components/block.vue"
+import { defineNotionProps, useNotionBlock } from "@/lib/blockable";
+import NotionBlock from "@/components/block.vue";
 
-import "prismjs/themes/prism.css"
-import "katex/dist/katex.min.css"
-import { computed } from "vue"
+import "prismjs/themes/prism.css";
+import "katex/dist/katex.min.css";
 
-const props = defineProps({ ...defineNotionProps })
+const props = defineProps({ ...defineNotionProps });
 //@ts-ignore
-const { pass, block } = useNotionBlock(props)
+const { pass, block } = useNotionBlock(props);
 </script>
 
 <script lang="ts">
 export default {
   name: "NotionRenderer",
-}
+};
 </script>
 
 <template>

diff --git a/src/env.d.ts b/src/env.d.ts
diff --git a/src/index.ts b/src/index.ts
@@ -1,24 +1,24 @@
-import { App } from "vue"
-import * as components from "@/components/index"
+import { App } from "vue";
+import * as components from "./components";
 
 // Default export is library as a whole, registered via Vue.use()
 export default {
   install: (app: App) => {
     Object.entries(components).forEach(([componentName, component]) => {
-      app.component(componentName, component)
-    })
+      app.component(componentName, component);
+    });
   },
-}
+};
 
 // To allow individual component use, export components
 // each can be registered via Vue.component()
-export * from "@/components/index"
+export * from "./components";
 
 // export additional js methods
-export * from "@/lib/api"
+export * from "./lib/api";
 
 // export types
-export * from "@/lib/types"
+export * from "./lib/types";
 
 // export composables
-export * from "@/lib/composables"
+export * from "./lib/composables";
diff --git a/src/main.ts b/src/main.ts
diff --git a/tsconfig.json b/tsconfig.json
@@ -11,13 +11,11 @@
     "esModuleInterop": true,
     "declaration": true,
     "lib": ["esnext", "dom"],
-    "types": ["vite/client", "web-bluetooth"],
     "baseUrl": ".",
-    "outDir": "dist",
     "paths": {
       "@/*": ["src/*"]
     }
   },
-  "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.vue", "shim/*.d.ts"],
-  "exclude": ["src/router/index.ts", "src/lib/props.ts", "src/main.ts", "src/env.d.ts"]
+
+  "include": ["src/**/*.ts", "src/**/*.vue", "playground/**/*.ts", "playground/**/*.vue"]
 }
diff --git a/vite-dev.config.ts b/vite-dev.config.ts
diff --git a/vite.config.ts b/vite.config.ts