fix:コンフリクト解消 #12

Kyutech-C3 · Jun 28, 2023 · 6d25ebc · 6d25ebc
2 parents 7fcf1ea + 2bbd994
commit 6d25ebc
Show file tree

Hide file tree

Showing 57 changed files with 2,349 additions and 1,508 deletions.
diff --git a/_templates/generator/new/component.stories.tsx.t b/_templates/generator/new/component.stories.tsx.t
@@ -1,8 +1,7 @@
 ---
 to: <%= abs_path %>/<%=name%>.stories.tsx
 ---
-import { ComponentStory, ComponentMeta } from "@storybook/react";
-import React from "react";
+import { Meta, StoryObj } from "@storybook/react";
 
 import { <%= name %> } from "./<%= name %>";
 
@@ -15,12 +14,10 @@ export default {
   },
   argTypes: {
   },
-} as ComponentMeta<typeof <%= name %>>;
+} as Meta<typeof <%= name %>>;
 
-const Template: ComponentStory<typeof <%= name %>> = (<% if (have_props) { %> args  <% } %>) => <<%= name %> <% if (have_props) { %> {...args}  <% } %> />;
-export const Default = Template.bind({});
-Default.args = {
-<% if (have_props) { %>
-  str: "Hello, storybook!",
-<%}%>
-};
+export const Default: StoryObj<typeof <%= name %>> = {<% if (have_props) { %>
+  args:{
+    str: "Hello, storybook!",
+  }
+<%}%>};
diff --git a/package.json b/package.json
@@ -37,28 +37,30 @@
         "swr": "^2.1.5",
         "three": "^0.153.0",
         "three-stdlib": "^2.23.10",
-        "typescript": "<4.8.0"
+        "typescript": "<4.8.0",
+        "uuid": "^9.0.0"
     },
     "volta": {
         "node": "19.7.0"
     },
     "devDependencies": {
         "@babel/core": "^7.21.0",
-        "@storybook/addon-essentials": "^7.0.0-beta.55",
-        "@storybook/addon-interactions": "^7.0.0-beta.55",
-        "@storybook/addon-links": "^7.0.0-beta.55",
-        "@storybook/blocks": "^7.0.0-alpha.8",
-        "@storybook/nextjs": "^7.0.0-beta.55",
-        "@storybook/react": "^7.0.0-beta.55",
+        "@storybook/addon-essentials": "^7.0.22",
+        "@storybook/addon-interactions": "^7.0.22",
+        "@storybook/addon-links": "^7.0.22",
+        "@storybook/blocks": "^7.0.22",
+        "@storybook/nextjs": "^7.0.22",
+        "@storybook/react": "^7.0.22",
         "@types/react-infinite-scroller": "^1.2.3",
+        "@types/uuid": "^9.0.2",
         "babel-loader": "^8.3.0",
         "eslint-config-next": "13.2.1",
         "eslint-plugin-jsx-a11y": "^6.7.1",
         "eslint-plugin-react": "^7.32.2",
         "eslint-plugin-react-hooks": "^4.6.0",
-        "eslint-plugin-storybook": "^0.6.11",
+        "eslint-plugin-storybook": "^0.6.12",
         "file-loader": "^6.2.0",
         "hygen": "^6.2.11",
-        "storybook": "^7.0.0-beta.55"
+        "storybook": "^7.0.22"
     }
 }