update paths

bherbruck · May 21, 2024 · 88f1bb9 · 88f1bb9
1 parent 0bc9d57
commit 88f1bb9
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 31 deletions.
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "dev": "vite dev",
     "build": "vite build",
     "preview": "vite preview",
-    "package": "svelte-kit sync && svelte-package && publint",
+    "package": "svelte-kit sync && svelte-package -i ./src/lib/svelte-echarts && publint",
     "prepublishOnly": "npm run package",
     "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
     "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",

diff --git a/src/lib/index.ts b/src/lib/index.ts
diff --git a/src/lib/components/Chart.svelte → ...ib/svelte-echarts/components/Chart.svelte b/src/lib/components/Chart.svelte → ...ib/svelte-echarts/components/Chart.svelte
@@ -3,7 +3,7 @@
   import type { init as coreInit, EChartsType as CoreEchartsType } from 'echarts/core'
   import type { EChartsOption, EChartsInitOpts } from 'echarts'
   import { createEventDispatcher } from 'svelte'
-  import { EVENT_NAMES, type EventHandlers } from '$lib/constants/events'
+  import { EVENT_NAMES, type EventHandlers } from '$lib/svelte-echarts/constants/events'
   import type { Action } from 'svelte/action'
 
   export let init: typeof baseInit | typeof coreInit

diff --git a/src/lib/constants/events.ts → src/lib/svelte-echarts/constants/events.ts b/src/lib/constants/events.ts → src/lib/svelte-echarts/constants/events.ts
diff --git a/src/lib/svelte-echarts/index.ts b/src/lib/svelte-echarts/index.ts
@@ -0,0 +1,2 @@
+export { default as Chart } from '$lib/svelte-echarts/components/Chart.svelte'
+export type { ECMouseEvent, ECInteractionEvent } from '$lib/svelte-echarts/constants/events'
diff --git a/src/lib/types.ts → src/lib/svelte-echarts/types.ts b/src/lib/types.ts → src/lib/svelte-echarts/types.ts
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { onMount } from 'svelte'
-  import { Chart } from '$lib'
-  import type { ECMouseEvent } from '$lib/constants/events'
+  import { Chart, type ECMouseEvent } from 'svelte-echarts'
 
   import { init, use } from 'echarts/core'
   import type { EChartsOption } from 'echarts'
@@ -53,14 +52,12 @@
     data = randomData(7, 100)
   }
 
-  let interval: number
-
   const handleClick = ({ detail }: CustomEvent<ECMouseEvent>) => {
     alert(`${detail.name} ${detail.value}`)
   }
 
   onMount(() => {
-    interval = setInterval(updateData, 10000)
+    const interval = setInterval(updateData, 10000)
     return () => clearInterval(interval)
   })
 </script>

diff --git a/src/routes/examples/classic/+page.svelte b/src/routes/examples/classic/+page.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { onMount } from 'svelte'
-  import { Chart } from '$lib'
-  import type { ECMouseEvent } from '$lib/constants/events'
+  import { Chart } from 'svelte-echarts'
 
   import { init } from 'echarts'
   import type { EChartsOption } from 'echarts'
@@ -34,14 +33,8 @@
     data = randomData(7, 100)
   }
 
-  let interval: number
-
-  const handleClick = ({ detail }: CustomEvent<ECMouseEvent>) => {
-    alert(`${detail.name} ${detail.value}`)
-  }
-
   onMount(() => {
-    interval = setInterval(updateData, 10000)
+    const interval = setInterval(updateData, 10000)
     return () => clearInterval(interval)
   })
 </script>
@@ -50,4 +43,4 @@
   <title>Classic Example - svelte-echarts</title>
 </svelte:head>
 
-<Chart {init} {options} on:click={handleClick} />
+<Chart {init} {options} />
diff --git a/src/routes/examples/tree-shaking/+page.svelte b/src/routes/examples/tree-shaking/+page.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { onMount } from 'svelte'
-  import { Chart } from '$lib'
-  import type { ECMouseEvent } from '$lib/constants/events'
+  import { Chart } from 'svelte-echarts'
 
   import { init, use } from 'echarts/core'
   import type { EChartsOption } from 'echarts'
@@ -53,14 +52,8 @@
     data = randomData(7, 100)
   }
 
-  let interval: number
-
-  const handleClick = ({ detail }: CustomEvent<ECMouseEvent>) => {
-    alert(`${detail.name} ${detail.value}`)
-  }
-
   onMount(() => {
-    interval = setInterval(updateData, 10000)
+    const interval = setInterval(updateData, 10000)
     return () => clearInterval(interval)
   })
 </script>
@@ -69,4 +62,4 @@
   <title>Tree-shaking | svelte-echarts</title>
 </svelte:head>
 
-<Chart {init} {options} on:click={handleClick} />
+<Chart {init} {options} />
diff --git a/svelte.config.js b/svelte.config.js
@@ -10,6 +10,10 @@ const config = {
       precompress: false,
       strict: false,
     }),
+    alias: {
+      'svelte-echarts': './src/lib/svelte-echarts',
+      'svelte-echarts/*': './src/lib/svelte-echarts/*',
+    },
   },
 }
 

diff --git a/test/Chart.test.ts → tests/Chart.test.ts b/test/Chart.test.ts → tests/Chart.test.ts
@@ -1,7 +1,7 @@
 import { describe, it, expect, vi, beforeAll } from 'vitest'
 import { render, screen } from '@testing-library/svelte'
 import { queryHelpers } from '@testing-library/dom'
-import { Chart } from '../src/lib'
+import { Chart } from '$lib/svelte-echarts'
 import * as echarts from 'echarts/core'
 import type { EChartsOption } from 'echarts'
 import { BarChart } from 'echarts/charts'

diff --git a/vite.config.ts b/vite.config.ts
@@ -4,6 +4,6 @@ import { defineConfig } from 'vitest/config'
 export default defineConfig({
   plugins: [sveltekit()],
   test: {
-    include: ['src/**/*.{test,spec}.{js,ts}'],
+    include: ['tests/**/*.{test,spec}.{js,ts,svelte}'],
   },
 })
diff --git a/vitest.config.ts b/vitest.config.ts
@@ -10,6 +10,7 @@ export default defineConfig({
   resolve: {
     alias: {
       $lib: '/src/lib',
+      'svelte-echarts': '/src/lib/svelte-echarts',
     },
   },
 })