From abc05ed3771ed002f5e912c53fd436ea9349c2d4 Mon Sep 17 00:00:00 2001 From: Anthony Fu Date: Wed, 25 May 2022 02:55:51 +0800 Subject: [PATCH 01/27] chore: remove nuxt example --- README.md | 71 +---------------------- examples/nuxt-bridge/.npmrc | 1 - examples/nuxt-bridge/README.md | 3 - examples/nuxt-bridge/layouts/default.vue | 11 ---- examples/nuxt-bridge/nuxt.config.ts | 9 --- examples/nuxt-bridge/package.json | 14 ----- examples/nuxt-bridge/pages/index.vue | 18 ------ examples/nuxt-bridge/pages/test/_slug.vue | 7 --- examples/nuxt-bridge/tsconfig.json | 3 - 9 files changed, 2 insertions(+), 135 deletions(-) delete mode 100644 examples/nuxt-bridge/.npmrc delete mode 100644 examples/nuxt-bridge/README.md delete mode 100644 examples/nuxt-bridge/layouts/default.vue delete mode 100644 examples/nuxt-bridge/nuxt.config.ts delete mode 100644 examples/nuxt-bridge/package.json delete mode 100644 examples/nuxt-bridge/pages/index.vue delete mode 100644 examples/nuxt-bridge/pages/test/_slug.vue delete mode 100644 examples/nuxt-bridge/tsconfig.json diff --git a/README.md b/README.md index a413fa3..ba12a6c 100644 --- a/README.md +++ b/README.md @@ -44,76 +44,9 @@ Example: [`playground/`](./playground/)
Nuxt
-> From v0.28.0 of `@nuxtjs/composition-api`, this plugin is included and enabled out-of-box. +> It's built-in in [Nuxt Bridge](https://github.com/nuxt/bridge). -```bash -npm i @nuxtjs/composition-api -``` - -```ts -// nuxt.config.js -export default { - buildModules: [ - '@nuxtjs/composition-api/module', - ], - scriptSetup: { /* options */ }, -} -``` - -> This module works for both Nuxt 2 and [Nuxt Vite](https://github.com/nuxt/vite) - -Example: [`examples/nuxt`](./examples/nuxt) - -###### Component Meta - -Note that ` - - -``` - -###### TypeScript - -To use TypeScript with Nuxt, install the [`@nuxtjs/typescript-module`](https://typescript.nuxtjs.org/) but disable the type check: - -```bash -npm i -D @nuxt/typescript-build vue-tsc -``` - -```ts -// nuxt.config.js -export default { - buildModules: [ - ['@nuxt/typescript-build', { typeCheck: false }], - '@nuxtjs/composition-api/module', - 'unplugin-vue2-script-setup/nuxt', - ], -} -``` - -And then use [`vue-tsc`](https://github.com/johnsoncodehk/volar) to do the type check at build time: - -```jsonc -// package.json -{ - "scripts": { - "dev": "nuxt", - "build": "vue-tsc --noEmit && nuxt build" - } -} -``` - -
+
Vue CLI
diff --git a/examples/nuxt-bridge/.npmrc b/examples/nuxt-bridge/.npmrc deleted file mode 100644 index bf2e764..0000000 --- a/examples/nuxt-bridge/.npmrc +++ /dev/null @@ -1 +0,0 @@ -shamefully-hoist=true diff --git a/examples/nuxt-bridge/README.md b/examples/nuxt-bridge/README.md deleted file mode 100644 index d5a58db..0000000 --- a/examples/nuxt-bridge/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Nuxt Bridge - -This plugin has been included in Nuxt Bridge out-of-the-box. This example only serves the purpose of testing the plugin integration with Nuxt Bridge. diff --git a/examples/nuxt-bridge/layouts/default.vue b/examples/nuxt-bridge/layouts/default.vue deleted file mode 100644 index 5f73c0b..0000000 --- a/examples/nuxt-bridge/layouts/default.vue +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/examples/nuxt-bridge/nuxt.config.ts b/examples/nuxt-bridge/nuxt.config.ts deleted file mode 100644 index f3184f0..0000000 --- a/examples/nuxt-bridge/nuxt.config.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { defineNuxtConfig } from '@nuxt/bridge' - -export default defineNuxtConfig({ - components: true, - bridge: { - meta: true, - vite: true, - }, -}) diff --git a/examples/nuxt-bridge/package.json b/examples/nuxt-bridge/package.json deleted file mode 100644 index b96c27c..0000000 --- a/examples/nuxt-bridge/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "example-bridge", - "private": true, - "scripts": { - "build": "nuxi build", - "dev": "nuxi dev" - }, - "devDependencies": { - "@nuxt/bridge": "npm:@nuxt/bridge-edge@latest", - "nuxt-edge": "latest", - "vue": "^2.6.14", - "vue2": "npm:vue@^2.6.14" - } -} diff --git a/examples/nuxt-bridge/pages/index.vue b/examples/nuxt-bridge/pages/index.vue deleted file mode 100644 index 828e7f6..0000000 --- a/examples/nuxt-bridge/pages/index.vue +++ /dev/null @@ -1,18 +0,0 @@ - - - diff --git a/examples/nuxt-bridge/pages/test/_slug.vue b/examples/nuxt-bridge/pages/test/_slug.vue deleted file mode 100644 index ed1ce39..0000000 --- a/examples/nuxt-bridge/pages/test/_slug.vue +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/examples/nuxt-bridge/tsconfig.json b/examples/nuxt-bridge/tsconfig.json deleted file mode 100644 index 4b34df1..0000000 --- a/examples/nuxt-bridge/tsconfig.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "./.nuxt/tsconfig.json" -} From bcf90b6ffa9fc1cfb2c0acd4d8ed36ee82ddb0c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= Date: Wed, 25 May 2022 03:12:18 +0800 Subject: [PATCH 02/27] chore: upgrade to pnpm 7 (#140) Co-authored-by: Anthony Fu --- .github/workflows/test.yml | 4 +- .npmrc | 1 + package.json | 33 +- pnpm-lock.yaml | 10025 ++++++++--------------------------- 4 files changed, 2237 insertions(+), 7826 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3d00e33..3bf87ec 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,9 +25,7 @@ jobs: - uses: actions/checkout@v2 - name: Install pnpm - uses: pnpm/action-setup@v2.0.1 - with: - version: 6.23.5 + uses: pnpm/action-setup@v2 - name: Set node version to ${{ matrix.node }} uses: actions/setup-node@v2 diff --git a/.npmrc b/.npmrc index bac7fb0..84342cc 100644 --- a/.npmrc +++ b/.npmrc @@ -1,2 +1,3 @@ shamefully-hoist=true ignore-workspace-root-check=true +strict-peer-dependencies=false diff --git a/package.json b/package.json index 0e1aed8..8072113 100644 --- a/package.json +++ b/package.json @@ -1,19 +1,25 @@ { "name": "unplugin-vue2-script-setup", "version": "0.10.2", + "packageManager": "pnpm@7.1.5", "description": "Bring