From a038acbb8788a7eb276e26fa9304be269115e3a3 Mon Sep 17 00:00:00 2001 From: ZHAO Jinxiang Date: Fri, 4 Mar 2022 00:19:33 +0800 Subject: [PATCH 01/33] chore: update test case --- test/__snapshots__/transform.test.ts.snap | 39 +++++++++++++++++++++++ test/fixtures/VariableBinding.vue | 22 +++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 test/fixtures/VariableBinding.vue diff --git a/test/__snapshots__/transform.test.ts.snap b/test/__snapshots__/transform.test.ts.snap index 4695baf..335e9b2 100644 --- a/test/__snapshots__/transform.test.ts.snap +++ b/test/__snapshots__/transform.test.ts.snap @@ -954,3 +954,42 @@ export default __sfc_main; " `; + +exports[`transform > fixtures > test/fixtures/VariableBinding.vue 1`] = ` +" + +" +`; diff --git a/test/fixtures/VariableBinding.vue b/test/fixtures/VariableBinding.vue new file mode 100644 index 0000000..ebd3966 --- /dev/null +++ b/test/fixtures/VariableBinding.vue @@ -0,0 +1,22 @@ + + From 3cd6ae8b37dbc04d1239f97463d790492c055dda Mon Sep 17 00:00:00 2001 From: ZHAO Jinxiang Date: Fri, 4 Mar 2022 12:50:07 +0800 Subject: [PATCH 02/33] fix: windows ci --- examples/vue-cli/{vue.config.mjs => vue.config.cjs} | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) rename examples/vue-cli/{vue.config.mjs => vue.config.cjs} (72%) diff --git a/examples/vue-cli/vue.config.mjs b/examples/vue-cli/vue.config.cjs similarity index 72% rename from examples/vue-cli/vue.config.mjs rename to examples/vue-cli/vue.config.cjs index 5c8a0e5..1503cd4 100644 --- a/examples/vue-cli/vue.config.mjs +++ b/examples/vue-cli/vue.config.cjs @@ -1,8 +1,9 @@ +/* eslint-disable @typescript-eslint/no-var-requires */ -import { defineConfig } from '@vue/cli-service' -import ScriptSetup from 'unplugin-vue2-script-setup/webpack' +const { defineConfig } = require('@vue/cli-service') +const ScriptSetup = require('unplugin-vue2-script-setup/webpack').default -export default defineConfig({ +module.exports = defineConfig({ configureWebpack: { plugins: [ ScriptSetup({ From f60f671377c8cc39425d1e2fafcdff9fb7535a08 Mon Sep 17 00:00:00 2001 From: Wenlu Wang Date: Mon, 28 Mar 2022 12:41:32 +0800 Subject: [PATCH 03/33] feat: add lib output (#128) --- package.json | 5 +++++ rollup.config.js | 1 + src/lib.ts | 1 + 3 files changed, 7 insertions(+) create mode 100644 src/lib.ts diff --git a/package.json b/package.json index 7bd8b92..edb6a0f 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,11 @@ "require": "./dist/webpack.js", "import": "./dist/webpack.mjs", "types": "./webpack.d.ts" + }, + "./lib": { + "require": "./dist/lib.js", + "import": "./dist/lib.mjs", + "types": "./lib.d.ts" } }, "main": "dist/index.js", diff --git a/rollup.config.js b/rollup.config.js index 048e94c..e5f9695 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -14,6 +14,7 @@ const entries = [ 'src/rollup.ts', 'src/esbuild.ts', 'src/nuxt.ts', + 'src/lib.ts', ] const dtsEntries = [ diff --git a/src/lib.ts b/src/lib.ts new file mode 100644 index 0000000..46d458a --- /dev/null +++ b/src/lib.ts @@ -0,0 +1 @@ +export * from './core' From 55f5753ed3ca6883d9abac1d3ff1c3d2216e8243 Mon Sep 17 00:00:00 2001 From: Anthony Fu Date: Mon, 28 Mar 2022 12:42:18 +0800 Subject: [PATCH 04/33] release v0.10.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index edb6a0f..5c3d7cf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "unplugin-vue2-script-setup", - "version": "0.10.0", + "version": "0.10.1", "description": "Bring -`, 'Lang.vue')) - .toThrowError(' `, 'DefineProps.vue')) - .toThrowError('duplicate defineProps() call') + .rejects.toThrowError('duplicate defineProps() call') }) - it('top-level await', () => { - expect(() => + it('top-level await', async() => { + await expect(() => t(` `, 'TopLevel.vue')) - .toThrowError('top-level await is not supported in Vue 2') + .rejects.toThrowError('top-level await is not supported in Vue 2') - expect(() => + await expect(() => t(` `, 'TopLevel.vue')) - .toThrowError('top-level await is not supported in Vue 2') + .rejects.toThrowError('top-level await is not supported in Vue 2') }) - it('ref sugar', () => { + it('ref sugar', async() => { const consoleWarnMock = vi.spyOn(console, 'warn') - expect(() => - t(` + await t(` -`, 'App.vue')) - .not.toThrow() + `, 'App.vue') consoleWarnMock.mockRestore() }) diff --git a/test/transform.test.ts b/test/transform.test.ts index 2052f90..3b455a1 100644 --- a/test/transform.test.ts +++ b/test/transform.test.ts @@ -18,10 +18,10 @@ describe('transform', () => { for (const file of files) { it(file.replace(/\\/g, '/'), async() => { const fixture = await fs.readFile(resolve(root, file), 'utf-8') - const result = transform(fixture, file, { reactivityTransform: true })?.code || fixture + const result = (await transform(fixture, file, { reactivityTransform: true }))?.code || fixture expect(result).toMatchSnapshot() - const result2 = transform(result, file, { reactivityTransform: true })?.code || result + const result2 = (await transform(result, file, { reactivityTransform: true }))?.code || result expect(result).toEqual(result2) }) } From 7db2d759a3bbb4f8c8bc2dae9d48a509c0dbe4f9 Mon Sep 17 00:00:00 2001 From: ZHAO Jinxiang Date: Fri, 1 Apr 2022 14:21:57 +0800 Subject: [PATCH 06/33] release v0.10.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 16f28be..0e1aed8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "unplugin-vue2-script-setup", - "version": "0.10.1", + "version": "0.10.2", "description": "Bring - - -``` - -###### 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 08/33] 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