feat: upgrade Astro to v4, vite v5 and storyblok/astro v4 (#94)

edvinasjurele · web-flow · commit 10d2f3f5fa34 · 2023-12-20T16:31:21.000+02:00
Signed-off-by: Edvinas Jurele &lt;edvinas.j@nordsec.com&gt;
diff --git a/demo/package.json b/demo/package.json
@@ -12,8 +12,8 @@
     "try": "npm run build & npm run preview"
   },
   "dependencies": {
-    "@storyblok/astro": "^3.0.1",
-    "astro": "^3.2.3"
+    "@storyblok/astro": "^4.0.0",
+    "astro": "^4.0.6"
   },
   "stackblitz": {
     "startCommand": "npm run start-stackblitz"
diff --git a/demo/src/layouts/Layout.astro b/demo/src/layouts/Layout.astro
@@ -6,7 +6,7 @@ export interface Props {
 const { title } = Astro.props;
 ---
 
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
@@ -25,7 +25,14 @@ const { title } = Astro.props;
     background-color: #f6f6f6;
   }
   code {
-    font-family: Menlo, Monaco, Lucida Console, Liberation Mono,
-      DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace;
+    font-family:
+      Menlo,
+      Monaco,
+      Lucida Console,
+      Liberation Mono,
+      DejaVu Sans Mono,
+      Bitstream Vera Sans Mono,
+      Courier New,
+      monospace;
   }
 </style>
diff --git a/lib/package.json b/lib/package.json
@@ -19,6 +19,7 @@
   },
   "license": "MIT",
   "author": "Edvinas Jurele",
+  "type": "module",
   "exports": {
     ".": {
       "import": "./dist/index.mjs",
@@ -42,7 +43,7 @@
     "build": "vite build",
     "dev": "vite build --watch",
     "prepublishOnly": "npm run build && cp ../README.md ./",
-    "test": "npm run test:unit && npm run lint && npm run ts:check",
+    "test": "npm run test:unit && npm run ts:check",
     "test:unit": "vitest run",
     "test:watch": "vitest watch",
     "ts:check": "tsc"
@@ -52,16 +53,19 @@
     "@semantic-release/git": "^10.0.1",
     "@semantic-release/github": "^9.0.3",
     "@semantic-release/npm": "^10.0.4",
-    "@storyblok/js": "^2.1.3",
-    "astro": "^2.7.0",
+    "@storyblok/js": "^3.0.0",
+    "astro": "^4.0.6",
     "semantic-release": "^21.1.1",
-    "vite": "^4.3.1",
-    "vite-plugin-dts": "^2.3.0"
+    "vite": "^5.0.10",
+    "vite-plugin-dts": "^3.6.4"
   },
-  "publishConfig": {
-    "access": "public"
+  "peerDependencies": {
+    "astro": "^3.0.0 || ^4.0.0"
   },
   "volta": {
     "node": "18.12.1"
+  },
+  "publishConfig": {
+    "access": "public"
   }
 }
diff --git a/lib/src/utils/resolveRichTextToNodes.spec.ts b/lib/src/utils/resolveRichTextToNodes.spec.ts
@@ -848,7 +848,7 @@ describe("resolveMark", () => {
             blue: "this-is-blue",
             red: "this-is-red",
             pink: "this-is-pink",
-          }[color]);
+          })[color];
 
         return {
           props: {
diff --git a/lib/src/utils/resolveRichTextToNodes.ts b/lib/src/utils/resolveRichTextToNodes.ts
@@ -1,4 +1,4 @@
-import {
+import type {
   ComponentNode,
   Mark,
   Options,
diff --git a/lib/tsconfig.json b/lib/tsconfig.json
@@ -8,5 +8,5 @@
   "extends": "astro/tsconfigs/base",
   "$schema": "https://json.schemastore.org/tsconfig",
   "include": ["./*.astro", "./**/*.ts"],
-  "exclude": ["node_modules/*", "./vite-plugin-*.ts", "dist"]
+  "exclude": ["node_modules/*", "./vite*.ts", "dist"]
 }
diff --git a/lib/vite.config.ts b/lib/vite.config.ts
@@ -16,7 +16,6 @@ export default defineConfig(() => {
     plugins: [
       dts({
         outputDir: "dist/types",
-        skipDiagnostics: false,
       }) as unknown as Plugin,
     ],
   };
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/tsconfig.json b/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import {`
	`1`	`+import type {`
`2`	`2`	`ComponentNode,`
`3`	`3`	`Mark,`
`4`	`4`	`Options,`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,5 @@`
`8`	`8`	`"extends": "astro/tsconfigs/base",`
`9`	`9`	`"$schema": "https://json.schemastore.org/tsconfig",`
`10`	`10`	`"include": ["./.astro", ".//.ts"],`
`11`		`- "exclude": ["node_modules/", "./vite-plugin-.ts", "dist"]`
	`11`	`+ "exclude": ["node_modules/", "./vite.ts", "dist"]`
`12`	`12`	`}`