diff --git a/package.json b/package.json index 15f39a0198..c30d0226d1 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "rimraf": "^3.0.2", "semver": "^7.3.8", "std-env": "^3.3.1", - "typescript": "^4.8.4", + "typescript": "^4.9.3", "ufo": "^1.0.0", "unbuild": "^0.9.4", "vite": "^3.2.4", diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json index bf45f20c39..e0d8c0c3d2 100644 --- a/packages/nuxt/package.json +++ b/packages/nuxt/package.json @@ -45,8 +45,8 @@ "@vue/reactivity": "^3.2.45", "@vue/shared": "^3.2.45", "@vueuse/head": "^1.0.13", - "unhead": "^0.6.7", - "@unhead/ssr": "^0.6.7", + "unhead": "^0.6.9", + "@unhead/ssr": "^0.6.9", "chokidar": "^3.5.3", "cookie-es": "^0.5.0", "defu": "^6.1.1", diff --git a/packages/schema/package.json b/packages/schema/package.json index 604f2edbb4..ba5e0fdcb5 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -17,7 +17,7 @@ "@types/lodash.template": "^4", "@types/semver": "^7", "@vitejs/plugin-vue": "^3.2.0", - "@unhead/schema": "^0.6.7", + "@unhead/schema": "^0.6.9", "nitropack": "^1.0.0-0", "unbuild": "latest", "vite": "~3.2.4" diff --git a/packages/vite/src/plugins/composable-keys.ts b/packages/vite/src/plugins/composable-keys.ts index f85db90343..ca99672791 100644 --- a/packages/vite/src/plugins/composable-keys.ts +++ b/packages/vite/src/plugins/composable-keys.ts @@ -28,7 +28,7 @@ export const composableKeysPlugin = createUnplugin((options: ComposableKeysOptio }, transform (code, id) { if (!KEYED_FUNCTIONS_RE.test(code)) { return } - const { 0: script = code, index: codeIndex = 0 } = code.match(/(?<=]*>)[\S\s.]*?(?=<\/script>)/) || [] + const { 0: script = code, index: codeIndex = 0 } = code.match(/(?<=]*>)[\S\s.]*?(?=<\/script>)/) || { index: 0, 0: code } const s = new MagicString(code) // https://github.com/unjs/unplugin/issues/90 let count = 0 diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2b78345ea2..856cd200d1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -46,7 +46,7 @@ importers: rimraf: ^3.0.2 semver: ^7.3.8 std-env: ^3.3.1 - typescript: ^4.8.4 + typescript: ^4.9.3 ufo: ^1.0.0 unbuild: ^0.9.4 vite: ^3.2.4 @@ -59,7 +59,7 @@ importers: '@nuxt/test-utils': link:packages/test-utils '@nuxt/vite-builder': link:packages/vite '@nuxt/webpack-builder': link:packages/webpack - '@nuxtjs/eslint-config-typescript': 11.0.0_rmayb2veg2btbq6mbmnyivgasy + '@nuxtjs/eslint-config-typescript': 11.0.0_e3uo4sehh4zr4i6m57mkkxxv7y '@types/crawler': 1.2.2 '@types/node': 18.11.9 '@types/rimraf': 3.0.2 @@ -82,12 +82,12 @@ importers: rimraf: 3.0.2 semver: 7.3.8 std-env: 3.3.1 - typescript: 4.8.4 + typescript: 4.9.3 ufo: 1.0.0 unbuild: 0.9.4 vite: 3.2.4_@types+node@18.11.9 vitest: 0.25.2 - vue-tsc: 1.0.9_typescript@4.8.4 + vue-tsc: 1.0.9_typescript@4.9.3 examples/advanced/config-extends: specifiers: @@ -417,7 +417,7 @@ importers: '@nuxt/vite-builder': workspace:* '@types/fs-extra': ^9.0.13 '@types/hash-sum': ^1.0.0 - '@unhead/ssr': ^0.6.7 + '@unhead/ssr': ^0.6.9 '@vue/reactivity': ^3.2.45 '@vue/shared': ^3.2.45 '@vueuse/head': ^1.0.13 @@ -448,7 +448,7 @@ importers: unbuild: ^0.9.4 unctx: ^2.1.0 unenv: ^1.0.0 - unhead: ^0.6.7 + unhead: ^0.6.9 unimport: ^1.0.0 unplugin: ^1.0.0 untyped: ^1.0.0 @@ -464,7 +464,7 @@ importers: '@nuxt/telemetry': 2.1.6 '@nuxt/ui-templates': 0.4.0 '@nuxt/vite-builder': link:../vite - '@unhead/ssr': 0.6.7 + '@unhead/ssr': 0.6.9 '@vue/reactivity': 3.2.45 '@vue/shared': 3.2.45 '@vueuse/head': 1.0.13_vue@3.2.45 @@ -494,7 +494,7 @@ importers: ultrahtml: 1.0.0 unctx: 2.1.0 unenv: 1.0.0 - unhead: 0.6.7 + unhead: 0.6.9 unimport: 1.0.0 unplugin: 1.0.0 untyped: 1.0.0 @@ -512,7 +512,7 @@ importers: specifiers: '@types/lodash.template': ^4 '@types/semver': ^7 - '@unhead/schema': ^0.6.7 + '@unhead/schema': ^0.6.9 '@vitejs/plugin-vue': ^3.2.0 c12: ^1.0.1 create-require: ^1.1.1 @@ -545,7 +545,7 @@ importers: devDependencies: '@types/lodash.template': 4.5.1 '@types/semver': 7.3.12 - '@unhead/schema': 0.6.7 + '@unhead/schema': 0.6.9 '@vitejs/plugin-vue': 3.2.0_vite@3.2.4 nitropack: 1.0.0-0 unbuild: 0.9.4 @@ -1376,14 +1376,14 @@ packages: pathe: 0.3.9 dev: true - /@nuxtjs/eslint-config-typescript/11.0.0_rmayb2veg2btbq6mbmnyivgasy: + /@nuxtjs/eslint-config-typescript/11.0.0_e3uo4sehh4zr4i6m57mkkxxv7y: resolution: {integrity: sha512-hmFjGtXT524ql8eTbK8BaRkamcXB6Z8YOW8nSQhosTP6oBw9WtOFUeWr7holyE278UhOmx+wDFG90BnyM9D+UA==} peerDependencies: eslint: ^8.23.0 dependencies: '@nuxtjs/eslint-config': 11.0.0_o775arwmhklgton5rs7hied464 - '@typescript-eslint/eslint-plugin': 5.38.1_cmrt4jzid5z5bxialr5k6iivze - '@typescript-eslint/parser': 5.38.1_rmayb2veg2btbq6mbmnyivgasy + '@typescript-eslint/eslint-plugin': 5.38.1_ferwhcgzg3cwswrcda64z7xpfi + '@typescript-eslint/parser': 5.38.1_e3uo4sehh4zr4i6m57mkkxxv7y eslint: 8.27.0 eslint-import-resolver-typescript: 3.5.1_dcpv4nbdr5ks2h5677xdltrk6e eslint-plugin-import: 2.26.0_o775arwmhklgton5rs7hied464 @@ -1917,7 +1917,7 @@ packages: '@types/yargs-parser': 21.0.0 dev: false - /@typescript-eslint/eslint-plugin/5.38.1_cmrt4jzid5z5bxialr5k6iivze: + /@typescript-eslint/eslint-plugin/5.38.1_ferwhcgzg3cwswrcda64z7xpfi: resolution: {integrity: sha512-ky7EFzPhqz3XlhS7vPOoMDaQnQMn+9o5ICR9CPr/6bw8HrFkzhMSxuA3gRfiJVvs7geYrSeawGJjZoZQKCOglQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1928,22 +1928,22 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/parser': 5.38.1_rmayb2veg2btbq6mbmnyivgasy + '@typescript-eslint/parser': 5.38.1_e3uo4sehh4zr4i6m57mkkxxv7y '@typescript-eslint/scope-manager': 5.38.1 - '@typescript-eslint/type-utils': 5.38.1_rmayb2veg2btbq6mbmnyivgasy - '@typescript-eslint/utils': 5.38.1_rmayb2veg2btbq6mbmnyivgasy + '@typescript-eslint/type-utils': 5.38.1_e3uo4sehh4zr4i6m57mkkxxv7y + '@typescript-eslint/utils': 5.38.1_e3uo4sehh4zr4i6m57mkkxxv7y debug: 4.3.4 eslint: 8.27.0 ignore: 5.2.0 regexpp: 3.2.0 semver: 7.3.8 - tsutils: 3.21.0_typescript@4.8.4 - typescript: 4.8.4 + tsutils: 3.21.0_typescript@4.9.3 + typescript: 4.9.3 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/parser/5.38.1_rmayb2veg2btbq6mbmnyivgasy: + /@typescript-eslint/parser/5.38.1_e3uo4sehh4zr4i6m57mkkxxv7y: resolution: {integrity: sha512-LDqxZBVFFQnQRz9rUZJhLmox+Ep5kdUmLatLQnCRR6523YV+XhRjfYzStQ4MheFA8kMAfUlclHSbu+RKdRwQKw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1955,10 +1955,10 @@ packages: dependencies: '@typescript-eslint/scope-manager': 5.38.1 '@typescript-eslint/types': 5.38.1 - '@typescript-eslint/typescript-estree': 5.38.1_typescript@4.8.4 + '@typescript-eslint/typescript-estree': 5.38.1_typescript@4.9.3 debug: 4.3.4 eslint: 8.27.0 - typescript: 4.8.4 + typescript: 4.9.3 transitivePeerDependencies: - supports-color dev: true @@ -1971,7 +1971,7 @@ packages: '@typescript-eslint/visitor-keys': 5.38.1 dev: true - /@typescript-eslint/type-utils/5.38.1_rmayb2veg2btbq6mbmnyivgasy: + /@typescript-eslint/type-utils/5.38.1_e3uo4sehh4zr4i6m57mkkxxv7y: resolution: {integrity: sha512-UU3j43TM66gYtzo15ivK2ZFoDFKKP0k03MItzLdq0zV92CeGCXRfXlfQX5ILdd4/DSpHkSjIgLLLh1NtkOJOAw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1981,12 +1981,12 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 5.38.1_typescript@4.8.4 - '@typescript-eslint/utils': 5.38.1_rmayb2veg2btbq6mbmnyivgasy + '@typescript-eslint/typescript-estree': 5.38.1_typescript@4.9.3 + '@typescript-eslint/utils': 5.38.1_e3uo4sehh4zr4i6m57mkkxxv7y debug: 4.3.4 eslint: 8.27.0 - tsutils: 3.21.0_typescript@4.8.4 - typescript: 4.8.4 + tsutils: 3.21.0_typescript@4.9.3 + typescript: 4.9.3 transitivePeerDependencies: - supports-color dev: true @@ -1996,7 +1996,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@typescript-eslint/typescript-estree/5.38.1_typescript@4.8.4: + /@typescript-eslint/typescript-estree/5.38.1_typescript@4.9.3: resolution: {integrity: sha512-99b5e/Enoe8fKMLdSuwrfH/C0EIbpUWmeEKHmQlGZb8msY33qn1KlkFww0z26o5Omx7EVjzVDCWEfrfCDHfE7g==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2011,13 +2011,13 @@ packages: globby: 11.1.0 is-glob: 4.0.3 semver: 7.3.8 - tsutils: 3.21.0_typescript@4.8.4 - typescript: 4.8.4 + tsutils: 3.21.0_typescript@4.9.3 + typescript: 4.9.3 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/utils/5.38.1_rmayb2veg2btbq6mbmnyivgasy: + /@typescript-eslint/utils/5.38.1_e3uo4sehh4zr4i6m57mkkxxv7y: resolution: {integrity: sha512-oIuUiVxPBsndrN81oP8tXnFa/+EcZ03qLqPDfSZ5xIJVm7A9V0rlkQwwBOAGtrdN70ZKDlKv+l1BeT4eSFxwXA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2026,7 +2026,7 @@ packages: '@types/json-schema': 7.0.11 '@typescript-eslint/scope-manager': 5.38.1 '@typescript-eslint/types': 5.38.1 - '@typescript-eslint/typescript-estree': 5.38.1_typescript@4.8.4 + '@typescript-eslint/typescript-estree': 5.38.1_typescript@4.9.3 eslint: 8.27.0 eslint-scope: 5.1.1 eslint-utils: 3.0.0_eslint@8.27.0 @@ -2049,16 +2049,29 @@ packages: '@unhead/schema': 0.6.7 dev: false + /@unhead/dom/0.6.9: + resolution: {integrity: sha512-fC2nQIOiq097bRWaeUcDPRjP3ucK2N01fyp/KTH2ThjE2hSG0rpXKb/GfF+v+xfIr8o5gK//64KwRHPZ5usrPg==} + dependencies: + '@unhead/schema': 0.6.9 + dev: false + /@unhead/schema/0.6.7: resolution: {integrity: sha512-wVf3Zu7deua63J/HYKoUXUkG0wZLPnKws1DNpSJkhNrjbpdzvsfI08lPIkW1ISqddQiLFXOgcnbhYrhcD7ZZYw==} dependencies: '@zhead/schema': 1.0.0-beta.13 hookable: 5.4.2 + dev: false - /@unhead/ssr/0.6.7: - resolution: {integrity: sha512-jvEJER7dMSEtI6u60OrEz4gwhmQDGbo086HXdIYoT7RoaJ/YQa/CUAHRfLTO6F657iYs42VPFM3yRCVUbexZhA==} + /@unhead/schema/0.6.9: + resolution: {integrity: sha512-MWx+DP6Os6vYaHjt7BZ0lmIEBX8M/P0am/NoE9xIhGDYzQq+GLxTllE6DJB9QXaMIzpJ2G5ePKOPuxCeaI8TRA==} dependencies: - '@unhead/schema': 0.6.7 + '@zhead/schema': 1.0.0-beta.13 + hookable: 5.4.2 + + /@unhead/ssr/0.6.9: + resolution: {integrity: sha512-vD4B1omq/eRhBf1qaYkt5n0hWL5XKc3AeaUKVbJxRquNnBXVch128Wc5q+lXzrzDppbTvSYEUVZMpBpOs6BYWw==} + dependencies: + '@unhead/schema': 0.6.9 dev: false /@unhead/vue/0.6.7_vue@3.2.45: @@ -2541,7 +2554,7 @@ packages: dependencies: '@unhead/dom': 0.6.7 '@unhead/schema': 0.6.7 - '@unhead/ssr': 0.6.7 + '@unhead/ssr': 0.6.9 '@unhead/vue': 0.6.7_vue@3.2.45 vue: 3.2.45 dev: false @@ -4668,7 +4681,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 5.38.1_rmayb2veg2btbq6mbmnyivgasy + '@typescript-eslint/parser': 5.38.1_e3uo4sehh4zr4i6m57mkkxxv7y debug: 3.2.7 eslint: 8.27.0 eslint-import-resolver-node: 0.3.6 @@ -4709,7 +4722,7 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 5.38.1_rmayb2veg2btbq6mbmnyivgasy + '@typescript-eslint/parser': 5.38.1_e3uo4sehh4zr4i6m57mkkxxv7y array-includes: 3.1.5 array.prototype.flat: 1.3.0 debug: 2.6.9 @@ -8261,14 +8274,14 @@ packages: /tslib/2.4.0: resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==} - /tsutils/3.21.0_typescript@4.8.4: + /tsutils/3.21.0_typescript@4.9.3: resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} engines: {node: '>= 6'} peerDependencies: typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta' dependencies: tslib: 1.14.1 - typescript: 4.8.4 + typescript: 4.9.3 dev: true /tunnel-agent/0.6.0: @@ -8341,6 +8354,12 @@ packages: hasBin: true dev: true + /typescript/4.9.3: + resolution: {integrity: sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA==} + engines: {node: '>=4.2.0'} + hasBin: true + dev: true + /uc.micro/1.0.6: resolution: {integrity: sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==} dev: true @@ -8430,11 +8449,11 @@ packages: node-fetch-native: 1.0.1 pathe: 1.0.0 - /unhead/0.6.7: - resolution: {integrity: sha512-YIVkGHHCUXbh0xFItqvJi08uk390ondXr+ge9lYwDiGQms8ykSGkDUbpMEXDrC8WnwoGXFkwaEZXRPIWx4ZxfA==} + /unhead/0.6.9: + resolution: {integrity: sha512-2QZz1no7sES2f2QIEBDi/6/K8rAq5svOj73zz9Zo0h+mWnlmBjeMAOwdcbffH5tHYGH6BV4bD8KU+8nto2MquQ==} dependencies: - '@unhead/dom': 0.6.7 - '@unhead/schema': 0.6.7 + '@unhead/dom': 0.6.9 + '@unhead/schema': 0.6.9 hookable: 5.4.2 dev: false @@ -8954,7 +8973,7 @@ packages: he: 1.2.0 dev: true - /vue-tsc/1.0.9_typescript@4.8.4: + /vue-tsc/1.0.9_typescript@4.9.3: resolution: {integrity: sha512-vRmHD1K6DmBymNhoHjQy/aYKTRQNLGOu2/ESasChG9Vy113K6CdP0NlhR0bzgFJfv2eFB9Ez/9L5kIciUajBxQ==} hasBin: true peerDependencies: @@ -8962,7 +8981,7 @@ packages: dependencies: '@volar/vue-language-core': 1.0.9 '@volar/vue-typescript': 1.0.9 - typescript: 4.8.4 + typescript: 4.9.3 dev: true /vue/3.2.45: