Commit: 34d689fcb75666164d3e82e1121ffb4f278657d1 - v_luncher_client (git)

varius official platform source code.

Commit MetaInfo

• Revision: 34d689fcb75666164d3e82e1121ffb4f278657d1 (tree)
• Zeit: 2023-04-02 20:49:19
• Autor: NknightA <n.knight.pc0627@gmai...>
• Commiter: NknightA

Log Message

fix

Ändern Zusammenfassung

• modified: .gitignore
• add: docs/readmap.md
• delete: node_modules/.cache/storybook/dev-server/325c8f456729b912b0d2134054eb7448-5608341ec09d3d75fd946188791fdbd1
• add: pacakages/server/package.json
• modified: package-lock.json
• modified: package.json
• modified: storybooks/.gitignore
• add: storybooks/.storybook/main.js
• add: storybooks/.storybook/preview.js
• modified: storybooks/yarn.lock
• add: yarn.lock

Diff

--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,6 @@
 .idea/
-node_modules/
\ No newline at end of file
+<<<<<<< HEAD
+node_modules/
+=======
+node_modules/
+>>>>>>> 6b85a0c4214fd9311c23b0f7d24b582be62d4690

--- /dev/null
+++ b/docs/readmap.md
@@ -0,0 +1,7 @@
+# Future Development Activities
+
+Consolidate the current disparate npm projects into a single package.json file.
+
+Organize dependencies so that individual npm packages in the main repo do not have conflicting dependencies.
+
+[OSDN official wiki](https://osdn.net/projects/projectv/wiki/FrontPage)
\ No newline at end of file

--- a/node_modules/.cache/storybook/dev-server/325c8f456729b912b0d2134054eb7448-5608341ec09d3d75fd946188791fdbd1
+++ /dev/null
@@ -1 +0,0 @@
-{"value":1679639717650,"type":"Number"}
\ No newline at end of file

--- /dev/null
+++ b/pacakages/server/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "server",
+  "version": "0.4.36",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC"
+}

--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,16 @@
 {
   "name": "v",
+<<<<<<< HEAD
   "version": "0.4.46",
+=======
+  "version": "0.4.36",
+>>>>>>> 6b85a0c4214fd9311c23b0f7d24b582be62d4690
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "v",
+<<<<<<< HEAD
       "version": "0.4.46",
       "license": "ISC",
       "workspaces": [
@@ -9825,6 +9830,21 @@
         "webpack-cli": "^5.0.1",
         "webpack-node-externals": "^3.0.0"
       }
+=======
+      "version": "0.4.36",
+      "license": "ISC",
+      "workspaces": [
+        "pacakages/server"
+      ]
+    },
+    "node_modules/server": {
+      "resolved": "pacakages/server",
+      "link": true
+    },
+    "pacakages/server": {
+      "version": "0.4.36",
+      "license": "ISC"
+>>>>>>> 6b85a0c4214fd9311c23b0f7d24b582be62d4690
     }
   }
 }

--- a/package.json
+++ b/package.json
@@ -1,12 +1,20 @@
 {
   "name": "v",
+<<<<<<< HEAD
   "version": "0.4.46",
   "description": "all new metaverse coding, creating, and change lifestyle.",
   "main": "index.js",
+=======
+  "version": "0.4.36",
+  "private": "true",
+  "description": "all new metaverse coding, creating, and change lifestyle.",
+  "main": "main.js",
+>>>>>>> 6b85a0c4214fd9311c23b0f7d24b582be62d4690
   "directories": {
     "doc": "docs"
   },
   "scripts": {
+<<<<<<< HEAD
     "server:start": "npm run dev --prefix server",
     "server:build": "npm run build --prefix server",
     "server:pre-build": "npm run pre-build --prefix server"
@@ -24,3 +32,14 @@
   }
 }
  
+=======
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "workspaces": [
+    "pacakages/server"
+  ]
+}
+>>>>>>> 6b85a0c4214fd9311c23b0f7d24b582be62d4690

--- a/storybooks/.gitignore
+++ b/storybooks/.gitignore
@@ -1,5 +1,6 @@
 <<<<<<< HEAD
 node_modules/
+<<<<<<< HEAD
 .storybook/
 =======
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
@@ -39,3 +40,5 @@ yarn-error.log*
 *.tsbuildinfo
 next-env.d.ts
 >>>>>>> 6b012692847da995eaeb27b9c901701397768d3c
+=======
+>>>>>>> 6b85a0c4214fd9311c23b0f7d24b582be62d4690

--- /dev/null
+++ b/storybooks/.storybook/main.js
@@ -0,0 +1,12 @@
+module.exports = {
+  "stories": [
+    "../stories/**/*.stories.mdx",
+    "../stories/**/*.stories.@(js|jsx|ts|tsx)"
+  ],
+  "addons": [
+    "@storybook/addon-links",
+    "@storybook/addon-essentials",
+    "@storybook/addon-interactions"
+  ],
+  "framework": "@storybook/react"
+}
\ No newline at end of file

--- /dev/null
+++ b/storybooks/.storybook/preview.js
@@ -0,0 +1,9 @@
+export const parameters = {
+  actions: { argTypesRegex: "^on[A-Z].*" },
+  controls: {
+    matchers: {
+      color: /(background|color)$/i,
+      date: /Date$/,
+    },
+  },
+}
\ No newline at end of file

--- a/storybooks/yarn.lock
+++ b/storybooks/yarn.lock
@@ -2411,14 +2411,14 @@
     form-data "^3.0.0"
 
 "@types/node@*":
-  version "18.15.6"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.6.tgz#af98ef4a36e7ac5f2d03040f3109fcce972bf6cb"
-  integrity sha512-YErOafCZpK4g+Rp3Q/PBgZNAsWKGunQTm9FA3/Pbcm0VCriTEzcrutQ/SxSc0rytAp0NoFWue669jmKhEtd0sA==
+  version "18.15.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.9.tgz#a9b529d2a16ae73122b3875969e7db18c9f3e790"
+  integrity sha512-dUxhiNzBLr6IqlZXz6e/rN2YQXlFgOei/Dxy+e3cyXTJ4txSUbGT2/fmnD6zd/75jDMeW5bDee+YXxlFKHoV0A==
 
 "@types/node@^14.0.10 || ^16.0.0", "@types/node@^14.14.20 || ^16.0.0":
-  version "16.18.19"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.19.tgz#5a2c0c2fdcfcf1ff96b8f43447c81b40aa65ba2f"
-  integrity sha512-Qd2EhjbjOKZuHMn+IJc2EUYwdkJw9kgsZ3k2zdyi2uIBH0hU00Yd9T5rpMq6KRiFvpscpXUQRjJSaJHH29ei8A==
+  version "16.18.20"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.20.tgz#8d69761aca4cf40a54dcd5c70ed313f393f8d6b5"
+  integrity sha512-9fH66vSJnF563exTu3y1g2IbDz1vCj01Lbqms97r8j0qzfFisT2biypSfybVv/eYrtTB74x9xQTdRU8RyMiRrg==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.1"
@@ -4492,9 +4492,9 @@ ee-first@1.1.1:
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
 electron-to-chromium@^1.4.284:
-  version "1.4.339"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.339.tgz#bfa611a7707ca8bbb784e01fe247c18a35bd8d28"
-  integrity sha512-MSXHBJGcbBydq/DQDlpBeUKnJ6C7aTiNCTRpfDV5Iz0sNr/Ng6RJFloq82AAicp/SrmDq4zF6XsKG0B8Xwn1UQ==
+  version "1.4.340"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.340.tgz#3a6d7414c1fc2dbf84b6f7af3ec24270606c85b8"
+  integrity sha512-zx8hqumOqltKsv/MF50yvdAlPF9S/4PXbyfzJS6ZGhbddGkRegdwImmfSVqCkEziYzrIGZ/TlrzBND4FysfkDg==
 
 elliptic@^6.5.3:
   version "6.5.4"
@@ -9108,9 +9108,9 @@ terser@^4.1.2, terser@^4.6.3:
     source-map-support "~0.5.12"
 
 terser@^5.16.5, terser@^5.3.4:
-  version "5.16.6"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.6.tgz#f6c7a14a378ee0630fbe3ac8d1f41b4681109533"
-  integrity sha512-IBZ+ZQIA9sMaXmRZCUMDjNH0D5AQQfdn4WUjHL0+1lF4TP1IHRJbrhb6fNaXWikrYQTSkb7SLxkeXAiy1p7mbg==
+  version "5.16.8"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.8.tgz#ccde583dabe71df3f4ed02b65eb6532e0fae15d5"
+  integrity sha512-QI5g1E/ef7d+PsDifb+a6nnVgC4F22Bg6T0xrBrz6iloVB4PUkkunp6V8nzoOOZJIzjWVdAGqCdlKlhLq/TbIA==
   dependencies:
     "@jridgewell/source-map" "^0.3.2"
     acorn "^8.5.0"

--- /dev/null
+++ b/yarn.lock
@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+