Skip to content
This repository was archived by the owner on Dec 25, 2024. It is now read-only.

fix: examples and playground #96

Merged
merged 1 commit into from
Dec 31, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
40 changes: 21 additions & 19 deletions examples/nuxt/components/HelloWorld.vue
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
<template>
<div>
<h3>{{ msg }}, {{ name }}</h3>
<button @click="inc">
Inc
</button>
<div>{{ count }} x 2 = {{ doubled }}</div>
<button @click="dec()" v-html="decText" />
</div>
</template>

<script lang="ts">
/* eslint-disable import/first */
export default {
name: 'App',
}
</script>
<script setup lang="ts">
import { ref, computed, watch } from '@vue/composition-api'
import { computed, ref, watch } from '@vue/composition-api'

const props = withDefaults(defineProps<{ msg: string; name: string | number }>(), { msg: 'Hello' })
const emit = defineEmits(['update'])
withDefaults(defineProps<{ msg: string; name: string | number }>(), { msg: 'Hello' })
const emit = defineEmits<{
(event: 'update', value: number): void
}>()

const count = ref(0)
const doubled = computed(() => count.value * 2)
Expand All @@ -30,9 +28,13 @@ const decText = '<b>Dec</b>'

watch(count, value => emit('update', value))
</script>

<script lang="ts">
export default {
name: 'App'
}
</script>
<template>
<div>
<h3>{{ msg }}, {{ name }}</h3>
<button @click="inc">
Inc
</button>
<div>{{ count }} x 2 = {{ doubled }}</div>
<button @click="dec()" v-html="decText" />
</div>
</template>
11 changes: 6 additions & 5 deletions examples/nuxt/pages/index.vue
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<template>
<div>
<hello-world name="Vue 2" @update="onUpdate" />
</div>
</template>

<script setup lang="ts">
import HelloWorld from '../components/HelloWorld.vue'

function onUpdate(e: any) {
// eslint-disable-next-line no-console
console.log(e)
}
</script>
<template>
<div>
<HelloWorld name="Vue 2" @update="onUpdate" />
</div>
</template>
1 change: 1 addition & 0 deletions examples/nuxt/shims-vue.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/// <reference types="unplugin-vue2-script-setup/shims.js" />
19 changes: 6 additions & 13 deletions examples/nuxt/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,20 @@
"DOM"
],
"esModuleInterop": true,
"skipLibCheck": true,
"skipLibCheck": false,
"allowJs": true,
"sourceMap": true,
"strict": true,
"noEmit": true,
"baseUrl": ".",
"paths": {
"~/*": [
"./*"
],
"@/*": [
"./*"
]
},
"types": [
"@types/node",
"@nuxt/types",
"unplugin-vue2-script-setup/types"
"@nuxt/types"
]
},
"exclude": [
"node_modules"
]
],
"vueCompilerOptions": {
"experimentalCompatMode": 2
}
}
6 changes: 5 additions & 1 deletion examples/vue-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
"@vue/composition-api": "^1.4.3",
"core-js": "^3.20.1",
"vue": "^2.6.11"
"vue": "^2.6.14"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^4.5.15",
Expand All @@ -18,5 +19,8 @@
"unplugin-vue2-script-setup": "workspace:*",
"vue-template-compiler": "^2.6.14",
"vue-tsc": "^0.30.1"
},
"vueCompilerOptions": {
"experimentalCompatMode": 2
}
}
8 changes: 3 additions & 5 deletions examples/vue-cli/src/App.vue
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
<script setup lang="ts">
import HelloWorld from './components/HelloWorld.vue'
</script>
<template>
<div id="app">
<HelloWorld msg="Welcome to Your Vue.js App" />
</div>
</template>

<script setup lang="ts">
import HelloWorld from './components/HelloWorld.vue'
</script>

<style>
#app {
font-family: Avenir, Helvetica, Arial, sans-serif;
Expand Down
12 changes: 5 additions & 7 deletions examples/vue-cli/src/components/HelloWorld.vue
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
<script setup lang="ts">
defineProps<{
msg: string
}>()
</script>
<template>
<div class="hello">
<h1>{{ msg }}</h1>
Expand Down Expand Up @@ -28,13 +33,6 @@
</ul>
</div>
</template>

<script setup lang="ts">
defineProps({
msg: String,
})
</script>

<style scoped>
h3 {
margin: 40px 0 0;
Expand Down
8 changes: 5 additions & 3 deletions examples/vue-cli/src/main.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import Vue from 'vue'
import VueCompostionAPI from '@vue/composition-api'
import VueCompostionAPI, { createApp, h } from '@vue/composition-api'
import App from './App.vue'

Vue.config.productionTip = false
Vue.use(VueCompostionAPI)

const app = new Vue({ render: h => h(App as any) })
const app = createApp({
render: () => h(App),
})

app.$mount('#app')
app.mount('#app')
5 changes: 1 addition & 4 deletions examples/vue-cli/src/shims-vue.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
declare module '*.vue' {
import Vue from 'vue'
export default Vue
}
/// <reference types="unplugin-vue2-script-setup/shims.js" />
25 changes: 8 additions & 17 deletions examples/vue-cli/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,26 @@
"jsx": "preserve",
"importHelpers": true,
"moduleResolution": "node",
"skipLibCheck": true,
"skipLibCheck": false,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"sourceMap": true,
"baseUrl": ".",
"types": [
"webpack-env",
"unplugin-vue2-script-setup/types"
"webpack-env"
],
"paths": {
"@/*": [
"src/*"
]
},
"lib": [
"esnext",
"dom",
"dom.iterable",
"scripthost"
"dom.iterable"
]
},
"include": [
"src/**/*.ts",
"src/**/*.tsx",
"src/**/*.vue",
"tests/**/*.ts",
"tests/**/*.tsx"
"src"
],
"exclude": [
"node_modules"
]
],
"vueCompilerOptions": {
"experimentalCompatMode": 2
}
}
1 change: 1 addition & 0 deletions examples/vue-cli/vue.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ module.exports = {
}),
],
},
parallel: false,
chainWebpack(config) {
// disable type check and let `vue-tsc` handles it
config.plugins.delete('fork-ts-checker')
Expand Down
2 changes: 1 addition & 1 deletion playground/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
</head>
<body>
<div id="app"></div>
<script type="module" src="./main.ts"></script>
<script type="module" src="./src/main.ts"></script>
</body>
</html>
8 changes: 0 additions & 8 deletions playground/main.ts

This file was deleted.

8 changes: 5 additions & 3 deletions playground/package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
{
"private": true,
"scripts": {
"dev": "vite --open"
"dev": "vite --open",
"build": "vue-tsc --noEmit && vite build"
},
"dependencies": {
"@vue/composition-api": "^1.4.3",
"vue": "^2.6.14"
},
"devDependencies": {
"vite": "^2.7.9",
"vite": "^2.7.10",
"vite-plugin-inspect": "^0.3.11",
"vite-plugin-vue2": "^1.9.0",
"vue-template-compiler": "^2.6.14"
"vue-template-compiler": "^2.6.14",
"vue-tsc": "^0.30.1"
}
}
15 changes: 7 additions & 8 deletions playground/App.vue → playground/src/App.vue
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
<template>
<div>
<hello-world name="Vue 2" @update="onUpdate" />

<async-component />
</div>
</template>

<script setup lang="ts">
import { defineAsyncComponent } from '@vue/composition-api'

Expand All @@ -18,3 +10,10 @@ function onUpdate(e: any) {
console.log(e)
}
</script>
<template>
<div>
<HelloWorld name="Vue 2" @update="onUpdate" />

<AsyncComponent />
</div>
</template>
File renamed without changes.
File renamed without changes.
File renamed without changes.
41 changes: 21 additions & 20 deletions playground/HelloWorld.vue → playground/src/HelloWorld.vue
Original file line number Diff line number Diff line change
@@ -1,22 +1,18 @@
<template>
<div>
<h3>{{ msg }}, {{ name }}</h3>
<button @click="inc">
Inc
</button>
<div>{{ count }} x 2 = {{ doubled }}</div>
<button @click="dec()" v-html="decText" />
<component :is="count > 2 ? Foo : Bar" />
</div>
</template>

<script lang="ts">
/* eslint-disable import/first */
export default {
name: 'App',
}
</script>
<script setup lang="ts">
import { watch } from '@vue/composition-api'
import Foo from './Foo.vue'
import Bar from './Bar.vue'

const props = withDefaults(defineProps<{ msg: string; name: string | number }>(), { msg: 'Hello' })
const emit = defineEmits(['update'])
withDefaults(defineProps<{ msg: string; name: string | number }>(), { msg: 'Hello' })
const emit = defineEmits<{
(event: 'update', value: number): void
}>()

let count = $ref(0)
// eslint-disable-next-line prefer-const
Expand All @@ -33,9 +29,14 @@ const decText = '<b>Dec</b>'

watch(count, value => emit('update', value))
</script>

<script lang="ts">
export default {
name: 'App'
}
</script>
<template>
<div>
<h3>{{ msg }}, {{ name }}</h3>
<button @click="inc">
Inc
</button>
<div>{{ count }} x 2 = {{ doubled }}</div>
<button @click="dec()" v-html="decText" />
<component :is="count > 2 ? Foo : Bar" />
</div>
</template>
9 changes: 9 additions & 0 deletions playground/src/main.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import Vue from 'vue'
import VueCompositionAPI, { createApp, h } from '@vue/composition-api'
import App from './App.vue'

Vue.use(VueCompositionAPI)

const app = createApp({ render: () => h(App) })

app.mount('#app')
2 changes: 2 additions & 0 deletions playground/src/shims-vue.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/// <reference types="unplugin-vue2-script-setup/shims.js" />
/// <reference types="unplugin-vue2-script-setup/ref-macros.js" />
Loading