From d38da4cd6a05f11dec44719c96ab11e212e5a5d6 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Wed, 22 Dec 2021 14:04:06 +0100 Subject: [PATCH 001/229] refactor: convert to monorepo --- packages/ui-templates/CHANGELOG.md | 73 +++++++++++ packages/ui-templates/README.md | 12 ++ packages/ui-templates/index.html | 14 +++ packages/ui-templates/lib/dev.ts | 32 +++++ packages/ui-templates/lib/prerender.ts | 21 ++++ packages/ui-templates/lib/render.ts | 105 ++++++++++++++++ packages/ui-templates/package.json | 42 +++++++ packages/ui-templates/public | 1 + packages/ui-templates/styles.ts | 1 + .../templates/error-404/index.html | 72 +++++++++++ .../templates/error-404/messages.json | 6 + .../templates/error-500/index.html | 49 ++++++++ .../templates/error-500/messages.json | 5 + .../templates/error-dev/index.html | 45 +++++++ .../templates/error-dev/messages.json | 5 + .../ui-templates/templates/loading/index.html | 119 ++++++++++++++++++ .../templates/loading/messages.json | 3 + packages/ui-templates/templates/messages.json | 3 + .../ui-templates/templates/welcome/index.html | 93 ++++++++++++++ .../templates/welcome/messages.json | 6 + packages/ui-templates/vite.config.ts | 41 ++++++ packages/ui-templates/windi.config.js | 77 ++++++++++++ 22 files changed, 825 insertions(+) create mode 100644 packages/ui-templates/CHANGELOG.md create mode 100644 packages/ui-templates/README.md create mode 100644 packages/ui-templates/index.html create mode 100644 packages/ui-templates/lib/dev.ts create mode 100644 packages/ui-templates/lib/prerender.ts create mode 100644 packages/ui-templates/lib/render.ts create mode 100644 packages/ui-templates/package.json create mode 120000 packages/ui-templates/public create mode 100644 packages/ui-templates/styles.ts create mode 100644 packages/ui-templates/templates/error-404/index.html create mode 100644 packages/ui-templates/templates/error-404/messages.json create mode 100644 packages/ui-templates/templates/error-500/index.html create mode 100644 packages/ui-templates/templates/error-500/messages.json create mode 100644 packages/ui-templates/templates/error-dev/index.html create mode 100644 packages/ui-templates/templates/error-dev/messages.json create mode 100644 packages/ui-templates/templates/loading/index.html create mode 100644 packages/ui-templates/templates/loading/messages.json create mode 100644 packages/ui-templates/templates/messages.json create mode 100644 packages/ui-templates/templates/welcome/index.html create mode 100644 packages/ui-templates/templates/welcome/messages.json create mode 100644 packages/ui-templates/vite.config.ts create mode 100644 packages/ui-templates/windi.config.js diff --git a/packages/ui-templates/CHANGELOG.md b/packages/ui-templates/CHANGELOG.md new file mode 100644 index 0000000000..e04d247057 --- /dev/null +++ b/packages/ui-templates/CHANGELOG.md @@ -0,0 +1,73 @@ +# Changelog + +All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. + +### [0.1.5](https://github.com/nuxt/ui/compare/v0.1.4...v0.1.5) (2021-11-10) + + +### Bug Fixes + +* don't include `const` declaration in `.d.ts` ([#40](https://github.com/nuxt/ui/issues/40)) ([75a5eae](https://github.com/nuxt/ui/commit/75a5eae76b797a9f49e30ec5469056d093a3a302)) + +### [0.1.4](https://github.com/nuxt/ui/compare/v0.1.3...v0.1.4) (2021-10-20) + + +### Bug Fixes + +* add button background on dark media ([#36](https://github.com/nuxt/ui/issues/36)) ([de0a759](https://github.com/nuxt/ui/commit/de0a75959d06e90239b5a203eeb9e9be6031f0c2)) +* add missing `rel="noopener` on some links([#34](https://github.com/nuxt/ui/issues/34)) ([8f18183](https://github.com/nuxt/ui/commit/8f18183f1d6cca49753e3b0a6a1da0aa8e0c9c83)) + +### [0.1.3](https://github.com/nuxt/ui/compare/v0.1.2...v0.1.3) (2021-10-12) + + +### Bug Fixes + +* updates colors and templates ([e5691b0](https://github.com/nuxt/ui/commit/e5691b049b684ae98a04c5a324679d0b1f34053b)) + +### [0.1.2](https://github.com/nuxt/ui/compare/v0.1.0...v0.1.2) (2021-10-12) + + +### Features + +* add welcome page template ([d7f95db](https://github.com/nuxt/ui/commit/d7f95db8c3344a2a05f91fb332f0f5ab1908b780)) + + +### Bug Fixes + +* add rootdir to vite fs.allow ([02da788](https://github.com/nuxt/ui/commit/02da78871564c5128b435694daa62c02b3acbef0)) + +### [0.1.1](https://github.com/nuxt/ui/compare/v0.1.0...v0.1.1) (2021-10-07) + +## [0.1.0](https://github.com/nuxt/ui/compare/v0.0.6...v0.1.0) (2021-09-23) + +### [0.0.6](https://github.com/nuxt/ui/compare/v0.0.5...v0.0.6) (2021-09-23) + +### [0.0.5](https://github.com/nuxt/ui/compare/v0.0.3...v0.0.5) (2021-07-20) + + +### Bug Fixes + +* correct color for the logo in dark mode ([408e6aa](https://github.com/nuxt/ui/commit/408e6aa22c0ba4920dadfa4f2eae9391d2862111)) + +### [0.0.4](https://github.com/nuxt/ui/compare/v0.0.3...v0.0.4) (2021-07-14) + +### [0.0.3](https://github.com/nuxt/ui/compare/v0.0.2...v0.0.3) (2021-07-14) + + +### Bug Fixes + +* use statusCode not message for 500 dev ([#19](https://github.com/nuxt/ui/issues/19)) ([a910883](https://github.com/nuxt/ui/commit/a910883024b2280770cbe985092153666eb17790)) + +### 0.0.2 (2021-07-14) + + +### Features + +* add prerender script to preview ([4721560](https://github.com/nuxt/ui/commit/4721560e969ce52d29107546aae2fef9a6e6224f)) +* loading page ([#18](https://github.com/nuxt/ui/issues/18)) ([78799fb](https://github.com/nuxt/ui/commit/78799fb695a896f6a992f28225b99283a38503ff)) +* update new structure (closes [#14](https://github.com/nuxt/ui/issues/14)) ([631c740](https://github.com/nuxt/ui/commit/631c740396736e124c3cea288c0bcc22545d4269)) + + +### Bug Fixes + +* fix prerender and strict context ([ae26e1f](https://github.com/nuxt/ui/commit/ae26e1f21e85155595cfd861d20cddeff858ad5f)) diff --git a/packages/ui-templates/README.md b/packages/ui-templates/README.md new file mode 100644 index 0000000000..457515b537 --- /dev/null +++ b/packages/ui-templates/README.md @@ -0,0 +1,12 @@ +# `@nuxt/ui-templates` + +Pre-compiled html templates used for Nuxt. + +## Development + +- Clone the repository +- Install dependencies with `yarn install` +- Start development server with `yarn dev` +- Open `http://localhost:3000/` for a list of all the templates + +To add a new template, simply create a new file: `./templates//index.html`. diff --git a/packages/ui-templates/index.html b/packages/ui-templates/index.html new file mode 100644 index 0000000000..bbc8e5c373 --- /dev/null +++ b/packages/ui-templates/index.html @@ -0,0 +1,14 @@ + + + + + + + + + + diff --git a/packages/ui-templates/lib/dev.ts b/packages/ui-templates/lib/dev.ts new file mode 100644 index 0000000000..881b20a664 --- /dev/null +++ b/packages/ui-templates/lib/dev.ts @@ -0,0 +1,32 @@ +import { resolve, join } from 'path' +import { promises as fsp } from 'fs' +import type { Plugin } from 'vite' +import template from 'lodash.template' +import genericMessages from '../templates/messages.json' + +const r = (...path: string[]) => resolve(join(__dirname, '..', ...path)) + +export const DevRenderingPlugin = () => { + return { + name: 'dev-rendering', + async transformIndexHtml (html: string, context) { + const page = context.originalUrl || '/' + + if (page === '/') { + const templateNames = await fsp.readdir(r('templates')) + const serializedData = JSON.stringify({ templateNames }) + return html.replace('{{ data }}', serializedData) + } + + const contents = await fsp.readFile(r(page, 'index.html'), 'utf-8') + + const messages = JSON.parse(await fsp.readFile(r(page, 'messages.json'), 'utf-8')) + + return template(contents, { + interpolate: /{{([\s\S]+?)}}/g + })({ + messages: { ...genericMessages, ...messages } + }) + } + } +} diff --git a/packages/ui-templates/lib/prerender.ts b/packages/ui-templates/lib/prerender.ts new file mode 100644 index 0000000000..6114ad5c8c --- /dev/null +++ b/packages/ui-templates/lib/prerender.ts @@ -0,0 +1,21 @@ +import { resolve, join } from 'path' +import { promises as fsp } from 'fs' +import glob from 'globby' + +const r = (...path: string[]) => resolve(join(__dirname, '..', ...path)) + +async function main () { + const templates = await glob(r('dist/templates/*.mjs')) + for (const file of templates) { + const { template } = await import(file) + const updated = template({ + // messages: {}, + name: '{{ name }}' // TODO + }) + await fsp.mkdir(file.replace('.mjs', '')) + await fsp.writeFile(file.replace('.mjs', '/index.html'), updated) + } +} + +// eslint-disable-next-line no-console +main().catch(console.error) diff --git a/packages/ui-templates/lib/render.ts b/packages/ui-templates/lib/render.ts new file mode 100644 index 0000000000..e2808fc4bf --- /dev/null +++ b/packages/ui-templates/lib/render.ts @@ -0,0 +1,105 @@ +import { promises as fsp } from 'fs' +import { resolve, join, dirname, basename } from 'upath' +import type { Plugin } from 'vite' +import Critters from 'critters' +import glob from 'globby' +import template from 'lodash.template' +import htmlMinifier from 'html-minifier' +import { camelCase } from 'scule' +import genericMessages from '../templates/messages.json' + +const r = (...path: string[]) => resolve(join(__dirname, '..', ...path)) + +const replaceAll = (input, search, replace) => input.split(search).join(replace) + +export const RenderPlugin = () => { + return { + name: 'render', + enforce: 'post', + async writeBundle () { + const distDir = r('dist') + const critters = new Critters({ path: distDir }) + const htmlFiles = await glob(r('dist/templates/**/*.html')) + + const templateExports = [] + + for (const fileName of htmlFiles) { + // Infer template name + const templateName = basename(dirname(fileName)) + + // eslint-disable-next-line no-console + console.log('Processing', templateName) + + // Read source template + let html = await fsp.readFile(fileName, 'utf-8') + + // Apply criters to inline styles + html = await critters.process(html) + // We no longer need references to external CSS + html = html.replace(/]*>/g, '') + + // Inline SVGs + const svgSources = Array.from(html.matchAll(/src="([^"]+)"|url([^)]+)/g)) + .map(m => m[1]) + .filter(src => src?.match(/\.svg$/)) + + for (const src of svgSources) { + const svg = await fsp.readFile(r('dist', src), 'utf-8') + const base64Source = `data:image/svg+xml;charset=utf-8,${encodeURIComponent(svg)}` + html = replaceAll(html, src, base64Source) + } + + // Inline our scripts + const scriptSources = Array.from(html.matchAll(/]*src="(.*)"[^>]*>[\s\S]*?<\/script>/g)) + .filter(([_block, src]) => src?.match(/^\/.*\.js$/)) + + for (const [scriptBlock, src] of scriptSources) { + let contents = await fsp.readFile(r('dist', src), 'utf-8') + contents = replaceAll(contents, '/* empty css */', '').trim() + html = html.replace(scriptBlock, contents.length ? `` : '') + } + + // Minify HTML + html = htmlMinifier.minify(html, { collapseWhitespace: true }) + + // Load messages + const messages = JSON.parse(await fsp.readFile(r(`templates/${templateName}/messages.json`), 'utf-8')) + + // Serialize into a js function + const jsCode = [ + `const _messages = ${JSON.stringify({ ...genericMessages, ...messages })}`, + `const _render = ${template(html, { variable: '__var__', interpolate: /{{([\s\S]+?)}}/g }).toString().replace('__var__', '{ messages }')}`, + 'const _template = (messages) => _render({ messages: { ..._messages, ...messages } })' + ].join('\n').trim() + + // Generate types + const types = [ + `export type DefaultMessages = Record<${Object.keys(messages).map(a => `"${a}"`).join(' | ')}, string | boolean | number >`, + 'declare const template: (data: Partial) => string', + 'export { template }' + ].join('\n') + + // Register exports + templateExports.push({ + exportName: camelCase(templateName), + templateName, + types + }) + + // Write new template + await fsp.writeFile(fileName.replace('/index.html', '.mjs'), `${jsCode}\nexport const template = _template`) + await fsp.writeFile(fileName.replace('/index.html', '.d.ts'), `${types}`) + + // Remove original html file + await fsp.unlink(fileName) + await fsp.rmdir(dirname(fileName)) + } + + // Write an index file with named exports for each template + const contents = templateExports.map(exp => `export { template as ${exp.exportName} } from './templates/${exp.templateName}.mjs'`).join('\n') + await fsp.writeFile(r('dist/index.mjs'), contents, 'utf8') + + await fsp.writeFile(r('dist/index.d.ts'), replaceAll(contents, /\.mjs/g, ''), 'utf8') + } + } +} diff --git a/packages/ui-templates/package.json b/packages/ui-templates/package.json new file mode 100644 index 0000000000..2e9e94f212 --- /dev/null +++ b/packages/ui-templates/package.json @@ -0,0 +1,42 @@ +{ + "name": "@nuxt/ui-templates", + "version": "0.1.5", + "repository": "nuxt/ui", + "license": "CC-BY-ND-4.0", + "exports": { + "./templates/*": "./dist/templates/*.mjs", + ".": "./dist/index.mjs", + "./*": "./dist/*" + }, + "main": "./dist/index.mjs", + "types": "./dist/index.d.ts", + "files": [ + "dist/templates", + "dist/index.*" + ], + "scripts": { + "dev": "vite", + "build": "vite build", + "lint": "eslint --ext .ts,.js .", + "test": "yarn lint && yarn build", + "prepack": "yarn build", + "release": "yarn test && standard-version && npm publish && git push --follow-tags", + "optimize-assets": "npx svgo public/assets/**/*.svg", + "prerender": "yarn build && jiti ./lib/prerender" + }, + "devDependencies": { + "@nuxt/ui-assets": "^0.1.0", + "@types/html-minifier": "^4.0.1", + "@types/lodash.template": "^4.5.0", + "critters": "^0.0.14", + "globby": "^11.0.4", + "html-minifier": "^4.0.0", + "lodash.template": "^4.5.0", + "scule": "^0.2.1", + "standard-version": "^9.3.2", + "upath": "^2.0.1", + "vite": "^2.6.14", + "vite-plugin-windicss": "^1.5.1", + "windicss": "^3.2.1" + } +} diff --git a/packages/ui-templates/public b/packages/ui-templates/public new file mode 120000 index 0000000000..ec2e4be2f8 --- /dev/null +++ b/packages/ui-templates/public @@ -0,0 +1 @@ +../assets \ No newline at end of file diff --git a/packages/ui-templates/styles.ts b/packages/ui-templates/styles.ts new file mode 100644 index 0000000000..0de9720127 --- /dev/null +++ b/packages/ui-templates/styles.ts @@ -0,0 +1 @@ +import 'virtual:windi.css' diff --git a/packages/ui-templates/templates/error-404/index.html b/packages/ui-templates/templates/error-404/index.html new file mode 100644 index 0000000000..7bd1def561 --- /dev/null +++ b/packages/ui-templates/templates/error-404/index.html @@ -0,0 +1,72 @@ + + + + {{ messages.statusCode }} - {{ messages.statusMessage }} | {{ messages.appName }} + + + + + + +
+
+
+
+ {{ messages.statusCode }} +
+
+

+ {{ messages.description }} +

+ + {{ messages.backHome }} + +
+
+
+ +
+
+ + diff --git a/packages/ui-templates/templates/error-404/messages.json b/packages/ui-templates/templates/error-404/messages.json new file mode 100644 index 0000000000..713d7d646b --- /dev/null +++ b/packages/ui-templates/templates/error-404/messages.json @@ -0,0 +1,6 @@ +{ + "statusCode": "404", + "statusMessage": "Not Found", + "description": "Sorry, the page you are looking for could not be found.", + "backHome": "Go back home" +} diff --git a/packages/ui-templates/templates/error-500/index.html b/packages/ui-templates/templates/error-500/index.html new file mode 100644 index 0000000000..6f769a7d17 --- /dev/null +++ b/packages/ui-templates/templates/error-500/index.html @@ -0,0 +1,49 @@ + + + + + {{ messages.statusCode }} - {{ messages.statusMessage }} | {{ messages.appName }} + + + + + + +
+
+
+
+ {{ messages.statusCode }} +
+
+

+ {{ messages.description }} +

+
+
+
+ +
+
+ + + diff --git a/packages/ui-templates/templates/error-500/messages.json b/packages/ui-templates/templates/error-500/messages.json new file mode 100644 index 0000000000..3ce7d78762 --- /dev/null +++ b/packages/ui-templates/templates/error-500/messages.json @@ -0,0 +1,5 @@ +{ + "statusCode": "500", + "statusMessage": "Server error", + "description": "This page is temporarily unavailable." +} diff --git a/packages/ui-templates/templates/error-dev/index.html b/packages/ui-templates/templates/error-dev/index.html new file mode 100644 index 0000000000..3ee5b34947 --- /dev/null +++ b/packages/ui-templates/templates/error-dev/index.html @@ -0,0 +1,45 @@ + + + + {{ messages.statusCode }} - {{ messages.statusMessage }} | {{ messages.appName }} + + + + + +
+
+
+
+ {{ messages.statusCode }} +
+
+

+ {{ messages.description }} +

+
+
+
+ + diff --git a/packages/ui-templates/templates/error-dev/messages.json b/packages/ui-templates/templates/error-dev/messages.json new file mode 100644 index 0000000000..051a3cd15b --- /dev/null +++ b/packages/ui-templates/templates/error-dev/messages.json @@ -0,0 +1,5 @@ +{ + "statusCode": "500", + "statusMessage": "Server error", + "description": "An error occurred in the application and the page could not be served. If you are the application owner, check your server logs for details." +} diff --git a/packages/ui-templates/templates/loading/index.html b/packages/ui-templates/templates/loading/index.html new file mode 100644 index 0000000000..7e6e11f65f --- /dev/null +++ b/packages/ui-templates/templates/loading/index.html @@ -0,0 +1,119 @@ + + + + {{ messages.loading }} | {{ messages.appName }} + + + + + + + + + + + + + + + + +
+
+
+ + + + diff --git a/packages/ui-templates/templates/loading/messages.json b/packages/ui-templates/templates/loading/messages.json new file mode 100644 index 0000000000..53151fbbab --- /dev/null +++ b/packages/ui-templates/templates/loading/messages.json @@ -0,0 +1,3 @@ +{ + "loading": "Loading" +} diff --git a/packages/ui-templates/templates/messages.json b/packages/ui-templates/templates/messages.json new file mode 100644 index 0000000000..7063043212 --- /dev/null +++ b/packages/ui-templates/templates/messages.json @@ -0,0 +1,3 @@ +{ + "appName": "Nuxt" +} diff --git a/packages/ui-templates/templates/welcome/index.html b/packages/ui-templates/templates/welcome/index.html new file mode 100644 index 0000000000..0b08ff8af8 --- /dev/null +++ b/packages/ui-templates/templates/welcome/index.html @@ -0,0 +1,93 @@ + + + + {{ messages.title }} + + + + + +
+
+
+ + + + + + + + + + +
+
+
+
+
+ + + + +
+ + {{ messages.documentation }} + +
+
+
+
+ {{ messages.readDocs }}
+ + {{ messages.documentation }} + +
+
+
+
+
+ + + +
+ Twitter +
+
+
+
+ {{ messages.followTwitter }}
+ @nuxt_js +
+
+
+
+
+
+

To remove this welcome page, you have 2 options:

+
    +
  • Create an app.vue
    • +
  • Create a pages/index.vue
    • +
+
+
+
+ + diff --git a/packages/ui-templates/templates/welcome/messages.json b/packages/ui-templates/templates/welcome/messages.json new file mode 100644 index 0000000000..8aa3a8c741 --- /dev/null +++ b/packages/ui-templates/templates/welcome/messages.json @@ -0,0 +1,6 @@ +{ + "title": "Welcome to Nuxt 3!", + "documentation": "Documentation", + "readDocs": "We highly recommend you take a look at the Nuxt documentation, whether you are new or have previous experience with the framework.", + "followTwitter": "Follow the Nuxt Twitter account to get latest news about releases, new modules, tutorials and tips." +} diff --git a/packages/ui-templates/vite.config.ts b/packages/ui-templates/vite.config.ts new file mode 100644 index 0000000000..83657d4c11 --- /dev/null +++ b/packages/ui-templates/vite.config.ts @@ -0,0 +1,41 @@ +import { resolve } from 'path' +import { readdirSync } from 'fs' + +import { defineConfig } from 'vite' +import WindiCSS from 'vite-plugin-windicss' + +import { DevRenderingPlugin } from './lib/dev' +import { RenderPlugin } from './lib/render' + +const r = (...path: string[]) => resolve(__dirname, ...path) + +export default defineConfig({ + build: { + rollupOptions: { + input: { + ...Object.fromEntries( + readdirSync(r('templates')).filter(dir => dir !== 'messages.json').map(dir => [ + dir, + r('templates', dir, 'index.html') + ]) + ), + index: r('index.html') + } + } + }, + plugins: [ + WindiCSS({ + scan: { + dirs: ['templates'], + fileExtensions: ['html'] + } + }), + DevRenderingPlugin(), + RenderPlugin() + ], + server: { + fs: { + allow: ['./templates', __dirname] + } + } +}) diff --git a/packages/ui-templates/windi.config.js b/packages/ui-templates/windi.config.js new file mode 100644 index 0000000000..245a9a98c6 --- /dev/null +++ b/packages/ui-templates/windi.config.js @@ -0,0 +1,77 @@ +const colors = require('windicss/colors') + +module.exports = { + purge: ['./src/**/*.html'], + darkMode: 'media', + theme: { + colors: { + white: 'white', + black: 'black', + transparent: 'transparent', + current: 'currentColor', + primary: { + 50: '#F2FDF9', + 100: '#E6FCF3', + 200: '#BFF6E0', + 300: '#99F1CD', + 400: '#4DE7A8', + DEFAULT: '#00DC82', + 600: '#00C675', + 700: '#00844E', + 800: '#00633B', + 900: '#004227' + }, + 'secondary-surface': '#E5F9FF', + 'secondary-lightest': '#B7E1ED', + 'secondary-lighter': '#95CDDE', + 'secondary-light': '#71A2B0', + secondary: '#497A87', + 'secondary-dark': '#255461', + 'secondary-darker': '#003543', + 'secondary-darkest': '#012A35', + 'secondary-black': '#001E26', + tertiary: '#B2CCCC', // cloud + 'cloud-surface': '#E6F0F0', + 'cloud-lightest': '#D1E2E2', + 'cloud-lighter': '#B2CCCC', + 'cloud-light': '#92ADAD', + cloud: '#688282', + 'cloud-dark': '#566B6B', + 'cloud-darker': '#334040', + 'cloud-darkest': '#273131', + 'cloud-black': '#1A2121', + blue: colors.sky, + green: { + // 50: "#eefdf2", + 50: '#d0fcde', + 100: '#b0fccb', + 200: '#8cfab7', + 300: '#64f4a3', + 400: '#37e990', + 500: '#00d77d', + 600: '#00bb6a', + 700: '#009956', + 800: '#047342', + 900: '#134d2e' + // 950: "#132a1c", + }, + red: colors.red, + rose: colors.rose, + yellow: colors.amber, + orange: colors.orange, + gray: colors.gray, + purple: colors.purple, + sky: { + surface: '#E5F9FF', + lightest: '#B7E1ED', + lighter: '#95CDDE', + light: '#71A2B0', + DEFAULT: '#497A87', + dark: '#255461', + darker: '#003543', + darkest: '#012A35', + black: '#001E26' + } + } + } +} From e750f66215bfd8f70dfa3c926989a59c311026b5 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Wed, 22 Dec 2021 20:54:18 +0100 Subject: [PATCH 002/229] chore: update repository --- packages/ui-templates/README.md | 4 + packages/ui-templates/package.json | 18 +++-- .../templates/error-404/index.html | 73 ++++++++----------- .../templates/error-500/index.html | 2 +- 4 files changed, 47 insertions(+), 50 deletions(-) diff --git a/packages/ui-templates/README.md b/packages/ui-templates/README.md index 457515b537..36bb1fafc4 100644 --- a/packages/ui-templates/README.md +++ b/packages/ui-templates/README.md @@ -10,3 +10,7 @@ Pre-compiled html templates used for Nuxt. - Open `http://localhost:3000/` for a list of all the templates To add a new template, simply create a new file: `./templates//index.html`. + +# License + +Creative Commons License
Nuxt UI by Nuxt Team is licensed under a Creative Commons Attribution-NoDerivatives 4.0 International License.
Based on a work at https://github.com/nuxt/ui. diff --git a/packages/ui-templates/package.json b/packages/ui-templates/package.json index 2e9e94f212..177580329d 100644 --- a/packages/ui-templates/package.json +++ b/packages/ui-templates/package.json @@ -1,6 +1,6 @@ { "name": "@nuxt/ui-templates", - "version": "0.1.5", + "version": "0.0.0", "repository": "nuxt/ui", "license": "CC-BY-ND-4.0", "exports": { @@ -15,28 +15,30 @@ "dist/index.*" ], "scripts": { - "dev": "vite", "build": "vite build", + "dev": "vite", "lint": "eslint --ext .ts,.js .", - "test": "yarn lint && yarn build", - "prepack": "yarn build", - "release": "yarn test && standard-version && npm publish && git push --follow-tags", "optimize-assets": "npx svgo public/assets/**/*.svg", - "prerender": "yarn build && jiti ./lib/prerender" + "prepack": "yarn build", + "prerender": "yarn build && jiti ./lib/prerender", + "test": "yarn lint && yarn build" }, "devDependencies": { - "@nuxt/ui-assets": "^0.1.0", + "@nuxt/ui-assets": "*", "@types/html-minifier": "^4.0.1", "@types/lodash.template": "^4.5.0", "critters": "^0.0.14", "globby": "^11.0.4", "html-minifier": "^4.0.0", + "jiti": "^1.12.9", "lodash.template": "^4.5.0", "scule": "^0.2.1", - "standard-version": "^9.3.2", "upath": "^2.0.1", "vite": "^2.6.14", "vite-plugin-windicss": "^1.5.1", "windicss": "^3.2.1" + }, + "publishConfig": { + "access": "public" } } diff --git a/packages/ui-templates/templates/error-404/index.html b/packages/ui-templates/templates/error-404/index.html index 7bd1def561..01734da310 100644 --- a/packages/ui-templates/templates/error-404/index.html +++ b/packages/ui-templates/templates/error-404/index.html @@ -1,47 +1,40 @@ - - {{ messages.statusCode }} - {{ messages.statusMessage }} | {{ messages.appName }} - - - - - + + + + + + "> -
-
-
-
- {{ messages.statusCode }} -
-
-

+

+
+
+ {{ messages.statusCode }} +
+
+

- {{ messages.description }} -

- + {{ messages.description }} +

+ - {{ messages.backHome }} - -
+ "> + {{ messages.backHome }} +
-
- -
+ "> +
- +
+ + diff --git a/packages/ui-templates/templates/error-500/index.html b/packages/ui-templates/templates/error-500/index.html index 6f769a7d17..cb49c8ce32 100644 --- a/packages/ui-templates/templates/error-500/index.html +++ b/packages/ui-templates/templates/error-500/index.html @@ -41,7 +41,7 @@ pb-full md:flex md:pb-0 md:min-h-screen md:w-1/2 "> - +
From a2e70eff956e11a83f3cbd9bef241d3e924a0ab4 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Wed, 22 Dec 2021 22:15:35 +0100 Subject: [PATCH 003/229] chore: update readme --- packages/ui-templates/README.md | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/packages/ui-templates/README.md b/packages/ui-templates/README.md index 36bb1fafc4..0eb922e19c 100644 --- a/packages/ui-templates/README.md +++ b/packages/ui-templates/README.md @@ -1,16 +1,11 @@ # `@nuxt/ui-templates` -Pre-compiled html templates used for Nuxt. + -## Development +Pre-compiled html templates for internal pages. -- Clone the repository -- Install dependencies with `yarn install` -- Start development server with `yarn dev` -- Open `http://localhost:3000/` for a list of all the templates - -To add a new template, simply create a new file: `./templates//index.html`. +๐Ÿ€ [Online Playground](https://templates.ui.nuxtjs.org) # License -Creative Commons License
Nuxt UI by Nuxt Team is licensed under a Creative Commons Attribution-NoDerivatives 4.0 International License.
Based on a work at https://github.com/nuxt/ui. +Creative Commons License
Nuxt UI by Nuxt Project is licensed under a Creative Commons Attribution-NoDerivatives 4.0 International License.
Based on a work at https://github.com/nuxt/ui. From 865e1a92069b78fdab6d24699a9154be01dc1527 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 22 Dec 2021 22:16:20 +0100 Subject: [PATCH 004/229] chore(deps): update all non-major dependencies (#41) Co-authored-by: Renovate Bot --- packages/ui-templates/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/ui-templates/package.json b/packages/ui-templates/package.json index 177580329d..3294224e17 100644 --- a/packages/ui-templates/package.json +++ b/packages/ui-templates/package.json @@ -27,16 +27,16 @@ "@nuxt/ui-assets": "*", "@types/html-minifier": "^4.0.1", "@types/lodash.template": "^4.5.0", - "critters": "^0.0.14", + "critters": "^0.0.15", "globby": "^11.0.4", "html-minifier": "^4.0.0", "jiti": "^1.12.9", "lodash.template": "^4.5.0", "scule": "^0.2.1", "upath": "^2.0.1", - "vite": "^2.6.14", - "vite-plugin-windicss": "^1.5.1", - "windicss": "^3.2.1" + "vite": "^2.7.6", + "vite-plugin-windicss": "^1.6.1", + "windicss": "^3.4.0" }, "publishConfig": { "access": "public" From e3c4578a7fbbe4cbefc225fe1e2e63e8e061cbc9 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Wed, 22 Dec 2021 22:27:23 +0100 Subject: [PATCH 005/229] chore(deps): update eslint-config and globby --- packages/ui-templates/lib/prerender.ts | 4 ++-- packages/ui-templates/lib/render.ts | 4 ++-- packages/ui-templates/package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/ui-templates/lib/prerender.ts b/packages/ui-templates/lib/prerender.ts index 6114ad5c8c..8de94df8e8 100644 --- a/packages/ui-templates/lib/prerender.ts +++ b/packages/ui-templates/lib/prerender.ts @@ -1,11 +1,11 @@ import { resolve, join } from 'path' import { promises as fsp } from 'fs' -import glob from 'globby' +import { globby } from 'globby' const r = (...path: string[]) => resolve(join(__dirname, '..', ...path)) async function main () { - const templates = await glob(r('dist/templates/*.mjs')) + const templates = await globby(r('dist/templates/*.mjs')) for (const file of templates) { const { template } = await import(file) const updated = template({ diff --git a/packages/ui-templates/lib/render.ts b/packages/ui-templates/lib/render.ts index e2808fc4bf..09f778957c 100644 --- a/packages/ui-templates/lib/render.ts +++ b/packages/ui-templates/lib/render.ts @@ -2,7 +2,6 @@ import { promises as fsp } from 'fs' import { resolve, join, dirname, basename } from 'upath' import type { Plugin } from 'vite' import Critters from 'critters' -import glob from 'globby' import template from 'lodash.template' import htmlMinifier from 'html-minifier' import { camelCase } from 'scule' @@ -19,7 +18,8 @@ export const RenderPlugin = () => { async writeBundle () { const distDir = r('dist') const critters = new Critters({ path: distDir }) - const htmlFiles = await glob(r('dist/templates/**/*.html')) + const globby = await import('globby').then(r => r.globby) + const htmlFiles = await globby(r('dist/templates/**/*.html')) const templateExports = [] diff --git a/packages/ui-templates/package.json b/packages/ui-templates/package.json index 3294224e17..52a9bb99b2 100644 --- a/packages/ui-templates/package.json +++ b/packages/ui-templates/package.json @@ -28,7 +28,7 @@ "@types/html-minifier": "^4.0.1", "@types/lodash.template": "^4.5.0", "critters": "^0.0.15", - "globby": "^11.0.4", + "globby": "^12.0.2", "html-minifier": "^4.0.0", "jiti": "^1.12.9", "lodash.template": "^4.5.0", From a83f786d18e26b535218ab4d57c4681d49c43350 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 24 Dec 2021 10:22:07 +0800 Subject: [PATCH 006/229] chore(deps): update all non-major dependencies (#45) Co-authored-by: Renovate Bot --- packages/ui-templates/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ui-templates/package.json b/packages/ui-templates/package.json index 52a9bb99b2..a088bc5b25 100644 --- a/packages/ui-templates/package.json +++ b/packages/ui-templates/package.json @@ -25,7 +25,7 @@ }, "devDependencies": { "@nuxt/ui-assets": "*", - "@types/html-minifier": "^4.0.1", + "@types/html-minifier": "^4.0.2", "@types/lodash.template": "^4.5.0", "critters": "^0.0.15", "globby": "^12.0.2", From 10b1ffa5a067fd049d233115a4e598637a92169a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 26 Dec 2021 22:29:48 +0800 Subject: [PATCH 007/229] chore(deps): update all non-major dependencies (#46) Co-authored-by: Renovate Bot --- packages/ui-templates/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ui-templates/package.json b/packages/ui-templates/package.json index a088bc5b25..b5d37b6ac9 100644 --- a/packages/ui-templates/package.json +++ b/packages/ui-templates/package.json @@ -34,7 +34,7 @@ "lodash.template": "^4.5.0", "scule": "^0.2.1", "upath": "^2.0.1", - "vite": "^2.7.6", + "vite": "^2.7.7", "vite-plugin-windicss": "^1.6.1", "windicss": "^3.4.0" }, From 54d64243dd5fe55f5dd05e858528c77f8d212296 Mon Sep 17 00:00:00 2001 From: Anthony Fu Date: Tue, 28 Dec 2021 15:35:30 +0800 Subject: [PATCH 008/229] chore: update deps --- packages/ui-templates/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ui-templates/package.json b/packages/ui-templates/package.json index b5d37b6ac9..d2e612f0dd 100644 --- a/packages/ui-templates/package.json +++ b/packages/ui-templates/package.json @@ -36,7 +36,7 @@ "upath": "^2.0.1", "vite": "^2.7.7", "vite-plugin-windicss": "^1.6.1", - "windicss": "^3.4.0" + "windicss": "^3.4.1" }, "publishConfig": { "access": "public" From e127b478a0b1ecb0a0b6a75e8eec60d5413026fe Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 30 Dec 2021 21:10:27 +0800 Subject: [PATCH 009/229] chore(deps): update all non-major dependencies (#47) Co-authored-by: Renovate Bot --- packages/ui-templates/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ui-templates/package.json b/packages/ui-templates/package.json index d2e612f0dd..a60ed74417 100644 --- a/packages/ui-templates/package.json +++ b/packages/ui-templates/package.json @@ -34,9 +34,9 @@ "lodash.template": "^4.5.0", "scule": "^0.2.1", "upath": "^2.0.1", - "vite": "^2.7.7", + "vite": "^2.7.10", "vite-plugin-windicss": "^1.6.1", - "windicss": "^3.4.1" + "windicss": "^3.4.2" }, "publishConfig": { "access": "public" From 7a48967561315496c61515e693b4b1a938ee265a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 13 Jan 2022 13:09:55 +0800 Subject: [PATCH 010/229] chore(deps): update all non-major dependencies (#51) Co-authored-by: Renovate Bot --- packages/ui-templates/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ui-templates/package.json b/packages/ui-templates/package.json index a60ed74417..16ae139b4c 100644 --- a/packages/ui-templates/package.json +++ b/packages/ui-templates/package.json @@ -27,7 +27,7 @@ "@nuxt/ui-assets": "*", "@types/html-minifier": "^4.0.2", "@types/lodash.template": "^4.5.0", - "critters": "^0.0.15", + "critters": "^0.0.16", "globby": "^12.0.2", "html-minifier": "^4.0.0", "jiti": "^1.12.9", @@ -35,7 +35,7 @@ "scule": "^0.2.1", "upath": "^2.0.1", "vite": "^2.7.10", - "vite-plugin-windicss": "^1.6.1", + "vite-plugin-windicss": "^1.6.2", "windicss": "^3.4.2" }, "publishConfig": { From 8acde2c2bcab0473be7e25920a51064d31a9367c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 17 Jan 2022 18:16:20 +0800 Subject: [PATCH 011/229] chore(deps): update all non-major dependencies (#52) Co-authored-by: Renovate Bot --- packages/ui-templates/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/ui-templates/package.json b/packages/ui-templates/package.json index 16ae139b4c..8721360473 100644 --- a/packages/ui-templates/package.json +++ b/packages/ui-templates/package.json @@ -28,15 +28,15 @@ "@types/html-minifier": "^4.0.2", "@types/lodash.template": "^4.5.0", "critters": "^0.0.16", - "globby": "^12.0.2", + "globby": "^12.2.0", "html-minifier": "^4.0.0", "jiti": "^1.12.9", "lodash.template": "^4.5.0", "scule": "^0.2.1", "upath": "^2.0.1", - "vite": "^2.7.10", + "vite": "^2.7.12", "vite-plugin-windicss": "^1.6.2", - "windicss": "^3.4.2" + "windicss": "^3.4.3" }, "publishConfig": { "access": "public" From f6558a9a1521bb8b2b82f4b6acf22f61f64736c9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 21 Jan 2022 04:54:34 +0800 Subject: [PATCH 012/229] chore(deps): update all non-major dependencies (#53) Co-authored-by: Renovate Bot --- packages/ui-templates/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ui-templates/package.json b/packages/ui-templates/package.json index 8721360473..03b668655b 100644 --- a/packages/ui-templates/package.json +++ b/packages/ui-templates/package.json @@ -34,8 +34,8 @@ "lodash.template": "^4.5.0", "scule": "^0.2.1", "upath": "^2.0.1", - "vite": "^2.7.12", - "vite-plugin-windicss": "^1.6.2", + "vite": "^2.7.13", + "vite-plugin-windicss": "^1.6.3", "windicss": "^3.4.3" }, "publishConfig": { From 5db3d608a1758335ebf65673296ee4c03f342cd6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 3 Feb 2022 11:01:26 +0800 Subject: [PATCH 013/229] chore(deps): update devdependency globby to v13 (#55) Co-authored-by: Renovate Bot --- packages/ui-templates/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ui-templates/package.json b/packages/ui-templates/package.json index 03b668655b..c8fab6c5a0 100644 --- a/packages/ui-templates/package.json +++ b/packages/ui-templates/package.json @@ -28,7 +28,7 @@ "@types/html-minifier": "^4.0.2", "@types/lodash.template": "^4.5.0", "critters": "^0.0.16", - "globby": "^12.2.0", + "globby": "^13.1.1", "html-minifier": "^4.0.0", "jiti": "^1.12.9", "lodash.template": "^4.5.0", From f5aa641342c09686d7bd7ab88104a122d56ecd2c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 3 Feb 2022 11:01:36 +0800 Subject: [PATCH 014/229] chore(deps): update all non-major dependencies (#56) Co-authored-by: Renovate Bot --- packages/ui-templates/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ui-templates/package.json b/packages/ui-templates/package.json index c8fab6c5a0..0e5dd936e6 100644 --- a/packages/ui-templates/package.json +++ b/packages/ui-templates/package.json @@ -30,7 +30,7 @@ "critters": "^0.0.16", "globby": "^13.1.1", "html-minifier": "^4.0.0", - "jiti": "^1.12.9", + "jiti": "^1.12.15", "lodash.template": "^4.5.0", "scule": "^0.2.1", "upath": "^2.0.1", From d3ab7fdf8e43fc87ae0dad3f7e583a4fc055e831 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 16 Feb 2022 15:24:36 +0800 Subject: [PATCH 015/229] chore(deps): update all non-major dependencies (#57) Co-authored-by: Renovate Bot Co-authored-by: Anthony Fu --- packages/ui-templates/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ui-templates/package.json b/packages/ui-templates/package.json index 0e5dd936e6..d0649d270e 100644 --- a/packages/ui-templates/package.json +++ b/packages/ui-templates/package.json @@ -34,8 +34,8 @@ "lodash.template": "^4.5.0", "scule": "^0.2.1", "upath": "^2.0.1", - "vite": "^2.7.13", - "vite-plugin-windicss": "^1.6.3", + "vite": "^2.8.3", + "vite-plugin-windicss": "^1.7.0", "windicss": "^3.4.3" }, "publishConfig": { From d7121f637ce66e1c8a2fd91e257a983386e76b47 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Feb 2022 13:10:44 +0800 Subject: [PATCH 016/229] chore(deps): update devdependency vite-plugin-windicss to ^1.7.1 (#60) Co-authored-by: Renovate Bot --- packages/ui-templates/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ui-templates/package.json b/packages/ui-templates/package.json index d0649d270e..76a7d3989b 100644 --- a/packages/ui-templates/package.json +++ b/packages/ui-templates/package.json @@ -35,7 +35,7 @@ "scule": "^0.2.1", "upath": "^2.0.1", "vite": "^2.8.3", - "vite-plugin-windicss": "^1.7.0", + "vite-plugin-windicss": "^1.7.1", "windicss": "^3.4.3" }, "publishConfig": { From 1428c46e9681373e987e6b7e22dbba15b90b28cd Mon Sep 17 00:00:00 2001 From: Anthony Fu Date: Tue, 1 Mar 2022 01:25:51 +0800 Subject: [PATCH 017/229] feat(ui): enable transformers for unocss --- packages/ui-templates/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/ui-templates/package.json b/packages/ui-templates/package.json index 76a7d3989b..ec8a617f6a 100644 --- a/packages/ui-templates/package.json +++ b/packages/ui-templates/package.json @@ -30,13 +30,13 @@ "critters": "^0.0.16", "globby": "^13.1.1", "html-minifier": "^4.0.0", - "jiti": "^1.12.15", + "jiti": "^1.13.0", "lodash.template": "^4.5.0", "scule": "^0.2.1", "upath": "^2.0.1", - "vite": "^2.8.3", - "vite-plugin-windicss": "^1.7.1", - "windicss": "^3.4.3" + "vite": "^2.8.5", + "vite-plugin-windicss": "^1.8.1", + "windicss": "^3.5.0" }, "publishConfig": { "access": "public" From 62e2f94fcd2d846fca039520a10bcdd0f685ee36 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Thu, 10 Mar 2022 20:25:58 +0000 Subject: [PATCH 018/229] feat!: generate vue sfcs as part of build (#67) --- packages/ui-templates/lib/render.ts | 32 +++++++++++++++++++ packages/ui-templates/package.json | 3 +- .../templates/error-dev/messages.json | 3 +- 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/packages/ui-templates/lib/render.ts b/packages/ui-templates/lib/render.ts index 09f778957c..985107a291 100644 --- a/packages/ui-templates/lib/render.ts +++ b/packages/ui-templates/lib/render.ts @@ -3,6 +3,7 @@ import { resolve, join, dirname, basename } from 'upath' import type { Plugin } from 'vite' import Critters from 'critters' import template from 'lodash.template' +import { genObjectFromRawEntries } from 'knitwork' import htmlMinifier from 'html-minifier' import { camelCase } from 'scule' import genericMessages from '../templates/messages.json' @@ -72,6 +73,36 @@ export const RenderPlugin = () => { 'const _template = (messages) => _render({ messages: { ..._messages, ...messages } })' ].join('\n').trim() + const templateContent = html + .match(/([\s\S]*)<\/body>/)?.[0] + .replace(/(?<=<|<\/)body/g, 'div') + .replace(/messages\./g, '') + .replace(/]*)>([\s\S]*)<\/a>/g, '$3') + .replace(/>{{\s*([\s\S]+?)\s*}}<\/[\w-]*>/g, ' v-html="$1" />') + // We are not matching ', + '', + '' + ].filter(Boolean).join('\n').trim() + // Generate types const types = [ `export type DefaultMessages = Record<${Object.keys(messages).map(a => `"${a}"`).join(' | ')}, string | boolean | number >`, @@ -88,6 +119,7 @@ export const RenderPlugin = () => { // Write new template await fsp.writeFile(fileName.replace('/index.html', '.mjs'), `${jsCode}\nexport const template = _template`) + await fsp.writeFile(fileName.replace('/index.html', '.vue'), vueCode) await fsp.writeFile(fileName.replace('/index.html', '.d.ts'), `${types}`) // Remove original html file diff --git a/packages/ui-templates/package.json b/packages/ui-templates/package.json index ec8a617f6a..3e4f92367a 100644 --- a/packages/ui-templates/package.json +++ b/packages/ui-templates/package.json @@ -4,7 +4,7 @@ "repository": "nuxt/ui", "license": "CC-BY-ND-4.0", "exports": { - "./templates/*": "./dist/templates/*.mjs", + "./templates/*": "./dist/templates/*", ".": "./dist/index.mjs", "./*": "./dist/*" }, @@ -31,6 +31,7 @@ "globby": "^13.1.1", "html-minifier": "^4.0.0", "jiti": "^1.13.0", + "knitwork": "^0.1.1", "lodash.template": "^4.5.0", "scule": "^0.2.1", "upath": "^2.0.1", diff --git a/packages/ui-templates/templates/error-dev/messages.json b/packages/ui-templates/templates/error-dev/messages.json index 051a3cd15b..a26fd4f13f 100644 --- a/packages/ui-templates/templates/error-dev/messages.json +++ b/packages/ui-templates/templates/error-dev/messages.json @@ -1,5 +1,6 @@ { "statusCode": "500", "statusMessage": "Server error", - "description": "An error occurred in the application and the page could not be served. If you are the application owner, check your server logs for details." + "description": "An error occurred in the application and the page could not be served. If you are the application owner, check your server logs for details.", + "stack": "" } From 2d0f988ed1b566ddf3992d5f1c0ea0e582369528 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Thu, 10 Mar 2022 20:26:33 +0000 Subject: [PATCH 019/229] fix: improve design of error pages (#68) --- .../templates/error-500/index.html | 25 ++++--- .../templates/error-dev/index.html | 75 +++++++++++-------- 2 files changed, 55 insertions(+), 45 deletions(-) diff --git a/packages/ui-templates/templates/error-500/index.html b/packages/ui-templates/templates/error-500/index.html index cb49c8ce32..2454ae1682 100644 --- a/packages/ui-templates/templates/error-500/index.html +++ b/packages/ui-templates/templates/error-500/index.html @@ -17,22 +17,23 @@ dark:text-sky-surface ">
-
-
-
+
+
+
{{ messages.statusCode }}
-

+

{{ messages.description }} -

+
- - - - + + + + + -
-
-
-
- {{ messages.statusCode }} -
-
-

- {{ messages.description }} -

+ "> +
+
+
+
+ {{ messages.statusCode }} +
+
+
+ {{ messages.description }} +
+
+ {{ messages.stack }}
- +
+ + From ecbf8a9ddba0a869997379ec72e0f4813ef3a2f3 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Thu, 10 Mar 2022 20:29:10 +0000 Subject: [PATCH 020/229] fix: only convert app links to `` --- packages/ui-templates/lib/render.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ui-templates/lib/render.ts b/packages/ui-templates/lib/render.ts index 985107a291..371f74b448 100644 --- a/packages/ui-templates/lib/render.ts +++ b/packages/ui-templates/lib/render.ts @@ -77,7 +77,7 @@ export const RenderPlugin = () => { .match(/([\s\S]*)<\/body>/)?.[0] .replace(/(?<=<|<\/)body/g, 'div') .replace(/messages\./g, '') - .replace(/]*)>([\s\S]*)<\/a>/g, '$3') + .replace(/]*)>([\s\S]*)<\/a>/g, '$3') .replace(/>{{\s*([\s\S]+?)\s*}}<\/[\w-]*>/g, ' v-html="$1" />') // We are not matching ', ' ``` -```vue {}[pages/child.vue] +```vue {}[pages/parent/child.vue] + + diff --git a/test/fixtures/basic/plugins/add-nuxt-link-alias.ts b/test/fixtures/basic/plugins/add-nuxt-link-alias.ts new file mode 100644 index 0000000000..6d0bfeadfb --- /dev/null +++ b/test/fixtures/basic/plugins/add-nuxt-link-alias.ts @@ -0,0 +1,5 @@ +import { NuxtLink } from '#components' + +export default defineNuxtPlugin((nuxtApp) => { + nuxtApp.vueApp.component('NuxtLinkAlias', NuxtLink) +}) From 0855ea7625c4651a21891f24ab272e951f2a3a9a Mon Sep 17 00:00:00 2001 From: Alexandros Kazantzidis Date: Fri, 19 Apr 2024 17:16:00 +0300 Subject: [PATCH 158/229] docs: add `@vue/test-utils` getting started guide (#26205) --- docs/1.getting-started/11.testing.md | 103 +++++++++++++++++++++++++-- 1 file changed, 96 insertions(+), 7 deletions(-) diff --git a/docs/1.getting-started/11.testing.md b/docs/1.getting-started/11.testing.md index 111f7e8bc5..8fb1bf24b3 100644 --- a/docs/1.getting-started/11.testing.md +++ b/docs/1.getting-started/11.testing.md @@ -60,7 +60,7 @@ We currently ship an environment for unit testing code that needs a [Nuxt](https ``` ::tip -When importing `@nuxt/test-utils` in your vitest config, It is necessary to have `type: "module"` specified in your `package.json` or rename your vitest config file appropriatly. +When importing `@nuxt/test-utils` in your vitest config, It is necessary to have `"type": "module"` specified in your `package.json` or rename your vitest config file appropriatly. > ie. `vitest.config.m{ts,js}`. :: @@ -342,8 +342,8 @@ For example, to mock `/test/` endpoint, you can do: ```ts twoslash import { registerEndpoint } from '@nuxt/test-utils/runtime' -registerEndpoint("/test/", () => ({ - test: "test-field" +registerEndpoint('/test/', () => ({ + test: 'test-field' })) ``` @@ -352,9 +352,9 @@ By default, your request will be made using the `GET` method. You may use anothe ```ts twoslash import { registerEndpoint } from '@nuxt/test-utils/runtime' -registerEndpoint("/test/", { - method: "POST", - handler: () => ({ test: "test-field" }) +registerEndpoint('/test/', { + method: 'POST', + handler: () => ({ test: 'test-field' }) }) ``` @@ -369,7 +369,7 @@ If you would like to use both the end-to-end and unit testing functionality of ` `app.nuxt.spec.ts` ```ts twoslash -import { mockNuxtImport } from "@nuxt/test-utils/runtime" +import { mockNuxtImport } from '@nuxt/test-utils/runtime' mockNuxtImport('useStorage', () => { return () => { @@ -391,6 +391,95 @@ await setup({ // ... ``` +### Using `@vue/test-utils` + +If you prefer to use `@vue/test-utils` on its own for unit testing in Nuxt, and you are only testing components which do not rely on Nuxt composables, auto-imports or context, you can follow these steps to set it up. + +1. Install the needed dependencies + + ::code-group + ```bash [yarn] + yarn add --dev vitest @vue/test-utils happy-dom @vitejs/plugin-vue + ``` + ```bash [npm] + npm i --save-dev vitest @vue/test-utils happy-dom @vitejs/plugin-vue + ``` + ```bash [pnpm] + pnpm add -D vitest @vue/test-utils happy-dom @vitejs/plugin-vue + ``` + ```bash [bun] + bun add --dev vitest @vue/test-utils happy-dom @vitejs/plugin-vue + ``` + :: + +2. Create a `vitest.config.ts` with the following content: + + ```ts twoslash + import { defineConfig } from 'vite' + import vue from '@vitejs/plugin-vue' + + export default defineConfig({ + plugins: [vue()], + test: { + environment: 'happy-dom', + }, + }); + ``` + +3. Add a new command for test in your `package.json` + + ```json + "scripts": { + "build": "nuxt build", + "dev": "nuxt dev", + ... + "test": "vitest" + }, + ``` + +4. Create a simple `` component `components/HelloWorld.vue` with the following content: + + ```vue + + ``` + +5. Create a simple unit test for this newly created component `~/components/HelloWorld.spec.ts` + + ```ts twoslash + import { describe, it, expect } from 'vitest' + import { mount } from '@vue/test-utils' + + import HelloWorld from './HelloWorld.vue' + + describe('HelloWorld', () => { + it('component renders Hello world properly', () => { + const wrapper = mount(HelloWorld) + expect(wrapper.text()).toContain('Hello world') + }) + }) + ``` + +6. Run vitest command + + ::code-group + ```bash [yarn] + yarn test + ``` + ```bash [npm] + npm run test + ``` + ```bash [pnpm] + pnpm run test + ``` + ```bash [bun] + bun run test + ``` + :: + +Congratulations, you're all set to start unit testing with `@vue/test-utils` in Nuxt! Happy testing! + ## End-To-End Testing For end-to-end testing, we support [Vitest](https://github.com/vitest-dev/vitest), [Jest](https://jestjs.io), [Cucumber](https://cucumber.io/) and [Playwright](https://playwright.dev/) as test runners. From cb2c47cfafb5cf84bff3c720766980e8b255a91a Mon Sep 17 00:00:00 2001 From: Maxime Pauvert Date: Fri, 19 Apr 2024 16:16:30 +0200 Subject: [PATCH 159/229] docs: add a note about HTTPS with a self-signed certificates (#26481) --- docs/3.api/2.composables/use-fetch.md | 4 ++++ docs/3.api/3.utils/$fetch.md | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/docs/3.api/2.composables/use-fetch.md b/docs/3.api/2.composables/use-fetch.md index bd4d30d647..7e116c03ec 100644 --- a/docs/3.api/2.composables/use-fetch.md +++ b/docs/3.api/2.composables/use-fetch.md @@ -107,6 +107,10 @@ All fetch options can be given a `computed` or `ref` value. These will be watche If you provide a function or ref as the `url` parameter, or if you provide functions as arguments to the `options` parameter, then the `useFetch` call will not match other `useFetch` calls elsewhere in your codebase, even if the options seem to be identical. If you wish to force a match, you may provide your own key in `options`. :: +::note +If you use `useFetch` to call an (external) HTTPS URL with a self-signed certificate in development, you will need to set `NODE_TLS_REJECT_UNAUTHORIZED=0` in your environment. +:: + ::tip{icon="i-simple-icons-youtube" color="gray" to="https://www.youtube.com/watch?v=aQPR0xn-MMk" target="_blank"} Learn how to use `transform` and `getCachedData` to avoid superfluous calls to an API and cache data for visitors on the client. :: diff --git a/docs/3.api/3.utils/$fetch.md b/docs/3.api/3.utils/$fetch.md index 3a52ae3c78..ff0ed5cf05 100644 --- a/docs/3.api/3.utils/$fetch.md +++ b/docs/3.api/3.utils/$fetch.md @@ -55,3 +55,7 @@ function contactForm() { ::tip `$fetch` is the preferred way to make HTTP calls in Nuxt instead of [@nuxt/http](https://github.com/nuxt/http) and [@nuxtjs/axios](https://github.com/nuxt-community/axios-module) that are made for Nuxt 2. :: + +::note +If you use `$fetch` to call an (external) HTTPS URL with a self-signed certificate in development, you will need to set `NODE_TLS_REJECT_UNAUTHORIZED=0` in your environment. +:: From 525124b10765b0e64a2a1469d19639644cf8f94e Mon Sep 17 00:00:00 2001 From: John Tanz <82201261+moshetanzer@users.noreply.github.com> Date: Fri, 19 Apr 2024 16:26:18 +0200 Subject: [PATCH 160/229] docs: clarify purpose of play online section (#25978) --- docs/1.getting-started/1.introduction.md | 4 ++++ docs/1.getting-started/2.installation.md | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/1.getting-started/1.introduction.md b/docs/1.getting-started/1.introduction.md index 1337e7187b..47bfdb0bc4 100644 --- a/docs/1.getting-started/1.introduction.md +++ b/docs/1.getting-started/1.introduction.md @@ -10,6 +10,10 @@ We made everything so you can start writing `.vue` files from the beginning whil Nuxt has no vendor lock-in, allowing you to deploy your application [**everywhere, even on the edge**](/blog/nuxt-on-the-edge). +::tip +If you want to play around with Nuxt in your browser, you can [try it out in one of our online sandboxes](/docs/getting-started/installation#play-online). +:: + ## Automation and Conventions Nuxt uses conventions and an opinionated directory structure to automate repetitive tasks and allow developers to focus on pushing features. The configuration file can still customize and override its default behaviors. diff --git a/docs/1.getting-started/2.installation.md b/docs/1.getting-started/2.installation.md index f207e002bc..1af58ad887 100644 --- a/docs/1.getting-started/2.installation.md +++ b/docs/1.getting-started/2.installation.md @@ -6,14 +6,14 @@ navigation.icon: i-ph-play-duotone ## Play Online -You can start playing with Nuxt 3 in your browser using our online sandboxes: +If you just want to play around with Nuxt in your browser without setting up a project, you can use one of our online sandboxes: ::card-group :card{title="Open on StackBlitz" icon="i-simple-icons-stackblitz" to="https://nuxt.new/s/v3" target="_blank"} :card{title="Open on CodeSandbox" icon="i-simple-icons-codesandbox" to="https://nuxt.new/c/v3" target="_blank"} :: -Start with one of our starters and themes directly by opening [nuxt.new](https://nuxt.new). +Or follow the steps below to set up a new Nuxt project on your computer. ## New Project @@ -51,6 +51,10 @@ bunx nuxi@latest init :: +::tip +Alternatively, you can find other starters or themes by opening [nuxt.new](https://nuxt.new) and following the instructions there. +:: + Open your project folder in Visual Studio Code: ```bash [Terminal] From bfd7148238f047d4b4ef73709c9512326a66e732 Mon Sep 17 00:00:00 2001 From: Trent Fellbootman <78004741+Trent-Fellbootman@users.noreply.github.com> Date: Fri, 19 Apr 2024 22:27:01 +0800 Subject: [PATCH 161/229] docs: fix typo with `a` -> `an` (#26856) --- docs/2.guide/1.concepts/2.vuejs-development.md | 2 +- docs/3.api/2.composables/use-async-data.md | 2 +- docs/3.api/2.composables/use-fetch.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/2.guide/1.concepts/2.vuejs-development.md b/docs/2.guide/1.concepts/2.vuejs-development.md index 83ef27cde3..2725ffea36 100644 --- a/docs/2.guide/1.concepts/2.vuejs-development.md +++ b/docs/2.guide/1.concepts/2.vuejs-development.md @@ -1,6 +1,6 @@ --- title: 'Vue.js Development' -description: "Nuxt uses Vue.js and adds features such as component auto-imports, file-based routing and composables for a SSR-friendly usage." +description: "Nuxt uses Vue.js and adds features such as component auto-imports, file-based routing and composables for an SSR-friendly usage." --- Nuxt integrates Vue 3, the new major release of Vue that enables new patterns for Nuxt users. diff --git a/docs/3.api/2.composables/use-async-data.md b/docs/3.api/2.composables/use-async-data.md index da3cb8f39c..0885af2107 100644 --- a/docs/3.api/2.composables/use-async-data.md +++ b/docs/3.api/2.composables/use-async-data.md @@ -1,6 +1,6 @@ --- title: 'useAsyncData' -description: useAsyncData provides access to data that resolves asynchronously in a SSR-friendly composable. +description: useAsyncData provides access to data that resolves asynchronously in an SSR-friendly composable. links: - label: Source icon: i-simple-icons-github diff --git a/docs/3.api/2.composables/use-fetch.md b/docs/3.api/2.composables/use-fetch.md index 7e116c03ec..42e89db711 100644 --- a/docs/3.api/2.composables/use-fetch.md +++ b/docs/3.api/2.composables/use-fetch.md @@ -1,6 +1,6 @@ --- title: 'useFetch' -description: 'Fetch data from an API endpoint with a SSR-friendly composable.' +description: 'Fetch data from an API endpoint with an SSR-friendly composable.' links: - label: Source icon: i-simple-icons-github From 506765e086dc1d4e970af35d2c948b77878c4ae8 Mon Sep 17 00:00:00 2001 From: Babak Farkhoopak <44144724+babakfp@users.noreply.github.com> Date: Fri, 19 Apr 2024 18:02:00 +0330 Subject: [PATCH 162/229] docs: fix code block formatting (#26859) --- docs/1.getting-started/4.styling.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/1.getting-started/4.styling.md b/docs/1.getting-started/4.styling.md index 4b2bd3be36..c3eb4a3d81 100644 --- a/docs/1.getting-started/4.styling.md +++ b/docs/1.getting-started/4.styling.md @@ -113,7 +113,8 @@ export default defineNuxtConfig({ head: { link: [{ rel: 'stylesheet', href: 'https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css' }] } -}}) + } +}) ``` ### Dynamically Adding Stylesheets From 9ba1ebe984e135963eaeab7a819cc6ddca166bf4 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Fri, 19 Apr 2024 17:31:46 +0300 Subject: [PATCH 163/229] chore: ignore SSL certificate error with `conventionalcommits.org` --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- docs/2.guide/3.going-further/3.modules.md | 2 +- docs/5.community/5.framework-contribution.md | 2 +- lychee.toml | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 8cba9c0e73..2618070610 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -11,7 +11,7 @@ Before creating the pull request, please make sure you do the following: - Check that there isn't already a PR that solves the problem the same way. If you find a duplicate, please help us reviewing it. - Read the contribution docs at https://nuxt.com/docs/community/contribution -- Ensure that PR title follows conventional commits (https://conventionalcommits.org) +- Ensure that PR title follows conventional commits (https://www.conventionalcommits.org) - Update the corresponding documentation if needed. - Include relevant tests that fail without this PR but pass with it. diff --git a/docs/2.guide/3.going-further/3.modules.md b/docs/2.guide/3.going-further/3.modules.md index 3eb0d0d424..8c354e5e21 100644 --- a/docs/2.guide/3.going-further/3.modules.md +++ b/docs/2.guide/3.going-further/3.modules.md @@ -76,7 +76,7 @@ Before publishing your module to npm, makes sure you have an [npmjs.com](https:/ While you can publish your module by bumping its version and using the `npm publish` command, the module starter comes with a release script that helps you make sure you publish a working version of your module to npm and more. -To use the release script, first, commit all your changes (we recommend you follow [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0) to also take advantage of automatic version bump and changelog update), then run the release script with `npm run release`. +To use the release script, first, commit all your changes (we recommend you follow [Conventional Commits](https://www.conventionalcommits.org) to also take advantage of automatic version bump and changelog update), then run the release script with `npm run release`. When running the release script, the following will happen: diff --git a/docs/5.community/5.framework-contribution.md b/docs/5.community/5.framework-contribution.md index 8dc6104142..2f70b77f98 100644 --- a/docs/5.community/5.framework-contribution.md +++ b/docs/5.community/5.framework-contribution.md @@ -135,7 +135,7 @@ You can also run `pnpm lint:docs:fix` to highlight and resolve any lint issues. ### Open a PR -Please make sure your PR title adheres to the [conventional commits](https://www.conventionalcommits.org/en/v1.0.0) guidelines. +Please make sure your PR title adheres to the [conventional commits](https://www.conventionalcommits.org) guidelines. ```bash [Example of PR title] docs: update the section about the nuxt.config.ts file diff --git a/lychee.toml b/lychee.toml index 697f7aab92..b7cdde5945 100644 --- a/lychee.toml +++ b/lychee.toml @@ -11,6 +11,8 @@ exclude = [ "https://twitter.nuxt.dev/", "https://github.com/nuxt/translations/discussions/4", "https://stackoverflow.com/help/minimal-reproducible-example", + # TODO: remove when their SSL certificate is valid again + "https://www.conventionalcommits.org", # single-quotes are required for regexp '(https?:\/\/github\.com\/)(.*\/)(generate)', ] From 6f3f1c6ee4caabb52541bcbd000a1ce638897fef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Hud=C3=A1k?= <165674364+adam-hudak@users.noreply.github.com> Date: Fri, 19 Apr 2024 09:43:22 -0500 Subject: [PATCH 164/229] docs: add more detail to `usePreviewMode` explanation (#26602) --- docs/3.api/2.composables/use-preview-mode.md | 32 ++++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/docs/3.api/2.composables/use-preview-mode.md b/docs/3.api/2.composables/use-preview-mode.md index 360350f19e..e87e525327 100644 --- a/docs/3.api/2.composables/use-preview-mode.md +++ b/docs/3.api/2.composables/use-preview-mode.md @@ -5,6 +5,8 @@ description: "Use usePreviewMode to check and control preview mode in Nuxt" # `usePreviewMode` +Preview mode allows you to see how your changes would be displayed on a live site without revealing them to users. + You can use the built-in `usePreviewMode` composable to access and control preview state in Nuxt. If the composable detects preview mode it will automatically force any updates necessary for [`useAsyncData`](/docs/api/composables/use-async-data) and [`useFetch`](/docs/api/composables/use-fetch) to rerender preview content. ```js @@ -47,15 +49,11 @@ The `getState` function will append returned values to current state, so be care ## Example +The example below creates a page where part of a content is rendered only in preview mode. + ```vue [pages/some-page.vue] From 7562ecabfbe7ce5ec342c3ee5c58958fa6fe6ba3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 07:49:06 +0100 Subject: [PATCH 177/229] chore(deps): update all non-major dependencies (main) (#26892) --- .github/workflows/ci.yml | 4 +- .github/workflows/scorecards.yml | 2 +- package.json | 4 +- pnpm-lock.yaml | 494 +++++++++++++++---------------- 4 files changed, 252 insertions(+), 252 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 571218fc09..27b29e9cf5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -83,7 +83,7 @@ jobs: run: pnpm install - name: Initialize CodeQL - uses: github/codeql-action/init@c7f9125735019aa87cfc361530512d50ea439c71 # v3.25.1 + uses: github/codeql-action/init@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2 with: languages: javascript queries: +security-and-quality @@ -95,7 +95,7 @@ jobs: path: packages - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@c7f9125735019aa87cfc361530512d50ea439c71 # v3.25.1 + uses: github/codeql-action/analyze@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2 with: category: "/language:javascript" diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 5938267afa..68aa1c7592 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -66,6 +66,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@c7f9125735019aa87cfc361530512d50ea439c71 # v3.25.1 + uses: github/codeql-action/upload-sarif@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2 with: sarif_file: results.sarif diff --git a/package.json b/package.json index 5bdaa4d3d8..94f7564c35 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "@nuxt/schema": "workspace:*", "@nuxt/vite-builder": "workspace:*", "@nuxt/webpack-builder": "workspace:*", - "rollup": "^4.16.2", + "rollup": "^4.16.3", "nuxt": "workspace:*", "vite": "5.2.10", "vue": "3.4.24", @@ -60,7 +60,7 @@ "changelogen": "0.5.5", "consola": "3.2.3", "devalue": "5.0.0", - "eslint": "9.1.0", + "eslint": "9.1.1", "eslint-plugin-no-only-tests": "3.1.0", "eslint-plugin-perfectionist": "2.9.0", "eslint-typegen": "0.2.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cbb77560bf..65cab0e61e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,7 +9,7 @@ overrides: '@nuxt/schema': workspace:* '@nuxt/vite-builder': workspace:* '@nuxt/webpack-builder': workspace:* - rollup: ^4.16.2 + rollup: ^4.16.3 nuxt: workspace:* vite: 5.2.10 vue: 3.4.24 @@ -24,7 +24,7 @@ importers: version: 9.1.1 '@nuxt/eslint-config': specifier: 0.3.9 - version: 0.3.9(eslint@9.1.0)(typescript@5.4.5) + version: 0.3.9(eslint@9.1.1)(typescript@5.4.5) '@nuxt/kit': specifier: workspace:* version: link:packages/kit @@ -68,17 +68,17 @@ importers: specifier: 5.0.0 version: 5.0.0 eslint: - specifier: 9.1.0 - version: 9.1.0 + specifier: 9.1.1 + version: 9.1.1 eslint-plugin-no-only-tests: specifier: 3.1.0 version: 3.1.0 eslint-plugin-perfectionist: specifier: 2.9.0 - version: 2.9.0(eslint@9.1.0)(typescript@5.4.5)(vue-eslint-parser@9.4.2(eslint@9.1.0)) + version: 2.9.0(eslint@9.1.1)(typescript@5.4.5)(vue-eslint-parser@9.4.2(eslint@9.1.1)) eslint-typegen: specifier: 0.2.4 - version: 0.2.4(eslint@9.1.0) + version: 0.2.4(eslint@9.1.1) execa: specifier: 8.0.1 version: 8.0.1 @@ -204,7 +204,7 @@ importers: version: 2.3.1 unimport: specifier: ^3.7.1 - version: 3.7.1(rollup@4.16.2) + version: 3.7.1(rollup@4.16.3) untyped: specifier: ^1.4.2 version: 1.4.2 @@ -244,7 +244,7 @@ importers: version: 2.0.2 '@nuxt/devtools': specifier: ^1.2.0 - version: 1.2.0(@unocss/reset@0.58.6)(floating-vue@5.2.2(@nuxt/kit@packages+kit)(vue@3.4.24(typescript@5.4.5)))(nuxt@packages+nuxt)(rollup@4.16.2)(unocss@0.58.6(postcss@8.4.38)(rollup@4.16.2)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0)))(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0))(vue@3.4.24(typescript@5.4.5)) + version: 1.2.0(@unocss/reset@0.58.6)(floating-vue@5.2.2(@nuxt/kit@packages+kit)(vue@3.4.24(typescript@5.4.5)))(nuxt@packages+nuxt)(rollup@4.16.3)(unocss@0.58.6(postcss@8.4.38)(rollup@4.16.3)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0)))(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0))(vue@3.4.24(typescript@5.4.5)) '@nuxt/kit': specifier: workspace:* version: link:../kit @@ -388,13 +388,13 @@ importers: version: 1.9.0 unimport: specifier: ^3.7.1 - version: 3.7.1(rollup@4.16.2) + version: 3.7.1(rollup@4.16.3) unplugin: specifier: ^1.10.1 version: 1.10.1 unplugin-vue-router: specifier: ^0.7.0 - version: 0.7.0(rollup@4.16.2)(vue-router@4.3.2(vue@3.4.24(typescript@5.4.5)))(vue@3.4.24(typescript@5.4.5)) + version: 0.7.0(rollup@4.16.3)(vue-router@4.3.2(vue@3.4.24(typescript@5.4.5)))(vue@3.4.24(typescript@5.4.5)) unstorage: specifier: ^1.10.2 version: 1.10.2(ioredis@5.3.2) @@ -467,7 +467,7 @@ importers: version: 1.5.3 unimport: specifier: ^3.7.1 - version: 3.7.1(rollup@4.16.2) + version: 3.7.1(rollup@4.16.3) untyped: specifier: ^1.4.2 version: 1.4.2 @@ -558,7 +558,7 @@ importers: version: link:../kit '@rollup/plugin-replace': specifier: ^5.0.5 - version: 5.0.5(rollup@4.16.2) + version: 5.0.5(rollup@4.16.3) '@vitejs/plugin-vue': specifier: ^5.0.4 version: 5.0.4(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0))(vue@3.4.24(typescript@5.4.5)) @@ -627,7 +627,7 @@ importers: version: 8.4.38 rollup-plugin-visualizer: specifier: ^5.12.0 - version: 5.12.0(rollup@4.16.2) + version: 5.12.0(rollup@4.16.3) std-env: specifier: ^3.7.0 version: 3.7.0 @@ -651,7 +651,7 @@ importers: version: 1.4.0(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0) vite-plugin-checker: specifier: ^0.6.4 - version: 0.6.4(eslint@9.1.0)(optionator@0.9.3)(typescript@5.4.5)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0))(vue-tsc@2.0.14(typescript@5.4.5)) + version: 0.6.4(eslint@9.1.1)(optionator@0.9.3)(typescript@5.4.5)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0))(vue-tsc@2.0.14(typescript@5.4.5)) vue-bundle-renderer: specifier: ^2.0.0 version: 2.0.0 @@ -1889,7 +1889,7 @@ packages: resolution: {integrity: sha512-lpA3RZ9PdIG7qqhEfv79tBffNaoDuukFDrmhLqg9ifv99u/ehn+lOg30x2zmhf8AQqQUZaMk/B9fZraQ6/acDQ==} engines: {node: '>=14.0.0'} peerDependencies: - rollup: ^4.16.2 + rollup: ^4.16.3 peerDependenciesMeta: rollup: optional: true @@ -1898,7 +1898,7 @@ packages: resolution: {integrity: sha512-nEvcR+LRjEjsaSsc4x3XZfCCvZIaSMenZu/OiwOKGN2UhQpAYI7ru7czFvyWbErlpoGjnSX3D5Ch5FcMA3kRWQ==} engines: {node: '>=14.0.0'} peerDependencies: - rollup: ^4.16.2 + rollup: ^4.16.3 peerDependenciesMeta: rollup: optional: true @@ -1907,7 +1907,7 @@ packages: resolution: {integrity: sha512-2+DEJbNBoPROPkgTDNe8/1YXWcqxbN5DTjASVIOx8HS+pITXushyNiBV56RB08zuptzz8gT3YfkqriTBVycepg==} engines: {node: '>=14.0.0'} peerDependencies: - rollup: ^4.16.2 + rollup: ^4.16.3 peerDependenciesMeta: rollup: optional: true @@ -1916,7 +1916,7 @@ packages: resolution: {integrity: sha512-EGI2te5ENk1coGeADSIwZ7G2Q8CJS2sF120T7jLw4xFw9n7wIOXHo+kIYRAoVpJAN+kmqZSoO3Fp4JtoNF4ReA==} engines: {node: '>=14.0.0'} peerDependencies: - rollup: ^4.16.2 + rollup: ^4.16.3 peerDependenciesMeta: rollup: optional: true @@ -1925,7 +1925,7 @@ packages: resolution: {integrity: sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ==} engines: {node: '>=14.0.0'} peerDependencies: - rollup: ^4.16.2 + rollup: ^4.16.3 peerDependenciesMeta: rollup: optional: true @@ -1934,7 +1934,7 @@ packages: resolution: {integrity: sha512-rYO4fOi8lMaTg/z5Jb+hKnrHHVn8j2lwkqwyS4kTRhKyWOLf2wST2sWXr4WzWiTcoHTp2sTjqUbqIj2E39slKQ==} engines: {node: '>=14.0.0'} peerDependencies: - rollup: ^4.16.2 + rollup: ^4.16.3 peerDependenciesMeta: rollup: optional: true @@ -1943,7 +1943,7 @@ packages: resolution: {integrity: sha512-XHeJC5Bgvs8LfukDwWZp7yeqin6ns8RTl2B9avbejt6tZqsqvVoWI7ZTQrcNsfKEDWBTnTxM8nMDkO2IFFbd0A==} engines: {node: '>=14.0.0'} peerDependencies: - rollup: ^4.16.2 + rollup: ^4.16.3 peerDependenciesMeta: rollup: optional: true @@ -1956,88 +1956,88 @@ packages: resolution: {integrity: sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==} engines: {node: '>=14.0.0'} peerDependencies: - rollup: ^4.16.2 + rollup: ^4.16.3 peerDependenciesMeta: rollup: optional: true - '@rollup/rollup-android-arm-eabi@4.16.2': - resolution: {integrity: sha512-VGodkwtEuZ+ENPz/CpDSl091koMv8ao5jHVMbG1vNK+sbx/48/wVzP84M5xSfDAC69mAKKoEkSo+ym9bXYRK9w==} + '@rollup/rollup-android-arm-eabi@4.16.3': + resolution: {integrity: sha512-1ACInKIT0pXmTYuPoJAL8sOT0lV3PEACFSVxnD03hGIojJ1CmbzZmLJyk2xew+yxqTlmx7xydkiJcBzdp0V+AQ==} cpu: [arm] os: [android] - '@rollup/rollup-android-arm64@4.16.2': - resolution: {integrity: sha512-5/W1xyIdc7jw6c/f1KEtg1vYDBWnWCsLiipK41NiaWGLG93eH2edgE6EgQJ3AGiPERhiOLUqlDSfjRK08C9xFg==} + '@rollup/rollup-android-arm64@4.16.3': + resolution: {integrity: sha512-vGl+Bny8cawCM7ExugzqEB8ke3t7Pm9/mo+ciA9kJh6pMuNyM+31qhewMwHwseDZ/LtdW0SCocW1CsMxcq1Lsg==} cpu: [arm64] os: [android] - '@rollup/rollup-darwin-arm64@4.16.2': - resolution: {integrity: sha512-vOAKMqZSTbPfyPVu1jBiy+YniIQd3MG7LUnqV0dA6Q5tyhdqYtxacTHP1+S/ksKl6qCtMG1qQ0grcIgk/19JEA==} + '@rollup/rollup-darwin-arm64@4.16.3': + resolution: {integrity: sha512-Lj8J9WzQRvfWO4GfI+bBkIThUFV1PtI+es/YH/3cwUQ+edXu8Mre0JRJfRrAeRjPiHDPFFZaX51zfgHHEhgRAg==} cpu: [arm64] os: [darwin] - '@rollup/rollup-darwin-x64@4.16.2': - resolution: {integrity: sha512-aIJVRUS3Dnj6MqocBMrcXlatKm64O3ITeQAdAxVSE9swyhNyV1dwnRgw7IGKIkDQofatd8UqMSyUxuFEa42EcA==} + '@rollup/rollup-darwin-x64@4.16.3': + resolution: {integrity: sha512-NPPOXMTIWJk50lgZmRReEYJFvLG5rgMDzaVauWNB2MgFQYm9HuNXQdVVg3iEZ3A5StIzxhMlPjVyS5fsv4PJmg==} cpu: [x64] os: [darwin] - '@rollup/rollup-linux-arm-gnueabihf@4.16.2': - resolution: {integrity: sha512-/bjfUiXwy3P5vYr6/ezv//Yle2Y0ak3a+Av/BKoi76nFryjWCkki8AuVoPR7ZU/ckcvAWFo77OnFK14B9B5JsA==} + '@rollup/rollup-linux-arm-gnueabihf@4.16.3': + resolution: {integrity: sha512-ij4tv1XtWcDScaTgoMnvDEYZ2Wjl2ZhDFEyftjBKu6sNNLHIkKuXBol/bVSh+md5zSJ6em9hUXyPO3cVPCsl4Q==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm-musleabihf@4.16.2': - resolution: {integrity: sha512-S24b+tJHwpq2TNRz9T+r71FjMvyBBApY8EkYxz8Cwi/rhH6h+lu/iDUxyc9PuHf9UvyeBFYkWWcrDahai/NCGw==} + '@rollup/rollup-linux-arm-musleabihf@4.16.3': + resolution: {integrity: sha512-MTMAl30dzcfYB+smHe1sJuS2P1/hB8pqylkCe0/8/Lo8CADjy/eM8x43nBoR5eqcYgpOtCh7IgHpvqSMAE38xw==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm64-gnu@4.16.2': - resolution: {integrity: sha512-UN7VAXLyeyGbCQWiOtQN7BqmjTDw1ON2Oos4lfk0YR7yNhFEJWZiwGtvj9Ay4lsT/ueT04sh80Sg2MlWVVZ+Ug==} + '@rollup/rollup-linux-arm64-gnu@4.16.3': + resolution: {integrity: sha512-vY3fAg6JLDoNh781HHHMPvt8K6RWG3OmEj3xI9BOFSQTD5PNaGKvCB815MyGlDnFYUw7lH+WvvQqoBwLtRDR1A==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-arm64-musl@4.16.2': - resolution: {integrity: sha512-ZBKvz3+rIhQjusKMccuJiPsStCrPOtejCHxTe+yWp3tNnuPWtyCh9QLGPKz6bFNFbwbw28E2T6zDgzJZ05F1JQ==} + '@rollup/rollup-linux-arm64-musl@4.16.3': + resolution: {integrity: sha512-61SpQGBSb8QkfV/hUYWezlEig4ro55t8NcE5wWmy1bqRsRVHCEDkF534d+Lln/YeLUoSWtJHvvG3bx9lH/S6uA==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-powerpc64le-gnu@4.16.2': - resolution: {integrity: sha512-LjMMFiVBRL3wOe095vHAekL4b7nQqf4KZEpdMWd3/W+nIy5o9q/8tlVKiqMbfieDypNXLsxM9fexOxd9Qcklyg==} + '@rollup/rollup-linux-powerpc64le-gnu@4.16.3': + resolution: {integrity: sha512-4XGexJthsNhEEgv/zK4/NnAOjYKoeCsIoT+GkqTY2u3rse0lbJ8ft1bpDCdlkvifsLDL2uwe4fn8PLR4IMTKQQ==} cpu: [ppc64] os: [linux] - '@rollup/rollup-linux-riscv64-gnu@4.16.2': - resolution: {integrity: sha512-ohkPt0lKoCU0s4B6twro2aft+QROPdUiWwOjPNTzwTsBK5w+2+iT9kySdtOdq0gzWJAdiqsV4NFtXOwGZmIsHA==} + '@rollup/rollup-linux-riscv64-gnu@4.16.3': + resolution: {integrity: sha512-/pArXjqnEdhbQ1qe4CTTlJ6/GjWGdWNRucKAp4fqKnKf7QC0BES3QEV34ACumHHQ4uEGt4GctF2ISCMRhkli0A==} cpu: [riscv64] os: [linux] - '@rollup/rollup-linux-s390x-gnu@4.16.2': - resolution: {integrity: sha512-jm2lvLc+/gqXfndlpDw05jKvsl/HKYxUEAt1h5UXcMFVpO4vGpoWmJVUfKDtTqSaHcCNw1his1XjkgR9aort3w==} + '@rollup/rollup-linux-s390x-gnu@4.16.3': + resolution: {integrity: sha512-vu4f3Y8iwjtRfSZdmtP8nC1jmRx1IrRVo2cLQlQfpFZ0e2AE9YbPgfIzpuK+i3C4zFETaLLNGezbBns2NuS/uA==} cpu: [s390x] os: [linux] - '@rollup/rollup-linux-x64-gnu@4.16.2': - resolution: {integrity: sha512-oc5/SlITI/Vj/qL4UM+lXN7MERpiy1HEOnrE+SegXwzf7WP9bzmZd6+MDljCEZTdSY84CpvUv9Rq7bCaftn1+g==} + '@rollup/rollup-linux-x64-gnu@4.16.3': + resolution: {integrity: sha512-n4HEgIJulNSmAKT3SYF/1wuzf9od14woSBseNkzur7a+KJIbh2Jb+J9KIsdGt3jJnsLW0BT1Sj6MiwL4Zzku6Q==} cpu: [x64] os: [linux] - '@rollup/rollup-linux-x64-musl@4.16.2': - resolution: {integrity: sha512-/2VWEBG6mKbS2itm7hzPwhIPaxfZh/KLWrYg20pCRLHhNFtF+epLgcBtwy3m07bl/k86Q3PFRAf2cX+VbZbwzQ==} + '@rollup/rollup-linux-x64-musl@4.16.3': + resolution: {integrity: sha512-guO/4N1884ig2AzTKPc6qA7OTnFMUEg/X2wiesywRO1eRD7FzHiaiTQQOLFmnUXWj2pgQXIT1g5g3e2RpezXcQ==} cpu: [x64] os: [linux] - '@rollup/rollup-win32-arm64-msvc@4.16.2': - resolution: {integrity: sha512-Wg7ANh7+hSilF0lG3e/0Oy8GtfTIfEk1327Bw8juZOMOoKmJLs3R+a4JDa/4cHJp2Gs7QfCDTepXXcyFD0ubBg==} + '@rollup/rollup-win32-arm64-msvc@4.16.3': + resolution: {integrity: sha512-+rxD3memdkhGz0NhNqbYHXBoA33MoHBK4uubZjF1IeQv1Psi6tqgsCcC6vwQjxBM1qoCqOQQBy0cgNbbZKnGUg==} cpu: [arm64] os: [win32] - '@rollup/rollup-win32-ia32-msvc@4.16.2': - resolution: {integrity: sha512-J/jCDKVMWp0Y2ELnTjpQFYUCUWv1Jr+LdFrJVZtdqGyjDo0PHPa7pCamjHvJel6zBFM3doFFqAr7cmXYWBAbfw==} + '@rollup/rollup-win32-ia32-msvc@4.16.3': + resolution: {integrity: sha512-0NxVbLhBXmwANWWbgZY/RdSkeuHEgF+u8Dc0qBowUVBYsR2y2vwVGjKgUcj1wtu3jpjs057io5g9HAPr3Icqjg==} cpu: [ia32] os: [win32] - '@rollup/rollup-win32-x64-msvc@4.16.2': - resolution: {integrity: sha512-3nIf+SJMs2ZzrCh+SKNqgLVV9hS/UY0UjT1YU8XQYFGLiUfmHYJ/5trOU1XSvmHjV5gTF/K3DjrWxtyzKKcAHA==} + '@rollup/rollup-win32-x64-msvc@4.16.3': + resolution: {integrity: sha512-hutnZavtOx/G4uVdgoZz5279By9NVbgmxOmGGgnzUjZYuwp2+NzGq6KXQmHXBWz7W/vottXn38QmKYAdQLa/vQ==} cpu: [x64] os: [win32] @@ -3762,8 +3762,8 @@ packages: resolution: {integrity: sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - eslint@9.1.0: - resolution: {integrity: sha512-1TCBecGFQtItia2o39P7Z4BK1X7ByNPxAiWJvwiyTGcOwYnTiiASgMpNA6a+beu8cFPhEDWvPf6mIlYUJv6sgA==} + eslint@9.1.1: + resolution: {integrity: sha512-b4cRQ0BeZcSEzPpY2PjFY70VbO32K7BStTGtBsnIGdTSEEQzBi8hPBcGQmTG2zUvFr9uLe0TK42bw8YszuHEqg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} hasBin: true @@ -5957,7 +5957,7 @@ packages: resolution: {integrity: sha512-ijSCPICkRMDKDLBK9torss07+8dl9UpY9z1N/zTeA1cIqdzMlpkV3MOOC7zukyvQfDyxa1s3Dl2+DeiP/G6DOw==} engines: {node: '>=16'} peerDependencies: - rollup: ^4.16.2 + rollup: ^4.16.3 typescript: ^4.5 || ^5.0 rollup-plugin-visualizer@5.12.0: @@ -5965,13 +5965,13 @@ packages: engines: {node: '>=14'} hasBin: true peerDependencies: - rollup: ^4.16.2 + rollup: ^4.16.3 peerDependenciesMeta: rollup: optional: true - rollup@4.16.2: - resolution: {integrity: sha512-sxDP0+pya/Yi5ZtptF4p3avI+uWCIf/OdrfdH2Gbv1kWddLKk0U7WE3PmQokhi5JrektxsK3sK8s4hzAmjqahw==} + rollup@4.16.3: + resolution: {integrity: sha512-Ygm4fFO4usWcAG3Ud36Lmif5nudoi0X6QPLC+kRgrRjulAbmFkaTawP7fTIkRDnCNSf/4IAQzXM1T8e691kRtw==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true @@ -7553,9 +7553,9 @@ snapshots: '@esbuild/win32-x64@0.20.2': optional: true - '@eslint-community/eslint-utils@4.4.0(eslint@9.1.0)': + '@eslint-community/eslint-utils@4.4.0(eslint@9.1.1)': dependencies: - eslint: 9.1.0 + eslint: 9.1.1 eslint-visitor-keys: 3.4.3 '@eslint-community/regexpp@4.10.0': {} @@ -7811,13 +7811,13 @@ snapshots: rc9: 2.1.2 semver: 7.6.0 - '@nuxt/devtools@1.2.0(@unocss/reset@0.58.6)(floating-vue@5.2.2(@nuxt/kit@packages+kit)(vue@3.4.24(typescript@5.4.5)))(nuxt@packages+nuxt)(rollup@4.16.2)(unocss@0.58.6(postcss@8.4.38)(rollup@4.16.2)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0)))(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0))(vue@3.4.24(typescript@5.4.5))': + '@nuxt/devtools@1.2.0(@unocss/reset@0.58.6)(floating-vue@5.2.2(@nuxt/kit@packages+kit)(vue@3.4.24(typescript@5.4.5)))(nuxt@packages+nuxt)(rollup@4.16.3)(unocss@0.58.6(postcss@8.4.38)(rollup@4.16.3)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0)))(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0))(vue@3.4.24(typescript@5.4.5))': dependencies: '@antfu/utils': 0.7.7 '@nuxt/devtools-kit': 1.2.0(nuxt@packages+nuxt)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0)) '@nuxt/devtools-wizard': 1.2.0 '@nuxt/kit': link:packages/kit - '@vue/devtools-applet': 7.0.27(@unocss/reset@0.58.6)(floating-vue@5.2.2(@nuxt/kit@packages+kit)(vue@3.4.24(typescript@5.4.5)))(unocss@0.58.6(postcss@8.4.38)(rollup@4.16.2)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0)))(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0))(vue@3.4.24(typescript@5.4.5)) + '@vue/devtools-applet': 7.0.27(@unocss/reset@0.58.6)(floating-vue@5.2.2(@nuxt/kit@packages+kit)(vue@3.4.24(typescript@5.4.5)))(unocss@0.58.6(postcss@8.4.38)(rollup@4.16.3)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0)))(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0))(vue@3.4.24(typescript@5.4.5)) '@vue/devtools-core': 7.0.27(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0))(vue@3.4.24(typescript@5.4.5)) '@vue/devtools-kit': 7.0.27(vue@3.4.24(typescript@5.4.5)) birpc: 0.2.17 @@ -7847,9 +7847,9 @@ snapshots: semver: 7.6.0 simple-git: 3.24.0 sirv: 2.0.4 - unimport: 3.7.1(rollup@4.16.2) + unimport: 3.7.1(rollup@4.16.3) vite: 5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0) - vite-plugin-inspect: 0.8.3(@nuxt/kit@packages+kit)(rollup@4.16.2)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0)) + vite-plugin-inspect: 0.8.3(@nuxt/kit@packages+kit)(rollup@4.16.3)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0)) vite-plugin-vue-inspector: 4.0.2(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0)) which: 3.0.1 ws: 8.16.0 @@ -7876,34 +7876,34 @@ snapshots: - utf-8-validate - vue - '@nuxt/eslint-config@0.3.9(eslint@9.1.0)(typescript@5.4.5)': + '@nuxt/eslint-config@0.3.9(eslint@9.1.1)(typescript@5.4.5)': dependencies: '@eslint/js': 9.1.1 - '@nuxt/eslint-plugin': 0.3.9(eslint@9.1.0)(typescript@5.4.5) + '@nuxt/eslint-plugin': 0.3.9(eslint@9.1.1)(typescript@5.4.5) '@rushstack/eslint-patch': 1.10.2 - '@stylistic/eslint-plugin': 1.7.2(eslint@9.1.0)(typescript@5.4.5) - '@typescript-eslint/eslint-plugin': 7.7.0(@typescript-eslint/parser@7.7.0(eslint@9.1.0)(typescript@5.4.5))(eslint@9.1.0)(typescript@5.4.5) - '@typescript-eslint/parser': 7.7.0(eslint@9.1.0)(typescript@5.4.5) - eslint: 9.1.0 + '@stylistic/eslint-plugin': 1.7.2(eslint@9.1.1)(typescript@5.4.5) + '@typescript-eslint/eslint-plugin': 7.7.0(@typescript-eslint/parser@7.7.0(eslint@9.1.1)(typescript@5.4.5))(eslint@9.1.1)(typescript@5.4.5) + '@typescript-eslint/parser': 7.7.0(eslint@9.1.1)(typescript@5.4.5) + eslint: 9.1.1 eslint-config-flat-gitignore: 0.1.5 eslint-flat-config-utils: 0.2.3 - eslint-plugin-import-x: 0.5.0(eslint@9.1.0)(typescript@5.4.5) - eslint-plugin-jsdoc: 48.2.3(eslint@9.1.0) - eslint-plugin-unicorn: 52.0.0(eslint@9.1.0) - eslint-plugin-vue: 9.25.0(eslint@9.1.0) + eslint-plugin-import-x: 0.5.0(eslint@9.1.1)(typescript@5.4.5) + eslint-plugin-jsdoc: 48.2.3(eslint@9.1.1) + eslint-plugin-unicorn: 52.0.0(eslint@9.1.1) + eslint-plugin-vue: 9.25.0(eslint@9.1.1) globals: 15.0.0 pathe: 1.1.2 tslib: 2.6.2 - vue-eslint-parser: 9.4.2(eslint@9.1.0) + vue-eslint-parser: 9.4.2(eslint@9.1.1) transitivePeerDependencies: - supports-color - typescript - '@nuxt/eslint-plugin@0.3.9(eslint@9.1.0)(typescript@5.4.5)': + '@nuxt/eslint-plugin@0.3.9(eslint@9.1.1)(typescript@5.4.5)': dependencies: '@typescript-eslint/types': 7.7.0 - '@typescript-eslint/utils': 7.7.0(eslint@9.1.0)(typescript@5.4.5) - eslint: 9.1.0 + '@typescript-eslint/utils': 7.7.0(eslint@9.1.1)(typescript@5.4.5) + eslint: 9.1.1 transitivePeerDependencies: - supports-color - typescript @@ -8082,122 +8082,122 @@ snapshots: '@polka/url@1.0.0-next.24': {} - '@rollup/plugin-alias@5.1.0(rollup@4.16.2)': + '@rollup/plugin-alias@5.1.0(rollup@4.16.3)': dependencies: slash: 4.0.0 optionalDependencies: - rollup: 4.16.2 + rollup: 4.16.3 - '@rollup/plugin-commonjs@25.0.7(rollup@4.16.2)': + '@rollup/plugin-commonjs@25.0.7(rollup@4.16.3)': dependencies: - '@rollup/pluginutils': 5.1.0(rollup@4.16.2) + '@rollup/pluginutils': 5.1.0(rollup@4.16.3) commondir: 1.0.1 estree-walker: 2.0.2 glob: 8.1.0 is-reference: 1.2.1 magic-string: 0.30.10 optionalDependencies: - rollup: 4.16.2 + rollup: 4.16.3 - '@rollup/plugin-inject@5.0.5(rollup@4.16.2)': + '@rollup/plugin-inject@5.0.5(rollup@4.16.3)': dependencies: - '@rollup/pluginutils': 5.1.0(rollup@4.16.2) + '@rollup/pluginutils': 5.1.0(rollup@4.16.3) estree-walker: 2.0.2 magic-string: 0.30.10 optionalDependencies: - rollup: 4.16.2 + rollup: 4.16.3 - '@rollup/plugin-json@6.1.0(rollup@4.16.2)': + '@rollup/plugin-json@6.1.0(rollup@4.16.3)': dependencies: - '@rollup/pluginutils': 5.1.0(rollup@4.16.2) + '@rollup/pluginutils': 5.1.0(rollup@4.16.3) optionalDependencies: - rollup: 4.16.2 + rollup: 4.16.3 - '@rollup/plugin-node-resolve@15.2.3(rollup@4.16.2)': + '@rollup/plugin-node-resolve@15.2.3(rollup@4.16.3)': dependencies: - '@rollup/pluginutils': 5.1.0(rollup@4.16.2) + '@rollup/pluginutils': 5.1.0(rollup@4.16.3) '@types/resolve': 1.20.2 deepmerge: 4.3.1 is-builtin-module: 3.2.1 is-module: 1.0.0 resolve: 1.22.8 optionalDependencies: - rollup: 4.16.2 + rollup: 4.16.3 - '@rollup/plugin-replace@5.0.5(rollup@4.16.2)': + '@rollup/plugin-replace@5.0.5(rollup@4.16.3)': dependencies: - '@rollup/pluginutils': 5.1.0(rollup@4.16.2) + '@rollup/pluginutils': 5.1.0(rollup@4.16.3) magic-string: 0.30.10 optionalDependencies: - rollup: 4.16.2 + rollup: 4.16.3 - '@rollup/plugin-terser@0.4.4(rollup@4.16.2)': + '@rollup/plugin-terser@0.4.4(rollup@4.16.3)': dependencies: serialize-javascript: 6.0.2 smob: 1.4.1 terser: 5.27.0 optionalDependencies: - rollup: 4.16.2 + rollup: 4.16.3 '@rollup/pluginutils@4.2.1': dependencies: estree-walker: 2.0.2 picomatch: 2.3.1 - '@rollup/pluginutils@5.1.0(rollup@4.16.2)': + '@rollup/pluginutils@5.1.0(rollup@4.16.3)': dependencies: '@types/estree': 1.0.5 estree-walker: 2.0.2 picomatch: 2.3.1 optionalDependencies: - rollup: 4.16.2 + rollup: 4.16.3 - '@rollup/rollup-android-arm-eabi@4.16.2': + '@rollup/rollup-android-arm-eabi@4.16.3': optional: true - '@rollup/rollup-android-arm64@4.16.2': + '@rollup/rollup-android-arm64@4.16.3': optional: true - '@rollup/rollup-darwin-arm64@4.16.2': + '@rollup/rollup-darwin-arm64@4.16.3': optional: true - '@rollup/rollup-darwin-x64@4.16.2': + '@rollup/rollup-darwin-x64@4.16.3': optional: true - '@rollup/rollup-linux-arm-gnueabihf@4.16.2': + '@rollup/rollup-linux-arm-gnueabihf@4.16.3': optional: true - '@rollup/rollup-linux-arm-musleabihf@4.16.2': + '@rollup/rollup-linux-arm-musleabihf@4.16.3': optional: true - '@rollup/rollup-linux-arm64-gnu@4.16.2': + '@rollup/rollup-linux-arm64-gnu@4.16.3': optional: true - '@rollup/rollup-linux-arm64-musl@4.16.2': + '@rollup/rollup-linux-arm64-musl@4.16.3': optional: true - '@rollup/rollup-linux-powerpc64le-gnu@4.16.2': + '@rollup/rollup-linux-powerpc64le-gnu@4.16.3': optional: true - '@rollup/rollup-linux-riscv64-gnu@4.16.2': + '@rollup/rollup-linux-riscv64-gnu@4.16.3': optional: true - '@rollup/rollup-linux-s390x-gnu@4.16.2': + '@rollup/rollup-linux-s390x-gnu@4.16.3': optional: true - '@rollup/rollup-linux-x64-gnu@4.16.2': + '@rollup/rollup-linux-x64-gnu@4.16.3': optional: true - '@rollup/rollup-linux-x64-musl@4.16.2': + '@rollup/rollup-linux-x64-musl@4.16.3': optional: true - '@rollup/rollup-win32-arm64-msvc@4.16.2': + '@rollup/rollup-win32-arm64-msvc@4.16.3': optional: true - '@rollup/rollup-win32-ia32-msvc@4.16.2': + '@rollup/rollup-win32-ia32-msvc@4.16.3': optional: true - '@rollup/rollup-win32-x64-msvc@4.16.2': + '@rollup/rollup-win32-x64-msvc@4.16.3': optional: true '@rushstack/eslint-patch@1.10.2': {} @@ -8270,50 +8270,50 @@ snapshots: '@sindresorhus/merge-streams@2.2.0': {} - '@stylistic/eslint-plugin-js@1.7.2(eslint@9.1.0)': + '@stylistic/eslint-plugin-js@1.7.2(eslint@9.1.1)': dependencies: '@types/eslint': 8.56.10 acorn: 8.11.3 escape-string-regexp: 4.0.0 - eslint: 9.1.0 + eslint: 9.1.1 eslint-visitor-keys: 3.4.3 espree: 9.6.1 - '@stylistic/eslint-plugin-jsx@1.7.2(eslint@9.1.0)': + '@stylistic/eslint-plugin-jsx@1.7.2(eslint@9.1.1)': dependencies: - '@stylistic/eslint-plugin-js': 1.7.2(eslint@9.1.0) + '@stylistic/eslint-plugin-js': 1.7.2(eslint@9.1.1) '@types/eslint': 8.56.10 - eslint: 9.1.0 + eslint: 9.1.1 estraverse: 5.3.0 picomatch: 4.0.2 - '@stylistic/eslint-plugin-plus@1.7.2(eslint@9.1.0)(typescript@5.4.5)': + '@stylistic/eslint-plugin-plus@1.7.2(eslint@9.1.1)(typescript@5.4.5)': dependencies: '@types/eslint': 8.56.10 - '@typescript-eslint/utils': 6.21.0(eslint@9.1.0)(typescript@5.4.5) - eslint: 9.1.0 + '@typescript-eslint/utils': 6.21.0(eslint@9.1.1)(typescript@5.4.5) + eslint: 9.1.1 transitivePeerDependencies: - supports-color - typescript - '@stylistic/eslint-plugin-ts@1.7.2(eslint@9.1.0)(typescript@5.4.5)': + '@stylistic/eslint-plugin-ts@1.7.2(eslint@9.1.1)(typescript@5.4.5)': dependencies: - '@stylistic/eslint-plugin-js': 1.7.2(eslint@9.1.0) + '@stylistic/eslint-plugin-js': 1.7.2(eslint@9.1.1) '@types/eslint': 8.56.10 - '@typescript-eslint/utils': 6.21.0(eslint@9.1.0)(typescript@5.4.5) - eslint: 9.1.0 + '@typescript-eslint/utils': 6.21.0(eslint@9.1.1)(typescript@5.4.5) + eslint: 9.1.1 transitivePeerDependencies: - supports-color - typescript - '@stylistic/eslint-plugin@1.7.2(eslint@9.1.0)(typescript@5.4.5)': + '@stylistic/eslint-plugin@1.7.2(eslint@9.1.1)(typescript@5.4.5)': dependencies: - '@stylistic/eslint-plugin-js': 1.7.2(eslint@9.1.0) - '@stylistic/eslint-plugin-jsx': 1.7.2(eslint@9.1.0) - '@stylistic/eslint-plugin-plus': 1.7.2(eslint@9.1.0)(typescript@5.4.5) - '@stylistic/eslint-plugin-ts': 1.7.2(eslint@9.1.0)(typescript@5.4.5) + '@stylistic/eslint-plugin-js': 1.7.2(eslint@9.1.1) + '@stylistic/eslint-plugin-jsx': 1.7.2(eslint@9.1.1) + '@stylistic/eslint-plugin-plus': 1.7.2(eslint@9.1.1)(typescript@5.4.5) + '@stylistic/eslint-plugin-ts': 1.7.2(eslint@9.1.1)(typescript@5.4.5) '@types/eslint': 8.56.10 - eslint: 9.1.0 + eslint: 9.1.1 transitivePeerDependencies: - supports-color - typescript @@ -8508,16 +8508,16 @@ snapshots: dependencies: '@types/yargs-parser': 21.0.1 - '@typescript-eslint/eslint-plugin@7.7.0(@typescript-eslint/parser@7.7.0(eslint@9.1.0)(typescript@5.4.5))(eslint@9.1.0)(typescript@5.4.5)': + '@typescript-eslint/eslint-plugin@7.7.0(@typescript-eslint/parser@7.7.0(eslint@9.1.1)(typescript@5.4.5))(eslint@9.1.1)(typescript@5.4.5)': dependencies: '@eslint-community/regexpp': 4.10.0 - '@typescript-eslint/parser': 7.7.0(eslint@9.1.0)(typescript@5.4.5) + '@typescript-eslint/parser': 7.7.0(eslint@9.1.1)(typescript@5.4.5) '@typescript-eslint/scope-manager': 7.7.0 - '@typescript-eslint/type-utils': 7.7.0(eslint@9.1.0)(typescript@5.4.5) - '@typescript-eslint/utils': 7.7.0(eslint@9.1.0)(typescript@5.4.5) + '@typescript-eslint/type-utils': 7.7.0(eslint@9.1.1)(typescript@5.4.5) + '@typescript-eslint/utils': 7.7.0(eslint@9.1.1)(typescript@5.4.5) '@typescript-eslint/visitor-keys': 7.7.0 debug: 4.3.4 - eslint: 9.1.0 + eslint: 9.1.1 graphemer: 1.4.0 ignore: 5.3.1 natural-compare: 1.4.0 @@ -8528,14 +8528,14 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@7.7.0(eslint@9.1.0)(typescript@5.4.5)': + '@typescript-eslint/parser@7.7.0(eslint@9.1.1)(typescript@5.4.5)': dependencies: '@typescript-eslint/scope-manager': 7.7.0 '@typescript-eslint/types': 7.7.0 '@typescript-eslint/typescript-estree': 7.7.0(typescript@5.4.5) '@typescript-eslint/visitor-keys': 7.7.0 debug: 4.3.4 - eslint: 9.1.0 + eslint: 9.1.1 optionalDependencies: typescript: 5.4.5 transitivePeerDependencies: @@ -8551,12 +8551,12 @@ snapshots: '@typescript-eslint/types': 7.7.0 '@typescript-eslint/visitor-keys': 7.7.0 - '@typescript-eslint/type-utils@7.7.0(eslint@9.1.0)(typescript@5.4.5)': + '@typescript-eslint/type-utils@7.7.0(eslint@9.1.1)(typescript@5.4.5)': dependencies: '@typescript-eslint/typescript-estree': 7.7.0(typescript@5.4.5) - '@typescript-eslint/utils': 7.7.0(eslint@9.1.0)(typescript@5.4.5) + '@typescript-eslint/utils': 7.7.0(eslint@9.1.1)(typescript@5.4.5) debug: 4.3.4 - eslint: 9.1.0 + eslint: 9.1.1 ts-api-utils: 1.3.0(typescript@5.4.5) optionalDependencies: typescript: 5.4.5 @@ -8597,29 +8597,29 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@6.21.0(eslint@9.1.0)(typescript@5.4.5)': + '@typescript-eslint/utils@6.21.0(eslint@9.1.1)(typescript@5.4.5)': dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.1.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.1.1) '@types/json-schema': 7.0.15 '@types/semver': 7.5.8 '@typescript-eslint/scope-manager': 6.21.0 '@typescript-eslint/types': 6.21.0 '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.4.5) - eslint: 9.1.0 + eslint: 9.1.1 semver: 7.6.0 transitivePeerDependencies: - supports-color - typescript - '@typescript-eslint/utils@7.7.0(eslint@9.1.0)(typescript@5.4.5)': + '@typescript-eslint/utils@7.7.0(eslint@9.1.1)(typescript@5.4.5)': dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.1.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.1.1) '@types/json-schema': 7.0.15 '@types/semver': 7.5.8 '@typescript-eslint/scope-manager': 7.7.0 '@typescript-eslint/types': 7.7.0 '@typescript-eslint/typescript-estree': 7.7.0(typescript@5.4.5) - eslint: 9.1.0 + eslint: 9.1.1 semver: 7.6.0 transitivePeerDependencies: - supports-color @@ -8670,20 +8670,20 @@ snapshots: unhead: 1.9.7 vue: 3.4.24(typescript@5.4.5) - '@unocss/astro@0.58.6(rollup@4.16.2)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0))': + '@unocss/astro@0.58.6(rollup@4.16.3)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0))': dependencies: '@unocss/core': 0.58.6 '@unocss/reset': 0.58.6 - '@unocss/vite': 0.58.6(rollup@4.16.2)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0)) + '@unocss/vite': 0.58.6(rollup@4.16.3)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0)) optionalDependencies: vite: 5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0) transitivePeerDependencies: - rollup - '@unocss/cli@0.58.6(rollup@4.16.2)': + '@unocss/cli@0.58.6(rollup@4.16.3)': dependencies: '@ampproject/remapping': 2.3.0 - '@rollup/pluginutils': 5.1.0(rollup@4.16.2) + '@rollup/pluginutils': 5.1.0(rollup@4.16.3) '@unocss/config': 0.58.6 '@unocss/core': 0.58.6 '@unocss/preset-uno': 0.58.6 @@ -8807,10 +8807,10 @@ snapshots: dependencies: '@unocss/core': 0.58.6 - '@unocss/vite@0.58.6(rollup@4.16.2)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0))': + '@unocss/vite@0.58.6(rollup@4.16.3)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0))': dependencies: '@ampproject/remapping': 2.3.0 - '@rollup/pluginutils': 5.1.0(rollup@4.16.2) + '@rollup/pluginutils': 5.1.0(rollup@4.16.3) '@unocss/config': 0.58.6 '@unocss/core': 0.58.6 '@unocss/inspector': 0.58.6 @@ -8954,12 +8954,12 @@ snapshots: '@volar/language-core': 2.2.0-alpha.10 path-browserify: 1.0.1 - '@vue-macros/common@1.10.1(rollup@4.16.2)(vue@3.4.24(typescript@5.4.5))': + '@vue-macros/common@1.10.1(rollup@4.16.3)(vue@3.4.24(typescript@5.4.5))': dependencies: '@babel/types': 7.24.0 - '@rollup/pluginutils': 5.1.0(rollup@4.16.2) + '@rollup/pluginutils': 5.1.0(rollup@4.16.3) '@vue/compiler-sfc': 3.4.24 - ast-kit: 0.11.3(rollup@4.16.2) + ast-kit: 0.11.3(rollup@4.16.3) local-pkg: 0.5.0 magic-string-ast: 0.3.0 optionalDependencies: @@ -9029,12 +9029,12 @@ snapshots: '@vue/devtools-api@6.5.1': {} - '@vue/devtools-applet@7.0.27(@unocss/reset@0.58.6)(floating-vue@5.2.2(@nuxt/kit@packages+kit)(vue@3.4.24(typescript@5.4.5)))(unocss@0.58.6(postcss@8.4.38)(rollup@4.16.2)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0)))(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0))(vue@3.4.24(typescript@5.4.5))': + '@vue/devtools-applet@7.0.27(@unocss/reset@0.58.6)(floating-vue@5.2.2(@nuxt/kit@packages+kit)(vue@3.4.24(typescript@5.4.5)))(unocss@0.58.6(postcss@8.4.38)(rollup@4.16.3)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0)))(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0))(vue@3.4.24(typescript@5.4.5))': dependencies: '@vue/devtools-core': 7.0.27(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0))(vue@3.4.24(typescript@5.4.5)) '@vue/devtools-kit': 7.0.27(vue@3.4.24(typescript@5.4.5)) '@vue/devtools-shared': 7.0.27 - '@vue/devtools-ui': 7.0.27(@unocss/reset@0.58.6)(floating-vue@5.2.2(@nuxt/kit@packages+kit)(vue@3.4.24(typescript@5.4.5)))(unocss@0.58.6(postcss@8.4.38)(rollup@4.16.2)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0)))(vue@3.4.24(typescript@5.4.5)) + '@vue/devtools-ui': 7.0.27(@unocss/reset@0.58.6)(floating-vue@5.2.2(@nuxt/kit@packages+kit)(vue@3.4.24(typescript@5.4.5)))(unocss@0.58.6(postcss@8.4.38)(rollup@4.16.3)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0)))(vue@3.4.24(typescript@5.4.5)) perfect-debounce: 1.0.0 splitpanes: 3.1.5 vue: 3.4.24(typescript@5.4.5) @@ -9082,7 +9082,7 @@ snapshots: dependencies: rfdc: 1.3.1 - '@vue/devtools-ui@7.0.27(@unocss/reset@0.58.6)(floating-vue@5.2.2(@nuxt/kit@packages+kit)(vue@3.4.24(typescript@5.4.5)))(unocss@0.58.6(postcss@8.4.38)(rollup@4.16.2)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0)))(vue@3.4.24(typescript@5.4.5))': + '@vue/devtools-ui@7.0.27(@unocss/reset@0.58.6)(floating-vue@5.2.2(@nuxt/kit@packages+kit)(vue@3.4.24(typescript@5.4.5)))(unocss@0.58.6(postcss@8.4.38)(rollup@4.16.3)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0)))(vue@3.4.24(typescript@5.4.5))': dependencies: '@unocss/reset': 0.58.6 '@vueuse/components': 10.9.0(vue@3.4.24(typescript@5.4.5)) @@ -9091,7 +9091,7 @@ snapshots: colord: 2.9.3 floating-vue: 5.2.2(@nuxt/kit@packages+kit)(vue@3.4.24(typescript@5.4.5)) focus-trap: 7.5.4 - unocss: 0.58.6(postcss@8.4.38)(rollup@4.16.2)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0)) + unocss: 0.58.6(postcss@8.4.38)(rollup@4.16.3)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0)) vue: 3.4.24(typescript@5.4.5) transitivePeerDependencies: - '@vue/composition-api' @@ -9429,26 +9429,26 @@ snapshots: assertion-error@1.1.0: {} - ast-kit@0.11.3(rollup@4.16.2): + ast-kit@0.11.3(rollup@4.16.3): dependencies: '@babel/parser': 7.24.4 - '@rollup/pluginutils': 5.1.0(rollup@4.16.2) + '@rollup/pluginutils': 5.1.0(rollup@4.16.3) pathe: 1.1.2 transitivePeerDependencies: - rollup - ast-kit@0.9.5(rollup@4.16.2): + ast-kit@0.9.5(rollup@4.16.3): dependencies: '@babel/parser': 7.24.4 - '@rollup/pluginutils': 5.1.0(rollup@4.16.2) + '@rollup/pluginutils': 5.1.0(rollup@4.16.3) pathe: 1.1.2 transitivePeerDependencies: - rollup - ast-walker-scope@0.5.0(rollup@4.16.2): + ast-walker-scope@0.5.0(rollup@4.16.3): dependencies: '@babel/parser': 7.24.4 - ast-kit: 0.9.5(rollup@4.16.2) + ast-kit: 0.9.5(rollup@4.16.3) transitivePeerDependencies: - rollup @@ -10267,12 +10267,12 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-plugin-import-x@0.5.0(eslint@9.1.0)(typescript@5.4.5): + eslint-plugin-import-x@0.5.0(eslint@9.1.1)(typescript@5.4.5): dependencies: - '@typescript-eslint/utils': 7.7.0(eslint@9.1.0)(typescript@5.4.5) + '@typescript-eslint/utils': 7.7.0(eslint@9.1.1)(typescript@5.4.5) debug: 4.3.4 doctrine: 3.0.0 - eslint: 9.1.0 + eslint: 9.1.1 eslint-import-resolver-node: 0.3.9 get-tsconfig: 4.7.3 is-glob: 4.0.3 @@ -10282,14 +10282,14 @@ snapshots: - supports-color - typescript - eslint-plugin-jsdoc@48.2.3(eslint@9.1.0): + eslint-plugin-jsdoc@48.2.3(eslint@9.1.1): dependencies: '@es-joy/jsdoccomment': 0.42.0 are-docs-informative: 0.0.2 comment-parser: 1.4.1 debug: 4.3.4 escape-string-regexp: 4.0.0 - eslint: 9.1.0 + eslint: 9.1.1 esquery: 1.5.0 is-builtin-module: 3.2.1 semver: 7.6.0 @@ -10299,27 +10299,27 @@ snapshots: eslint-plugin-no-only-tests@3.1.0: {} - eslint-plugin-perfectionist@2.9.0(eslint@9.1.0)(typescript@5.4.5)(vue-eslint-parser@9.4.2(eslint@9.1.0)): + eslint-plugin-perfectionist@2.9.0(eslint@9.1.1)(typescript@5.4.5)(vue-eslint-parser@9.4.2(eslint@9.1.1)): dependencies: - '@typescript-eslint/utils': 6.21.0(eslint@9.1.0)(typescript@5.4.5) - eslint: 9.1.0 + '@typescript-eslint/utils': 6.21.0(eslint@9.1.1)(typescript@5.4.5) + eslint: 9.1.1 minimatch: 9.0.4 natural-compare-lite: 1.4.0 optionalDependencies: - vue-eslint-parser: 9.4.2(eslint@9.1.0) + vue-eslint-parser: 9.4.2(eslint@9.1.1) transitivePeerDependencies: - supports-color - typescript - eslint-plugin-unicorn@52.0.0(eslint@9.1.0): + eslint-plugin-unicorn@52.0.0(eslint@9.1.1): dependencies: '@babel/helper-validator-identifier': 7.22.20 - '@eslint-community/eslint-utils': 4.4.0(eslint@9.1.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.1.1) '@eslint/eslintrc': 2.1.4 ci-info: 4.0.0 clean-regexp: 1.0.0 core-js-compat: 3.34.0 - eslint: 9.1.0 + eslint: 9.1.1 esquery: 1.5.0 indent-string: 4.0.0 is-builtin-module: 3.2.1 @@ -10333,16 +10333,16 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-plugin-vue@9.25.0(eslint@9.1.0): + eslint-plugin-vue@9.25.0(eslint@9.1.1): dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.1.0) - eslint: 9.1.0 + '@eslint-community/eslint-utils': 4.4.0(eslint@9.1.1) + eslint: 9.1.1 globals: 13.24.0 natural-compare: 1.4.0 nth-check: 2.1.1 postcss-selector-parser: 6.0.16 semver: 7.6.0 - vue-eslint-parser: 9.4.2(eslint@9.1.0) + vue-eslint-parser: 9.4.2(eslint@9.1.1) xml-name-validator: 4.0.0 transitivePeerDependencies: - supports-color @@ -10362,10 +10362,10 @@ snapshots: esrecurse: 4.3.0 estraverse: 5.3.0 - eslint-typegen@0.2.4(eslint@9.1.0): + eslint-typegen@0.2.4(eslint@9.1.1): dependencies: '@types/eslint': 8.56.10 - eslint: 9.1.0 + eslint: 9.1.1 json-schema-to-typescript-lite: 14.0.1 ohash: 1.1.3 @@ -10373,9 +10373,9 @@ snapshots: eslint-visitor-keys@4.0.0: {} - eslint@9.1.0: + eslint@9.1.1: dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.1.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.1.1) '@eslint-community/regexpp': 4.10.0 '@eslint/eslintrc': 3.0.2 '@eslint/js': 9.1.1 @@ -11979,14 +11979,14 @@ snapshots: dependencies: '@cloudflare/kv-asset-handler': 0.3.1 '@netlify/functions': 2.6.0 - '@rollup/plugin-alias': 5.1.0(rollup@4.16.2) - '@rollup/plugin-commonjs': 25.0.7(rollup@4.16.2) - '@rollup/plugin-inject': 5.0.5(rollup@4.16.2) - '@rollup/plugin-json': 6.1.0(rollup@4.16.2) - '@rollup/plugin-node-resolve': 15.2.3(rollup@4.16.2) - '@rollup/plugin-replace': 5.0.5(rollup@4.16.2) - '@rollup/plugin-terser': 0.4.4(rollup@4.16.2) - '@rollup/pluginutils': 5.1.0(rollup@4.16.2) + '@rollup/plugin-alias': 5.1.0(rollup@4.16.3) + '@rollup/plugin-commonjs': 25.0.7(rollup@4.16.3) + '@rollup/plugin-inject': 5.0.5(rollup@4.16.3) + '@rollup/plugin-json': 6.1.0(rollup@4.16.3) + '@rollup/plugin-node-resolve': 15.2.3(rollup@4.16.3) + '@rollup/plugin-replace': 5.0.5(rollup@4.16.3) + '@rollup/plugin-terser': 0.4.4(rollup@4.16.3) + '@rollup/pluginutils': 5.1.0(rollup@4.16.3) '@types/http-proxy': 1.17.14 '@vercel/nft': 0.26.4(encoding@0.1.13) archiver: 7.0.1 @@ -12030,8 +12030,8 @@ snapshots: pkg-types: 1.1.0 pretty-bytes: 6.1.1 radix3: 1.1.2 - rollup: 4.16.2 - rollup-plugin-visualizer: 5.12.0(rollup@4.16.2) + rollup: 4.16.3 + rollup-plugin-visualizer: 5.12.0(rollup@4.16.3) scule: 1.3.0 semver: 7.6.0 serve-placeholder: 2.0.1 @@ -12041,7 +12041,7 @@ snapshots: uncrypto: 0.1.3 unctx: 2.3.1 unenv: 1.9.0 - unimport: 3.7.1(rollup@4.16.2) + unimport: 3.7.1(rollup@4.16.3) unstorage: 1.10.2(ioredis@5.3.2) unwasm: 0.3.9 transitivePeerDependencies: @@ -13027,43 +13027,43 @@ snapshots: dependencies: glob: 10.3.10 - rollup-plugin-dts@6.1.0(rollup@4.16.2)(typescript@5.4.5): + rollup-plugin-dts@6.1.0(rollup@4.16.3)(typescript@5.4.5): dependencies: magic-string: 0.30.10 - rollup: 4.16.2 + rollup: 4.16.3 typescript: 5.4.5 optionalDependencies: '@babel/code-frame': 7.24.2 - rollup-plugin-visualizer@5.12.0(rollup@4.16.2): + rollup-plugin-visualizer@5.12.0(rollup@4.16.3): dependencies: open: 8.4.2 picomatch: 2.3.1 source-map: 0.7.4 yargs: 17.7.2 optionalDependencies: - rollup: 4.16.2 + rollup: 4.16.3 - rollup@4.16.2: + rollup@4.16.3: dependencies: '@types/estree': 1.0.5 optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.16.2 - '@rollup/rollup-android-arm64': 4.16.2 - '@rollup/rollup-darwin-arm64': 4.16.2 - '@rollup/rollup-darwin-x64': 4.16.2 - '@rollup/rollup-linux-arm-gnueabihf': 4.16.2 - '@rollup/rollup-linux-arm-musleabihf': 4.16.2 - '@rollup/rollup-linux-arm64-gnu': 4.16.2 - '@rollup/rollup-linux-arm64-musl': 4.16.2 - '@rollup/rollup-linux-powerpc64le-gnu': 4.16.2 - '@rollup/rollup-linux-riscv64-gnu': 4.16.2 - '@rollup/rollup-linux-s390x-gnu': 4.16.2 - '@rollup/rollup-linux-x64-gnu': 4.16.2 - '@rollup/rollup-linux-x64-musl': 4.16.2 - '@rollup/rollup-win32-arm64-msvc': 4.16.2 - '@rollup/rollup-win32-ia32-msvc': 4.16.2 - '@rollup/rollup-win32-x64-msvc': 4.16.2 + '@rollup/rollup-android-arm-eabi': 4.16.3 + '@rollup/rollup-android-arm64': 4.16.3 + '@rollup/rollup-darwin-arm64': 4.16.3 + '@rollup/rollup-darwin-x64': 4.16.3 + '@rollup/rollup-linux-arm-gnueabihf': 4.16.3 + '@rollup/rollup-linux-arm-musleabihf': 4.16.3 + '@rollup/rollup-linux-arm64-gnu': 4.16.3 + '@rollup/rollup-linux-arm64-musl': 4.16.3 + '@rollup/rollup-linux-powerpc64le-gnu': 4.16.3 + '@rollup/rollup-linux-riscv64-gnu': 4.16.3 + '@rollup/rollup-linux-s390x-gnu': 4.16.3 + '@rollup/rollup-linux-x64-gnu': 4.16.3 + '@rollup/rollup-linux-x64-musl': 4.16.3 + '@rollup/rollup-win32-arm64-msvc': 4.16.3 + '@rollup/rollup-win32-ia32-msvc': 4.16.3 + '@rollup/rollup-win32-x64-msvc': 4.16.3 fsevents: 2.3.3 run-applescript@5.0.0: @@ -13539,12 +13539,12 @@ snapshots: unbuild@2.0.0(sass@1.69.4)(typescript@5.4.5): dependencies: - '@rollup/plugin-alias': 5.1.0(rollup@4.16.2) - '@rollup/plugin-commonjs': 25.0.7(rollup@4.16.2) - '@rollup/plugin-json': 6.1.0(rollup@4.16.2) - '@rollup/plugin-node-resolve': 15.2.3(rollup@4.16.2) - '@rollup/plugin-replace': 5.0.5(rollup@4.16.2) - '@rollup/pluginutils': 5.1.0(rollup@4.16.2) + '@rollup/plugin-alias': 5.1.0(rollup@4.16.3) + '@rollup/plugin-commonjs': 25.0.7(rollup@4.16.3) + '@rollup/plugin-json': 6.1.0(rollup@4.16.3) + '@rollup/plugin-node-resolve': 15.2.3(rollup@4.16.3) + '@rollup/plugin-replace': 5.0.5(rollup@4.16.3) + '@rollup/pluginutils': 5.1.0(rollup@4.16.3) chalk: 5.3.0 citty: 0.1.6 consola: 3.2.3 @@ -13559,8 +13559,8 @@ snapshots: pathe: 1.1.2 pkg-types: 1.1.0 pretty-bytes: 6.1.1 - rollup: 4.16.2 - rollup-plugin-dts: 6.1.0(rollup@4.16.2)(typescript@5.4.5) + rollup: 4.16.3 + rollup-plugin-dts: 6.1.0(rollup@4.16.3)(typescript@5.4.5) scule: 1.3.0 untyped: 1.4.2 optionalDependencies: @@ -13620,9 +13620,9 @@ snapshots: trough: 2.2.0 vfile: 6.0.1 - unimport@3.7.1(rollup@4.16.2): + unimport@3.7.1(rollup@4.16.3): dependencies: - '@rollup/pluginutils': 5.1.0(rollup@4.16.2) + '@rollup/pluginutils': 5.1.0(rollup@4.16.3) acorn: 8.11.3 escape-string-regexp: 5.0.0 estree-walker: 3.0.3 @@ -13675,10 +13675,10 @@ snapshots: universalify@2.0.0: {} - unocss@0.58.6(postcss@8.4.38)(rollup@4.16.2)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0)): + unocss@0.58.6(postcss@8.4.38)(rollup@4.16.3)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0)): dependencies: - '@unocss/astro': 0.58.6(rollup@4.16.2)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0)) - '@unocss/cli': 0.58.6(rollup@4.16.2) + '@unocss/astro': 0.58.6(rollup@4.16.3)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0)) + '@unocss/cli': 0.58.6(rollup@4.16.3) '@unocss/core': 0.58.6 '@unocss/extractor-arbitrary-variants': 0.58.6 '@unocss/postcss': 0.58.6(postcss@8.4.38) @@ -13696,7 +13696,7 @@ snapshots: '@unocss/transformer-compile-class': 0.58.6 '@unocss/transformer-directives': 0.58.6 '@unocss/transformer-variant-group': 0.58.6 - '@unocss/vite': 0.58.6(rollup@4.16.2)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0)) + '@unocss/vite': 0.58.6(rollup@4.16.3)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0)) optionalDependencies: vite: 5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0) transitivePeerDependencies: @@ -13704,12 +13704,12 @@ snapshots: - rollup - supports-color - unplugin-vue-router@0.7.0(rollup@4.16.2)(vue-router@4.3.2(vue@3.4.24(typescript@5.4.5)))(vue@3.4.24(typescript@5.4.5)): + unplugin-vue-router@0.7.0(rollup@4.16.3)(vue-router@4.3.2(vue@3.4.24(typescript@5.4.5)))(vue@3.4.24(typescript@5.4.5)): dependencies: '@babel/types': 7.24.0 - '@rollup/pluginutils': 5.1.0(rollup@4.16.2) - '@vue-macros/common': 1.10.1(rollup@4.16.2)(vue@3.4.24(typescript@5.4.5)) - ast-walker-scope: 0.5.0(rollup@4.16.2) + '@rollup/pluginutils': 5.1.0(rollup@4.16.3) + '@vue-macros/common': 1.10.1(rollup@4.16.3)(vue@3.4.24(typescript@5.4.5)) + ast-walker-scope: 0.5.0(rollup@4.16.3) chokidar: 3.6.0 fast-glob: 3.3.2 json5: 2.2.3 @@ -13872,7 +13872,7 @@ snapshots: - supports-color - terser - vite-plugin-checker@0.6.4(eslint@9.1.0)(optionator@0.9.3)(typescript@5.4.5)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0))(vue-tsc@2.0.14(typescript@5.4.5)): + vite-plugin-checker@0.6.4(eslint@9.1.1)(optionator@0.9.3)(typescript@5.4.5)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0))(vue-tsc@2.0.14(typescript@5.4.5)): dependencies: '@babel/code-frame': 7.24.2 ansi-escapes: 4.3.2 @@ -13891,15 +13891,15 @@ snapshots: vscode-languageserver-textdocument: 1.0.11 vscode-uri: 3.0.8 optionalDependencies: - eslint: 9.1.0 + eslint: 9.1.1 optionator: 0.9.3 typescript: 5.4.5 vue-tsc: 2.0.14(typescript@5.4.5) - vite-plugin-inspect@0.8.3(@nuxt/kit@packages+kit)(rollup@4.16.2)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0)): + vite-plugin-inspect@0.8.3(@nuxt/kit@packages+kit)(rollup@4.16.3)(vite@5.2.10(@types/node@20.12.7)(sass@1.69.4)(terser@5.27.0)): dependencies: '@antfu/utils': 0.7.7 - '@rollup/pluginutils': 5.1.0(rollup@4.16.2) + '@rollup/pluginutils': 5.1.0(rollup@4.16.3) debug: 4.3.4 error-stack-parser-es: 0.1.1 fs-extra: 11.2.0 @@ -13933,7 +13933,7 @@ snapshots: dependencies: esbuild: 0.20.2 postcss: 8.4.38 - rollup: 4.16.2 + rollup: 4.16.3 optionalDependencies: '@types/node': 20.12.7 fsevents: 2.3.3 @@ -14065,10 +14065,10 @@ snapshots: vue-devtools-stub@0.1.0: {} - vue-eslint-parser@9.4.2(eslint@9.1.0): + vue-eslint-parser@9.4.2(eslint@9.1.1): dependencies: debug: 4.3.4 - eslint: 9.1.0 + eslint: 9.1.1 eslint-scope: 7.2.2 eslint-visitor-keys: 3.4.3 espree: 9.6.1 From 1a91b120eee5fa131ef22d849fbf57ca0e68c395 Mon Sep 17 00:00:00 2001 From: Nicolas Payot Date: Tue, 23 Apr 2024 11:34:41 +0200 Subject: [PATCH 178/229] fix(nuxt): check if `_scope` is active before calling `run` function (#26756) (#26904) --- packages/nuxt/src/app/nuxt.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/nuxt/src/app/nuxt.ts b/packages/nuxt/src/app/nuxt.ts index bd35446756..a89224deca 100644 --- a/packages/nuxt/src/app/nuxt.ts +++ b/packages/nuxt/src/app/nuxt.ts @@ -254,7 +254,12 @@ export function createNuxtApp (options: CreateOptions) { static: { data: {}, }, - runWithContext: (fn: any) => nuxtApp._scope.run(() => callWithNuxt(nuxtApp, fn)), + runWithContext (fn: any) { + if (nuxtApp._scope.active) { + return nuxtApp._scope.run(() => callWithNuxt(nuxtApp, fn)) + } + return callWithNuxt(nuxtApp, fn) + }, isHydrating: import.meta.client, deferHydration () { if (!nuxtApp.isHydrating) { return () => {} } From 9f9e3e6917bdb306ac30634d9fa6a84539b81017 Mon Sep 17 00:00:00 2001 From: rgehbt <74761884+Gehbt@users.noreply.github.com> Date: Tue, 23 Apr 2024 20:19:12 +0800 Subject: [PATCH 179/229] fix(nuxt): don't scan component dirs when `enabled` is `false` (#26906) --- packages/nuxt/src/components/scan.ts | 3 +++ packages/nuxt/test/scan-components.test.ts | 7 ++++++- packages/schema/src/types/components.ts | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/nuxt/src/components/scan.ts b/packages/nuxt/src/components/scan.ts index 4f21454e6a..dc3eb4f2a6 100644 --- a/packages/nuxt/src/components/scan.ts +++ b/packages/nuxt/src/components/scan.ts @@ -26,6 +26,9 @@ export async function scanComponents (dirs: ComponentsDir[], srcDir: string): Pr const scannedPaths: string[] = [] for (const dir of dirs) { + if (dir.enabled === false) { + continue + } // A map from resolved path to component name (used for making duplicate warning message) const resolvedNames = new Map() diff --git a/packages/nuxt/test/scan-components.test.ts b/packages/nuxt/test/scan-components.test.ts index 2fffdebcb5..a4e8f172da 100644 --- a/packages/nuxt/test/scan-components.test.ts +++ b/packages/nuxt/test/scan-components.test.ts @@ -86,7 +86,7 @@ const dirs: ComponentsDir[] = [ transpile: false, }, ] - +const dirUnable = dirs.map((d) => { return { ...d, enabled: false } }) const expectedComponents = [ { chunkName: 'components/isle-server', @@ -243,3 +243,8 @@ it('components:scanComponents', async () => { } expect(scannedComponents).deep.eq(expectedComponents) }) + +it('components:scanComponents:unable', async () => { + const scannedComponents = await scanComponents(dirUnable, srcDir) + expect(scannedComponents).deep.eq([]) +}) diff --git a/packages/schema/src/types/components.ts b/packages/schema/src/types/components.ts index d0a9507d04..9bea3a8cdc 100644 --- a/packages/schema/src/types/components.ts +++ b/packages/schema/src/types/components.ts @@ -53,7 +53,7 @@ export interface ScanDir { */ pathPrefix?: boolean /** - * Ignore scanning this directory if set to `true` + * Ignore scanning this directory if set to `false` */ enabled?: boolean /** From fdbfed1280839171b160f388f1977fb08d89a23d Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Tue, 23 Apr 2024 14:53:11 +0200 Subject: [PATCH 180/229] chore: fix small typos (#26907) --- docs/1.getting-started/11.testing.md | 2 +- docs/2.guide/1.concepts/9.code-style.md | 2 +- packages/nuxt/src/core/utils/names.ts | 2 +- packages/nuxt/test/treeshake-client.test.ts | 2 +- test/basic.test.ts | 2 +- .../basic-types/extends/node_modules/foo/layouts/override.vue | 2 +- .../basic-types/extends/node_modules/foo/middleware/override.ts | 2 +- .../basic-types/extends/node_modules/foo/pages/override.vue | 2 +- test/fixtures/basic/composables/keep-alive.ts | 2 +- test/fixtures/basic/composables/override-base.ts | 2 +- test/fixtures/basic/extends/bar/composables/base.ts | 2 +- .../extends/node_modules/foo/components/ExtendsOverride.vue | 2 +- .../basic/extends/node_modules/foo/layouts/override.vue | 2 +- test/fixtures/basic/extends/node_modules/foo/pages/override.vue | 2 +- test/fixtures/basic/pages/extends.vue | 2 +- test/fixtures/basic/pages/islands.vue | 2 +- test/fixtures/basic/pages/keepalive/keepalive-in-config.vue | 2 +- test/fixtures/basic/pages/keepalive/keepalive-in-nuxtpage-2.vue | 2 +- test/fixtures/basic/pages/keepalive/keepalive-in-nuxtpage.vue | 2 +- .../basic/pages/keepalive/not-keepalive-in-nuxtpage.vue | 2 +- test/fixtures/basic/pages/keepalive/not-keepalive.vue | 2 +- test/nuxt/nuxt-island.test.ts | 2 +- test/nuxt/plugin.test.ts | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/1.getting-started/11.testing.md b/docs/1.getting-started/11.testing.md index 8290dae5b2..f9eea6d0cd 100644 --- a/docs/1.getting-started/11.testing.md +++ b/docs/1.getting-started/11.testing.md @@ -60,7 +60,7 @@ We currently ship an environment for unit testing code that needs a [Nuxt](https ``` ::tip -When importing `@nuxt/test-utils` in your vitest config, It is necessary to have `"type": "module"` specified in your `package.json` or rename your vitest config file appropriatly. +When importing `@nuxt/test-utils` in your vitest config, It is necessary to have `"type": "module"` specified in your `package.json` or rename your vitest config file appropriately. > ie. `vitest.config.m{ts,js}`. :: diff --git a/docs/2.guide/1.concepts/9.code-style.md b/docs/2.guide/1.concepts/9.code-style.md index 8d9a918873..2a6a32afb3 100644 --- a/docs/2.guide/1.concepts/9.code-style.md +++ b/docs/2.guide/1.concepts/9.code-style.md @@ -10,7 +10,7 @@ The recommended approach for Nuxt is to enable ESLint support using the [`@nuxt/ :::callout{icon="i-ph-lightbulb-duotone"} The module is designed for the [new ESLint flat config format](https://eslint.org/docs/latest/use/configure/configuration-files-new) with is the [default format since ESLint v9](https://eslint.org/blog/2024/04/eslint-v9.0.0-released/). -If you are using the legacy `.eslintrc` config, you will need to [configure manually with `@nuxt/eslint-config`](https://eslint.nuxt.com/packages/config#legacy-config-format). We highly recommand you to migrate over the flat config to be future-proof. +If you are using the legacy `.eslintrc` config, you will need to [configure manually with `@nuxt/eslint-config`](https://eslint.nuxt.com/packages/config#legacy-config-format). We highly recommend you to migrate over the flat config to be future-proof. ::: ## Quick Setup diff --git a/packages/nuxt/src/core/utils/names.ts b/packages/nuxt/src/core/utils/names.ts index f37be12636..3397cc99e7 100644 --- a/packages/nuxt/src/core/utils/names.ts +++ b/packages/nuxt/src/core/utils/names.ts @@ -18,7 +18,7 @@ export function hasSuffix (path: string, suffix: string) { export function resolveComponentNameSegments (fileName: string, prefixParts: string[]) { /** - * Array of fileName parts splitted by case, / or - + * Array of fileName parts split by case, / or - * @example third-component -> ['third', 'component'] * @example AwesomeComponent -> ['Awesome', 'Component'] */ diff --git a/packages/nuxt/test/treeshake-client.test.ts b/packages/nuxt/test/treeshake-client.test.ts index c265c9d85e..9306bec381 100644 --- a/packages/nuxt/test/treeshake-client.test.ts +++ b/packages/nuxt/test/treeshake-client.test.ts @@ -146,7 +146,7 @@ describe('treeshake client only in ssr', () => { expect(treeshaken).toContain('const { ButShouldNotBeTreeShaken } = defineAsyncComponent(async () => {') expect(treeshaken).toContain('const [ { Dont, }, That] = defineAsyncComponent(async () => {') - // treeshake object that has an assignement pattern + // treeshake object that has an assignment pattern expect(treeshaken).toContain('const { woooooo, } = defineAsyncComponent(async () => {') expect(treeshaken).not.toContain('const { Deep, assignment: { Pattern = ofComponent } } = defineAsyncComponent(async () => {') diff --git a/test/basic.test.ts b/test/basic.test.ts index 13102e7cf0..975ffd3a80 100644 --- a/test/basic.test.ts +++ b/test/basic.test.ts @@ -446,7 +446,7 @@ describe('pages', () => { expect(html).not.toContain('

') expect(html).toContain('hi') - // aysnc setup + // async setup expect(html).toContain('Work with async setup') const { page, pageErrors } = await renderPage('/client-fallback') diff --git a/test/fixtures/basic-types/extends/node_modules/foo/layouts/override.vue b/test/fixtures/basic-types/extends/node_modules/foo/layouts/override.vue index b10cfadd9a..64753c4e0a 100644 --- a/test/fixtures/basic-types/extends/node_modules/foo/layouts/override.vue +++ b/test/fixtures/basic-types/extends/node_modules/foo/layouts/override.vue @@ -1,3 +1,3 @@ diff --git a/test/fixtures/basic-types/extends/node_modules/foo/middleware/override.ts b/test/fixtures/basic-types/extends/node_modules/foo/middleware/override.ts index fbbfd73091..eca4b646c3 100644 --- a/test/fixtures/basic-types/extends/node_modules/foo/middleware/override.ts +++ b/test/fixtures/basic-types/extends/node_modules/foo/middleware/override.ts @@ -1,3 +1,3 @@ export default defineNuxtRouteMiddleware((to) => { - to.meta.override = 'This middleware should be overriden by bar' + to.meta.override = 'This middleware should be overridden by bar' }) diff --git a/test/fixtures/basic-types/extends/node_modules/foo/pages/override.vue b/test/fixtures/basic-types/extends/node_modules/foo/pages/override.vue index 81a97ed0f2..28d1b37d1c 100644 --- a/test/fixtures/basic-types/extends/node_modules/foo/pages/override.vue +++ b/test/fixtures/basic-types/extends/node_modules/foo/pages/override.vue @@ -1,3 +1,3 @@ diff --git a/test/fixtures/basic/composables/keep-alive.ts b/test/fixtures/basic/composables/keep-alive.ts index bee308628e..90999b752f 100644 --- a/test/fixtures/basic/composables/keep-alive.ts +++ b/test/fixtures/basic/composables/keep-alive.ts @@ -1,4 +1,4 @@ -export function useLifecyleLogs (name: string) { +export function useLifecycleLogs (name: string) { onMounted(() => console.log(`${name}: onMounted`)) onUnmounted(() => console.log(`${name}: onUnmounted`)) onActivated(() => console.log(`${name}: onActivated`)) diff --git a/test/fixtures/basic/composables/override-base.ts b/test/fixtures/basic/composables/override-base.ts index 43f65fec99..2f8570e089 100644 --- a/test/fixtures/basic/composables/override-base.ts +++ b/test/fixtures/basic/composables/override-base.ts @@ -1 +1 @@ -export const useOverrideableComposable = () => 'test from project' +export const useOverridableComposable = () => 'test from project' diff --git a/test/fixtures/basic/extends/bar/composables/base.ts b/test/fixtures/basic/extends/bar/composables/base.ts index 21e0ca6805..b363f9d807 100644 --- a/test/fixtures/basic/extends/bar/composables/base.ts +++ b/test/fixtures/basic/extends/bar/composables/base.ts @@ -1 +1 @@ -export const useOverrideableComposable = () => 'test from layer' +export const useOverridableComposable = () => 'test from layer' diff --git a/test/fixtures/basic/extends/node_modules/foo/components/ExtendsOverride.vue b/test/fixtures/basic/extends/node_modules/foo/components/ExtendsOverride.vue index 5e94aa248f..70a57d916a 100644 --- a/test/fixtures/basic/extends/node_modules/foo/components/ExtendsOverride.vue +++ b/test/fixtures/basic/extends/node_modules/foo/components/ExtendsOverride.vue @@ -1,3 +1,3 @@ diff --git a/test/fixtures/basic/extends/node_modules/foo/layouts/override.vue b/test/fixtures/basic/extends/node_modules/foo/layouts/override.vue index b10cfadd9a..64753c4e0a 100644 --- a/test/fixtures/basic/extends/node_modules/foo/layouts/override.vue +++ b/test/fixtures/basic/extends/node_modules/foo/layouts/override.vue @@ -1,3 +1,3 @@ diff --git a/test/fixtures/basic/extends/node_modules/foo/pages/override.vue b/test/fixtures/basic/extends/node_modules/foo/pages/override.vue index 5d47effd7f..3bb95b220e 100644 --- a/test/fixtures/basic/extends/node_modules/foo/pages/override.vue +++ b/test/fixtures/basic/extends/node_modules/foo/pages/override.vue @@ -1,5 +1,5 @@