Merge pull request #83 from crashmax-dev/refactor-svelte

crashmax-dev · web-flow · commit 204a72c40a32 · 2022-10-04T23:16:41.000+08:00
refactor(packages/svelte): reinit svelte proejct, bump dependencies
diff --git a/examples/basic/package.json b/examples/basic/package.json
@@ -11,6 +11,6 @@
     "fireworks-js": "workspace:*"
   },
   "devDependencies": {
-    "typescript": "4.7.4"
+    "typescript": "^4.8.4"
   }
 }
diff --git a/examples/with-angular/package.json b/examples/with-angular/package.json
@@ -19,7 +19,7 @@
     "@angular/router": "^14.0.0",
     "@fireworks-js/angular": "workspace:*",
     "rxjs": "~7.5.0",
-    "tslib": "^2.3.0",
+    "tslib": "^2.2.1",
     "zone.js": "~0.11.4"
   },
   "devDependencies": {
diff --git a/examples/with-preact/package.json b/examples/with-preact/package.json
@@ -9,10 +9,10 @@
   },
   "dependencies": {
     "@fireworks-js/preact": "workspace:*",
-    "preact": "10.10.0"
+    "preact": "10.11.0"
   },
   "devDependencies": {
-    "@preact/preset-vite": "2.3.0",
-    "typescript": "4.7.4"
+    "@preact/preset-vite": "2.4.0",
+    "typescript": "4.8.4"
   }
 }
diff --git a/examples/with-react/package.json b/examples/with-react/package.json
@@ -13,9 +13,9 @@
     "react-dom": "18.2.0"
   },
   "devDependencies": {
-    "@types/react": "18.0.15",
+    "@types/react": "18.0.21",
     "@types/react-dom": "18.0.6",
-    "@vitejs/plugin-react": "2.0.0",
-    "typescript": "4.7.4"
+    "@vitejs/plugin-react": "2.1.0",
+    "typescript": "4.8.4"
   }
 }
diff --git a/examples/with-solid/package.json b/examples/with-solid/package.json
@@ -9,10 +9,10 @@
   },
   "dependencies": {
     "@fireworks-js/solid": "workspace:*",
-    "solid-js": "1.4.7"
+    "solid-js": "1.5.7"
   },
   "devDependencies": {
-    "typescript": "4.7.4",
-    "vite-plugin-solid": "2.3.0"
+    "typescript": "4.8.4",
+    "vite-plugin-solid": "2.3.9"
   }
 }
diff --git a/examples/with-svelte/package.json b/examples/with-svelte/package.json
@@ -11,13 +11,13 @@
   },
   "dependencies": {
     "@fireworks-js/svelte": "workspace:*",
-    "svelte": "3.49.0"
+    "svelte": "3.50.1"
   },
   "devDependencies": {
-    "@sveltejs/vite-plugin-svelte": "1.0.1",
+    "@sveltejs/vite-plugin-svelte": "1.0.8",
     "@tsconfig/svelte": "3.0.0",
-    "svelte-check": "2.8.0",
+    "svelte-check": "2.9.1",
     "svelte-preprocess": "4.10.7",
-    "typescript": "4.7.4"
+    "typescript": "4.8.4"
   }
 }
diff --git a/examples/with-vue/package.json b/examples/with-vue/package.json
@@ -8,10 +8,10 @@
   },
   "dependencies": {
     "@fireworks-js/vue": "workspace:*",
-    "vue": "3.2.37"
+    "vue": "3.2.40"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "3.0.0",
-    "typescript": "4.7.4"
+    "@vitejs/plugin-vue": "3.1.2",
+    "typescript": "4.8.4"
   }
 }
diff --git a/examples/with-web-components/package.json b/examples/with-web-components/package.json
@@ -11,6 +11,6 @@
     "@fireworks-js/web": "workspace:*"
   },
   "devDependencies": {
-    "typescript": "4.7.4"
+    "typescript": "4.8.4"
   }
 }
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "description": "A simple fireworks library!",
   "homepage": "https://fireworks.js.org",
   "scripts": {
-    "dev": "turbo run dev --filter='./packages/fireworks-js'",
+    "dev": "turbo run dev --filter='./packages/*'",
     "build": "turbo run build --filter='./packages/*'",
     "dev:website": "turbo run dev --filter='./website'",
     "build:website": "turbo run build --filter='./website'",
@@ -43,7 +43,7 @@
   "devDependencies": {
     "@crashmax/prettier-config": "^2.0.4",
     "@crashmax/tsconfig": "1.0.2",
-    "@types/node": "18.8.0",
+    "@types/node": "18.8.1",
     "del-cli": "5.0.0",
     "tsx": "3.9.0",
     "turbo": "1.5.5",
diff --git a/packages/preact/package.json b/packages/preact/package.json
@@ -43,14 +43,13 @@
   "scripts": {
     "dev": "vite build --watch",
     "build": "vite build && tsc",
-    "types": "tsc",
     "prepublishOnly": "pnpm build"
   },
   "dependencies": {
     "fireworks-js": "workspace:2.2.1"
   },
   "devDependencies": {
-    "@preact/preset-vite": "2.3.0",
+    "@preact/preset-vite": "2.2.1",
     "preact": "10.10.0"
   },
   "peerDependencies": {
diff --git a/packages/solid/package.json b/packages/solid/package.json
@@ -48,7 +48,7 @@
   },
   "devDependencies": {
     "solid-js": "1.4.7",
-    "vite-plugin-solid": "2.3.0"
+    "vite-plugin-solid": "2.2.1"
   },
   "peerDependencies": {
     "solid-js": ">=1.0.0"
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
@@ -2,16 +2,8 @@
 	"name": "@fireworks-js/svelte",
 	"version": "2.2.1",
 	"type": "module",
-	"description": "A simple fireworks library!",
+  "description": "A simple fireworks library!",
 	"homepage": "https://fireworks.js.org",
-	"types": "./dist/index.d.ts",
-	"svelte": "./dist/index.js",
-	"files": [
-		"dist"
-	],
-	"exports": {
-		".": "./dist/index.js"
-	},
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/crashmax-dev/fireworks-js.git"
@@ -32,25 +24,22 @@
 		"url": "https://github.com/crashmax-dev/fireworks-js/issues"
 	},
 	"scripts": {
-		"dev": "vite dev",
-		"build": "svelte-kit package && del-cli ./dist/package.json ./dist/README.md",
-		"prepare": "svelte-kit sync",
-		"check": "svelte-check --tsconfig ./tsconfig.json",
-		"check:watch": "svelte-check --tsconfig ./tsconfig.json --watch",
-		"prepublishOnly": "pnpm build"
-	},
-	"dependencies": {
-		"fireworks-js": "workspace:2.2.1",
-		"svelte": "3.49.0"
+		"dev": "vite dev --port 8081 --open",
+		"build": "svelte-kit sync && svelte-package",
+    "prepublishOnly": "pnpm build"
 	},
+  "dependencies": {
+    "fireworks-js": "workspace:2.2.1"
+  },
 	"devDependencies": {
-		"@sveltejs/kit": "1.0.0-next.392",
-		"@sveltejs/vite-plugin-svelte": "1.0.1",
-		"svelte-check": "2.8.0",
-		"svelte-preprocess": "4.10.7",
-		"svelte2tsx": "0.5.12"
-	},
-	"peerDependencies": {
-		"svelte": ">=3.0.0"
+		"@sveltejs/adapter-auto": "next",
+		"@sveltejs/kit": "next",
+		"@sveltejs/package": "next",
+		"svelte": "^3.44.0",
+		"svelte-check": "^2.7.1",
+		"svelte-preprocess": "^4.10.6",
+		"tslib": "^2.3.1",
+		"typescript": "^4.7.4",
+		"vite": "^3.1.0"
 	}
 }
diff --git a/packages/svelte/src/app.d.ts b/packages/svelte/src/app.d.ts
@@ -0,0 +1,11 @@
+/// <reference types="@sveltejs/kit" />
+
+// See https://kit.svelte.dev/docs/types#app
+// for information about these interfaces
+// and what to do when importing types
+declare namespace App {
+  // interface Locals {}
+  // interface PageData {}
+  // interface Error {}
+  // interface Platform {}
+}
diff --git a/packages/svelte/src/app.html b/packages/svelte/src/app.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta charset="utf-8" />
+		<link rel="icon" href="%sveltekit.assets%/favicon.png" />
+		<meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>@fireworks-js/svelte</title>
+		%sveltekit.head%
+	</head>
+	<body>
+		<div>%sveltekit.body%</div>
+	</body>
+</html>
diff --git a/packages/svelte/src/lib/fireworks.svelte b/packages/svelte/src/lib/fireworks.svelte
@@ -17,7 +17,7 @@
   })
 
   onDestroy(() => {
-    fireworks.stop()
+    fireworks?.stop()
   })
 </script>
 
diff --git a/packages/svelte/src/routes/+page.svelte b/packages/svelte/src/routes/+page.svelte
@@ -0,0 +1,34 @@
+<script lang="ts">
+  import { Fireworks } from '../lib'
+  import type { FireworksOptions } from '../lib'
+
+  let enabled = true
+  let options: FireworksOptions = {
+    opacity: 0.5
+  }
+</script>
+
+<main>
+  <button on:click={() => (enabled = !enabled)} class="btn">
+    {enabled ? 'Enabled' : 'Disabled'}
+  </button>
+  {#if enabled}
+    <Fireworks {options} class="fireworks" />
+  {/if}
+</main>
+
+<style>
+  :global(.fireworks) {
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    background: #000;
+  }
+
+  .btn {
+    position: absolute;
+    z-index: 1;
+  }
+</style>
diff --git a/packages/svelte/src/shim.d.ts b/packages/svelte/src/shim.d.ts
diff --git a/packages/svelte/svelte.config.js b/packages/svelte/svelte.config.js
@@ -1,16 +1,16 @@
 import preprocess from 'svelte-preprocess'
+import adapter from '@sveltejs/adapter-auto'
 
 /** @type {import('@sveltejs/kit').Config} */
 const config = {
   // Consult https://github.com/sveltejs/svelte-preprocess
   // for more information about preprocessors
   preprocess: preprocess(),
   kit: {
-    package: {
-      dir: 'dist',
-      emitTypes: true,
-      exports: (fp) => fp === 'index.ts'
-    }
+    adapter: adapter()
+  },
+  package: {
+    dir: 'dist'
   }
 }
 
diff --git a/packages/svelte/vite.config.ts b/packages/svelte/vite.config.ts
@@ -1,7 +1,7 @@
+import type { UserConfig } from 'vite'
 import { sveltekit } from '@sveltejs/kit/vite'
 
-/** @type {import('vite').UserConfig} */
-const config = {
+const config: UserConfig = {
   plugins: [sveltekit()]
 }
 
diff --git a/packages/web/package.json b/packages/web/package.json
@@ -31,7 +31,6 @@
   "scripts": {
     "dev": "vite build --watch",
     "build": "del-cli dist && vite build && tsc",
-    "serve": "vite preview",
     "prepublishOnly": "pnpm build"
   },
   "dependencies": {
diff --git a/packages/web/src/index.ts b/packages/web/src/index.ts
@@ -47,8 +47,7 @@ class Fireworks extends HTMLElement {
 
     const style = this.getAttribute('style')
     if (style) {
-      this.shadowRoot!.querySelector('style')!
-        .textContent = `div { ${style} }`
+      this.shadowRoot!.querySelector('style')!.textContent = `div { ${style} }`
     }
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/turbo.json b/turbo.json
diff --git a/website/package.json b/website/package.json

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,6 @@`
`11`	`11`	`"fireworks-js": "workspace:*"`
`12`	`12`	`},`
`13`	`13`	`"devDependencies": {`
`14`		`- "typescript": "4.7.4"`
	`14`	`+ "typescript": "^4.8.4"`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,10 @@`
`9`	`9`	`},`
`10`	`10`	`"dependencies": {`
`11`	`11`	`"@fireworks-js/preact": "workspace:*",`
`12`		`- "preact": "10.10.0"`
	`12`	`+ "preact": "10.11.0"`
`13`	`13`	`},`
`14`	`14`	`"devDependencies": {`
`15`		`- "@preact/preset-vite": "2.3.0",`
`16`		`- "typescript": "4.7.4"`
	`15`	`+ "@preact/preset-vite": "2.4.0",`
	`16`	`+ "typescript": "4.8.4"`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@`
`13`	`13`	`"react-dom": "18.2.0"`
`14`	`14`	`},`
`15`	`15`	`"devDependencies": {`
`16`		`- "@types/react": "18.0.15",`
	`16`	`+ "@types/react": "18.0.21",`
`17`	`17`	`"@types/react-dom": "18.0.6",`
`18`		`- "@vitejs/plugin-react": "2.0.0",`
`19`		`- "typescript": "4.7.4"`
	`18`	`+ "@vitejs/plugin-react": "2.1.0",`
	`19`	`+ "typescript": "4.8.4"`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,10 @@`
`8`	`8`	`},`
`9`	`9`	`"dependencies": {`
`10`	`10`	`"@fireworks-js/vue": "workspace:*",`
`11`		`- "vue": "3.2.37"`
	`11`	`+ "vue": "3.2.40"`
`12`	`12`	`},`
`13`	`13`	`"devDependencies": {`
`14`		`- "@vitejs/plugin-vue": "3.0.0",`
`15`		`- "typescript": "4.7.4"`
	`14`	`+ "@vitejs/plugin-vue": "3.1.2",`
	`15`	`+ "typescript": "4.8.4"`
`16`	`16`	`}`
`17`	`17`	`}`