Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-01-22 11:22:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into fix/21721-spa-loading

Browse Source
This commit is contained in:
Daniel Roe 2024-11-05 10:58:25 +00:00
commit 70cbf80699
No known key found for this signature in database
GPG Key ID: 3714AB03996F442B
11 changed files with 745 additions and 815 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/lint-workflows.yml vendored
View File

@ -26,6 +26,6 @@ jobs:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
# From https://github.com/rhysd/actionlint/blob/main/docs/usage.md#use-actionlint-on-github-actions
- name: Check workflow files
uses: docker://rhysd/actionlint:1.7.3@sha256:7617f05bd698cd2f1c3aedc05bc733ccec92cca0738f3e8722c32c5b42c70ae6
uses: docker://rhysd/actionlint:1.7.4@sha256:82244e1db1c60d82c7792180a48dd0bcb838370bb589d53ff132503fc9485868
with:
args: -color

16
package.json
View File

@ -40,7 +40,12 @@
"@nuxt/ui-templates": "workspace:*",
"@nuxt/vite-builder": "workspace:*",
"@nuxt/webpack-builder": "workspace:*",
"@types/node": "22.8.7",
"@types/node": "22.9.0",
"@unhead/dom": "1.11.11",
"@unhead/shared": "1.11.11",
"@unhead/vue": "1.11.11",
"@unhead/schema": "1.11.11",
"@unhead/ssr": "1.11.11",
"@vue/compiler-core": "3.5.12",
"@vue/compiler-dom": "3.5.12",
"@vue/shared": "3.5.12",
@ -52,11 +57,12 @@
"nuxt": "workspace:*",
"ohash": "1.1.4",
"postcss": "8.4.47",
"rollup": "4.24.3",
"rollup": "4.24.4",
"send": ">=1.1.0",
"typescript": "5.6.3",
"ufo": "1.5.4",
"unbuild": "3.0.0-rc.11",
"unhead": "1.11.11",
"vite": "5.4.10",
"vue": "3.5.12"
},
@ -69,10 +75,10 @@
"@nuxt/webpack-builder": "workspace:*",
"@testing-library/vue": "8.1.0",
"@types/eslint__js": "8.42.3",
"@types/node": "22.8.7",
"@types/node": "22.9.0",
"@types/semver": "7.5.8",
"@unhead/schema": "1.11.11",
"@unhead/vue": "1.11.10",
"@unhead/vue": "1.11.11",
"@vitejs/plugin-vue": "5.1.4",
"@vitest/coverage-v8": "2.1.4",
"@vue/test-utils": "2.4.6",
@ -88,7 +94,7 @@
"eslint-plugin-perfectionist": "3.9.1",
"eslint-typegen": "0.3.2",
"h3": "npm:h3-nightly@2.0.0-1718872656.6765a6e",
"happy-dom": "15.8.0",
"happy-dom": "15.9.0",
"jiti": "2.4.0",
"markdownlint-cli": "0.42.0",
"nitro": "npm:nitro-nightly@3.0.0-beta-28796231.359af68d",

8
packages/nuxt/package.json
View File

@ -67,8 +67,8 @@
"@nuxt/vite-builder": "workspace:*",
"@unhead/dom": "^1.11.11",
"@unhead/shared": "^1.11.11",
"@unhead/ssr": "^1.11.10",
"@unhead/vue": "^1.11.10",
"@unhead/ssr": "^1.11.11",
"@unhead/vue": "^1.11.11",
"@vue/shared": "^3.5.12",
"acorn": "8.14.0",
"c12": "^2.0.1",
@ -113,7 +113,7 @@
"uncrypto": "^0.1.3",
"unctx": "^2.3.1",
"unenv": "^1.10.0",
"unhead": "^1.11.10",
"unhead": "^1.11.11",
"unimport": "^3.13.1",
"unplugin": "^1.15.0",
"unplugin-vue-router": "^0.10.8",
@ -127,7 +127,7 @@
"devDependencies": {
"@nuxt/scripts": "0.9.5",
"@nuxt/ui-templates": "1.3.4",
"@parcel/watcher": "2.4.1",
"@parcel/watcher": "2.5.0",
"@types/estree": "1.0.6",
"@vitejs/plugin-vue": "5.1.4",
"@vue/compiler-sfc": "3.5.12",

2
packages/nuxt/src/core/plugins/import-protection.ts
View File

@ -36,7 +36,7 @@ export const createImportProtectionPatterns = (nuxt: { options: NuxtOptions }, o
])
}
for (const i of [/(^|node_modules\/)@nuxt\/(kit|test-utils)/, /(^|node_modules\/)nuxi/, /(^|node_modules\/)nitro(?:pack)?(?:-nightly)?(?:$|\/)(?!(?:dist\/)?runtime|types)/, /(^|node_modules\/)nuxt\/(config|kit|schema)/]) {
for (const i of [/(^|node_modules\/)@nuxt\/(kit|test-utils)/, /(^|node_modules\/)nuxi/, /(^|node_modules\/)nitro(?:pack)?(?:-nightly)?(?:$|\/)(?!(?:dist\/)?(?:presets|runtime|types))/, /(^|node_modules\/)nuxt\/(config|kit|schema)/]) {
patterns.push([i, `This module cannot be imported in ${context}.`])
}

2
packages/rspack/package.json
View File

@ -81,7 +81,7 @@
"@types/pify": "5.0.4",
"@types/webpack-bundle-analyzer": "4.7.0",
"@types/webpack-hot-middleware": "2.25.9",
"rollup": "4.24.3",
"rollup": "4.24.4",
"unbuild": "3.0.0-rc.11",
"vue": "3.5.12"
},

2
packages/schema/src/config/nitro.ts
View File

@ -48,7 +48,7 @@ export default defineUntypedSchema({
* Each handler accepts the following options:
*
* - handler: The path to the file defining the handler.
* - route: The route under which the handler is available. This follows the conventions of [rou3](https://github.com/unjs/rou3.)
* - route: The route under which the handler is available. This follows the conventions of [rou3](https://github.com/unjs/rou3).
* - method: The HTTP method of requests that should be handled.
* - middleware: Specifies whether it is a middleware handler.
* - lazy: Specifies whether to use lazy loading to import the handler.

4
packages/ui-templates/package.json
View File

@ -18,7 +18,7 @@
"test": "pnpm lint && pnpm build"
},
"devDependencies": {
"@unocss/reset": "0.63.6",
"@unocss/reset": "0.64.0",
"beasties": "0.1.0",
"html-validate": "8.24.2",
"htmlnano": "2.1.1",
@ -29,7 +29,7 @@
"scule": "1.3.0",
"tinyexec": "0.3.1",
"tinyglobby": "0.2.10",
"unocss": "0.63.6",
"unocss": "0.64.0",
"vite": "5.4.10"
}
}

2
packages/vite/package.json
View File

@ -27,7 +27,7 @@
"@nuxt/schema": "workspace:*",
"@types/clear": "0.1.4",
"@types/estree": "1.0.6",
"rollup": "4.24.3",
"rollup": "4.24.4",
"unbuild": "3.0.0-rc.11",
"vue": "3.5.12"
},

2
packages/webpack/package.json
View File

@ -82,7 +82,7 @@
"@types/pify": "5.0.4",
"@types/webpack-bundle-analyzer": "4.7.0",
"@types/webpack-hot-middleware": "2.25.9",
"rollup": "4.24.3",
"rollup": "4.24.4",
"unbuild": "3.0.0-rc.11",
"vue": "3.5.12"
},

1512
pnpm-lock.yaml
View File

File diff suppressed because it is too large Load Diff

8
test/bundle.test.ts
View File

@ -21,8 +21,8 @@ describe.skipIf(process.env.SKIP_BUNDLE_SIZE === 'true' || process.env.ECOSYSTEM
const [clientStats, clientStatsInlined] = await Promise.all((['.output', '.output-inline'])
.map(outputDir => analyzeSizes(['**/*.js'], join(rootDir, outputDir, 'public'))))
expect.soft(roundToKilobytes(clientStats!.totalBytes)).toMatchInlineSnapshot(`"119k"`)
expect.soft(roundToKilobytes(clientStatsInlined!.totalBytes)).toMatchInlineSnapshot(`"119k"`)
expect.soft(roundToKilobytes(clientStats!.totalBytes)).toMatchInlineSnapshot(`"115k"`)
expect.soft(roundToKilobytes(clientStatsInlined!.totalBytes)).toMatchInlineSnapshot(`"115k"`)
const files = new Set([...clientStats!.files, ...clientStatsInlined!.files].map(f => f.replace(/\..*\.js/, '.js')))
@ -40,7 +40,7 @@ describe.skipIf(process.env.SKIP_BUNDLE_SIZE === 'true' || process.env.ECOSYSTEM
expect.soft(roundToKilobytes(serverStats.totalBytes)).toMatchInlineSnapshot(`"208k"`)
const modules = await analyzeSizes(['node_modules/**/*'], serverDir)
expect.soft(roundToKilobytes(modules.totalBytes)).toMatchInlineSnapshot(`"1393k"`)
expect.soft(roundToKilobytes(modules.totalBytes)).toMatchInlineSnapshot(`"1394k"`)
const packages = modules.files
.filter(m => m.endsWith('package.json'))
@ -81,7 +81,7 @@ describe.skipIf(process.env.SKIP_BUNDLE_SIZE === 'true' || process.env.ECOSYSTEM
expect.soft(roundToKilobytes(serverStats.totalBytes)).toMatchInlineSnapshot(`"557k"`)
const modules = await analyzeSizes(['node_modules/**/*'], serverDir)
expect.soft(roundToKilobytes(modules.totalBytes)).toMatchInlineSnapshot(`"94.2k"`)
expect.soft(roundToKilobytes(modules.totalBytes)).toMatchInlineSnapshot(`"94.4k"`)
const packages = modules.files
.filter(m => m.endsWith('package.json'))