Merge branch 'vuejs:main' into main

vuejs · Jun 5, 2024 · 1c44370 · 1c44370
2 parents d3d2353 + f138c20
commit 1c44370
Show file tree

Hide file tree

Showing 17 changed files with 384 additions and 227 deletions.
diff --git a/package.json b/package.json
@@ -31,6 +31,7 @@
     "stub:applet": "turbo stub --filter=./packages/applet",
     "stub:vite": "turbo stub --filter=./packages/vite",
     "stub:devtools-api": "turbo stub --filter=./packages/devtools-api...",
+    "build:applet": "turbo build --filter=./packages/applet...",
     "build:shared": "turbo build --filter=./packages/shared...",
     "build:core": "turbo build --filter=./packages/core...",
     "build:devtools-kit": "turbo build --filter=./packages/devtools-kit...",
@@ -62,6 +63,7 @@
     "play:multi-app": "turbo dev --filter=./packages/playground/multi-app",
     "play:webpack": "turbo dev --filter=./packages/playground/webpack",
     "play:termui": "turbo dev --filter=./packages/playground/termui",
+    "play:options-api": "turbo dev --filter=./packages/playground/options-api",
     "docs": "pnpm -C docs run docs:dev",
     "docs:build": "pnpm -C docs run docs:build",
     "zip": "tsx ./scripts/extension-zip.ts",
@@ -101,7 +103,7 @@
     "taze": "^0.13.8",
     "tsup": "^8.0.2",
     "tsx": "^4.11.0",
-    "turbo": "^1.13.3",
+    "turbo": "^2.0.1",
     "typescript": "^5.4.5",
     "unbuild": "^2.0.0",
     "unocss": "^0.60.3",

diff --git a/packages/applet/src/components/state/StateFieldViewer.vue b/packages/applet/src/components/state/StateFieldViewer.vue
@@ -137,7 +137,7 @@ function submit() {
     path: normalizedPath.value,
     inspectorId: state.value.inspectorId,
     type: data.stateType!,
-    nodeId,
+    nodeId: nodeId.value,
     state: {
       newKey: null!,
       type: editingType.value,
@@ -164,7 +164,7 @@ function submitDrafting() {
     path: [...normalizedPath.value, draftingNewProp.value.key],
     inspectorId: state.value.inspectorId,
     type: data.stateType!,
-    nodeId,
+    nodeId: nodeId.value,
     state: {
       newKey: draftingNewProp.value.key,
       type: typeof toSubmit(draftingNewProp.value.value),

diff --git a/packages/applet/src/composables/state-editor.ts b/packages/applet/src/composables/state-editor.ts
@@ -1,5 +1,5 @@
 import type { InjectionKey, Ref } from 'vue'
-import { inject, provide, ref } from 'vue'
+import { computed, inject, provide, ref } from 'vue'
 
 interface StateEditorContext {
   nodeId: string
@@ -40,7 +40,7 @@ export function useStateEditor() {
       editing.value = !editing.value
     },
     editingType,
-    nodeId: state.value.nodeId,
+    nodeId: computed(() => state.value.nodeId),
   }
 }
 

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -50,7 +50,7 @@
     "@unocss/core": "^0.60.3",
     "@unocss/reset": "^0.60.3",
     "@vitejs/plugin-vue": "^5.0.4",
-    "@vitejs/plugin-vue-jsx": "^3.1.0",
+    "@vitejs/plugin-vue-jsx": "^4.0.0",
     "dayjs": "^1.11.11",
     "floating-vue": "5.2.2",
     "ohash": "^1.1.3",

diff --git a/packages/devtools-kit/src/core/component/state/editor.ts b/packages/devtools-kit/src/core/component/state/editor.ts
@@ -160,10 +160,13 @@ export async function editComponentState(payload: InspectorStateEditorPayload, s
   let target: Record<string, unknown> | undefined
 
   // TODO: props
-  if (instance.devtoolsRawSetupState && Object.keys(instance.devtoolsRawSetupState).includes(path[0])) {
-    // Setup
+
+  // 1. check if is setup
+  if (instance.devtoolsRawSetupState && Object.keys(instance.devtoolsRawSetupState).includes(path[0]))
     target = instance.devtoolsRawSetupState
-  }
+  // 2. check if is options
+  if (instance.data && Object.keys(instance.data).includes(path[0]))
+    target = instance.data
 
   if (target && targetPath) {
     if (state.type === 'object' && type === 'reactive') {

diff --git a/packages/playground/options-api/index.html b/packages/playground/options-api/index.html
@@ -0,0 +1,18 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vue DevTools Basic Playground</title>
+  </head>
+  <style>
+    html {
+      color-scheme: dark;
+    }
+  </style>
+  <body>
+    <div id="app"></div>
+    <script type="module" src="/src/main.ts"></script>
+  </body>
+</html>
diff --git a/packages/playground/options-api/package.json b/packages/playground/options-api/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "playground-options-api",
+  "type": "module",
+  "version": "7.2.1",
+  "private": true,
+  "scripts": {
+    "dev": "vite"
+  },
+  "dependencies": {
+    "vue": "^3.4.27"
+  },
+  "devDependencies": {
+    "@vitejs/plugin-vue": "^5.0.4",
+    "vite-plugin-vue-devtools": "workspace:*"
+  }
+}
diff --git a/packages/playground/options-api/public/vite.svg b/packages/playground/options-api/public/vite.svg
diff --git a/packages/playground/options-api/src/App.vue b/packages/playground/options-api/src/App.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+import Options from './Options.vue'
+import Setup from './Setup.vue'
+</script>
+
+<template>
+  <div>
+    <Options />
+    <Setup />
+  </div>
+</template>
diff --git a/packages/playground/options-api/src/Options.vue b/packages/playground/options-api/src/Options.vue
@@ -0,0 +1,15 @@
+<script lang="ts">
+export default {
+  data() {
+    return {
+      name: 'Vue',
+    }
+  },
+}
+</script>
+
+<template>
+  <div>
+    Options: {{ name }}
+  </div>
+</template>
diff --git a/packages/playground/options-api/src/Setup.vue b/packages/playground/options-api/src/Setup.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+import { ref } from 'vue'
+
+const name = ref('Vue')
+</script>
+
+<template>
+  <div>
+    Setup: {{ name }}
+  </div>
+</template>
diff --git a/packages/playground/options-api/src/main.ts b/packages/playground/options-api/src/main.ts
@@ -0,0 +1,4 @@
+import { createApp } from 'vue'
+import App from './App.vue'
+
+createApp(App).mount('#app')
diff --git a/packages/playground/options-api/src/style.css b/packages/playground/options-api/src/style.css
@@ -0,0 +1,16 @@
+:root {
+  font-family: Inter, Avenir, Helvetica, Arial, sans-serif;
+  font-size: 16px;
+  line-height: 24px;
+  font-weight: 400;
+
+  color-scheme: light dark;
+  color: rgba(255, 255, 255, 0.87);
+  background-color: #242424;
+
+  font-synthesis: none;
+  text-rendering: optimizeLegibility;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-text-size-adjust: 100%;
+}
diff --git a/packages/playground/options-api/uno.config.ts b/packages/playground/options-api/uno.config.ts
@@ -0,0 +1,20 @@
+import {
+  defineConfig,
+  presetAttributify,
+  presetTypography,
+  presetUno,
+  transformerDirectives,
+  transformerVariantGroup,
+} from 'unocss'
+
+export default defineConfig({
+  presets: [
+    presetUno(),
+    presetAttributify(),
+    presetTypography(),
+  ],
+  transformers: [
+    transformerDirectives(),
+    transformerVariantGroup(),
+  ],
+})
diff --git a/packages/playground/options-api/vite.config.ts b/packages/playground/options-api/vite.config.ts
@@ -0,0 +1,16 @@
+import { defineConfig } from 'vite'
+import vue from '@vitejs/plugin-vue'
+import VueDevTools from 'vite-plugin-vue-devtools'
+
+// https://vitejs.dev/config/
+export default defineConfig({
+  plugins: [
+    vue(),
+    VueDevTools({
+      launchEditor: 'code',
+    }),
+  ],
+  server: {
+    port: 3000,
+  },
+})