Skip to content

Commit

Permalink
chore: merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
patak-dev committed Oct 28, 2024
2 parents bf9c352 + 2ec12df commit 5559465
Show file tree
Hide file tree
Showing 52 changed files with 1,443 additions and 1,222 deletions.
44 changes: 44 additions & 0 deletions .github/workflows/preview-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Preview release

env:
# install playwright binary manually (because pnpm only runs install script once)
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: "1"

permissions:
pull-requests: write

on:
push:
branches:
- main
pull_request:
types: [labeled]

jobs:
preview:
if: >
github.repository == 'vitejs/vite' &&
(github.event_name == 'push' ||
(github.event.issue.pull_request && contains(github.event.pull_request.labels.*.name, 'trigger: preview')))
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Install pnpm
uses: pnpm/action-setup@v4.0.0

- name: Install dependencies
run: pnpm install

- name: Build
working-directory: ./packages/vite
run: pnpm build

- run: pnpm dlx pkg-pr-new@0.0 publish --compact --pnpm ./packages/vite

- if: github.event_name != 'push'
run: |
gh issue edit ${{ github.event.issue.number }} --remove-label "trigger: preview" --repo ${{ github.repository }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
71 changes: 0 additions & 71 deletions .github/workflows/publish-commit.yml

This file was deleted.

1 change: 0 additions & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
hoist-pattern[]=ts-node # package/vite: postcss-load-config
hoist-pattern[]=postcss # package/vite
hoist-pattern[]=pug # playground/tailwind: @vue/compiler-sfc
shell-emulator=true
Expand Down
8 changes: 4 additions & 4 deletions docs/guide/backend-integration.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@ If you need a custom integration, you can follow the steps in this guide to conf

```json [.vite/manifest.json]
{
"_shared-!~{003}~.js": {
"file": "assets/shared-ChJ_j-JJ.css",
"src": "_shared-!~{003}~.js"
},
"_shared-B7PI925R.js": {
"file": "assets/shared-B7PI925R.js",
"name": "shared",
"css": ["assets/shared-ChJ_j-JJ.css"]
},
"_shared-ChJ_j-JJ.css": {
"file": "assets/shared-ChJ_j-JJ.css",
"src": "_shared-ChJ_j-JJ.css"
},
"baz.js": {
"file": "assets/baz-B2H3sXNv.js",
"name": "baz",
Expand Down
4 changes: 4 additions & 0 deletions docs/guide/migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ From Vite 6, even when `json.stringify: true` is set, `json.namedExports` is not

Vite 6 also introduces a new default value for `json.stringify` which is `'auto'`, which will only stringify large JSON files. To disable this behavior, set `json.stringify: false`.

### postcss-load-config

[`postcss-load-config`](https://npmjs.com/package/postcss-load-config) has been updated to v6 from v4. [`tsx`](https://www.npmjs.com/package/tsx) or [`jiti`](https://www.npmjs.com/package/jiti) is now required to load TypeScript postcss config files instead of [`ts-node`](https://www.npmjs.com/package/ts-node). Also [`yaml`](https://www.npmjs.com/package/yaml) is now required to load YAML postcss config files.

### Sass now uses modern API by default

In Vite 5, the legacy API was used by default for Sass. Vite 5.4 added support for the modern API.
Expand Down
2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"docs-serve": "vitepress serve"
},
"devDependencies": {
"@shikijs/vitepress-twoslash": "^1.22.0",
"@shikijs/vitepress-twoslash": "^1.22.1",
"@types/express": "^4.17.21",
"feed": "^4.2.2",
"vitepress": "1.4.1",
Expand Down
11 changes: 9 additions & 2 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,15 @@ export default tseslint.config(
'n/no-extraneous-import': [
'error',
{
allowModules: ['vite', 'less', 'sass', 'vitest', 'unbuild'],
allowModules: [
'vite',
'less',
'sass',
'sass-embedded',
'lightningcss',
'vitest',
'unbuild',
],
},
],
'n/no-extraneous-require': [
Expand Down Expand Up @@ -196,7 +204,6 @@ export default tseslint.config(
'playground/**/*dep*/**',
'playground/resolve/browser-module-field2/index.web.js',
'playground/resolve/browser-field/**',
'playground/tailwind/**', // blocked by https://github.com/postcss/postcss-load-config/issues/239
],
rules: {
'import-x/no-commonjs': 'error',
Expand Down
26 changes: 19 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"@types/etag": "^1.8.3",
"@types/less": "^3.0.6",
"@types/micromatch": "^4.0.9",
"@types/node": "^20.16.13",
"@types/node": "^20.17.1",
"@types/picomatch": "^3.0.1",
"@types/stylus": "^0.48.43",
"@types/ws": "^8.5.12",
Expand All @@ -61,21 +61,21 @@
"eslint-plugin-import-x": "^4.3.1",
"eslint-plugin-n": "^17.11.1",
"eslint-plugin-regexp": "^2.6.0",
"execa": "^9.4.1",
"execa": "^9.5.0",
"globals": "^15.11.0",
"gsap": "^3.12.5",
"lint-staged": "^15.2.10",
"picocolors": "^1.1.1",
"playwright-chromium": "^1.48.1",
"playwright-chromium": "^1.48.2",
"prettier": "3.3.3",
"rimraf": "^5.0.10",
"rollup": "^4.23.0",
"rollup-plugin-esbuild": "^6.1.1",
"simple-git-hooks": "^2.11.1",
"tslib": "^2.8.0",
"tsx": "^4.19.1",
"tsx": "^4.19.2",
"typescript": "~5.6.2",
"typescript-eslint": "^8.10.0",
"typescript-eslint": "^8.11.0",
"vite": "workspace:*",
"vitest": "^2.1.3"
},
Expand All @@ -96,7 +96,7 @@
"eslint --cache --fix"
]
},
"packageManager": "pnpm@9.12.2",
"packageManager": "pnpm@9.12.3",
"pnpm": {
"overrides": {
"vite": "workspace:*"
Expand All @@ -105,7 +105,7 @@
"chokidar@3.6.0": "patches/chokidar@3.6.0.patch",
"http-proxy@1.18.1": "patches/http-proxy@1.18.1.patch",
"sirv@3.0.0": "patches/sirv@3.0.0.patch",
"acorn@8.13.0": "patches/acorn@8.13.0.patch"
"acorn@8.14.0": "patches/acorn@8.14.0.patch"
},
"peerDependencyRules": {
"allowedVersions": {
Expand All @@ -116,6 +116,18 @@
"postcss",
"search-insights"
]
},
"packageExtensions": {
"sass-embedded": {
"peerDependencies": {
"source-map-js": "*"
},
"peerDependenciesMeta": {
"source-map-js": {
"optional": true
}
}
}
}
},
"stackblitz": {
Expand Down
2 changes: 1 addition & 1 deletion packages/create-vite/template-lit-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
},
"devDependencies": {
"typescript": "~5.6.2",
"vite": "^5.4.9"
"vite": "^5.4.10"
}
}
2 changes: 1 addition & 1 deletion packages/create-vite/template-lit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"lit": "^3.2.1"
},
"devDependencies": {
"vite": "^5.4.9"
"vite": "^5.4.10"
}
}
2 changes: 1 addition & 1 deletion packages/create-vite/template-preact-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
"devDependencies": {
"@preact/preset-vite": "^2.9.1",
"typescript": "~5.6.2",
"vite": "^5.4.9"
"vite": "^5.4.10"
}
}
2 changes: 1 addition & 1 deletion packages/create-vite/template-preact/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
},
"devDependencies": {
"@preact/preset-vite": "^2.9.1",
"vite": "^5.4.9"
"vite": "^5.4.10"
}
}
2 changes: 1 addition & 1 deletion packages/create-vite/template-qwik-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"devDependencies": {
"serve": "^14.2.4",
"typescript": "~5.6.2",
"vite": "^5.4.9"
"vite": "^5.4.10"
},
"dependencies": {
"@builder.io/qwik": "^1.9.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/create-vite/template-qwik/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"devDependencies": {
"serve": "^14.2.4",
"vite": "^5.4.9"
"vite": "^5.4.10"
},
"dependencies": {
"@builder.io/qwik": "^1.9.1"
Expand Down
8 changes: 4 additions & 4 deletions packages/create-vite/template-react-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
},
"devDependencies": {
"@eslint/js": "^9.13.0",
"@types/react": "^18.3.11",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@vitejs/plugin-react": "^4.3.3",
"eslint": "^9.13.0",
"eslint-plugin-react-hooks": "^5.0.0",
"eslint-plugin-react-refresh": "^0.4.13",
"eslint-plugin-react-refresh": "^0.4.14",
"globals": "^15.11.0",
"typescript": "~5.6.2",
"typescript-eslint": "^8.10.0",
"vite": "^5.4.9"
"typescript-eslint": "^8.11.0",
"vite": "^5.4.10"
}
}
8 changes: 4 additions & 4 deletions packages/create-vite/template-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
},
"devDependencies": {
"@eslint/js": "^9.13.0",
"@types/react": "^18.3.11",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@vitejs/plugin-react": "^4.3.3",
"eslint": "^9.13.0",
"eslint-plugin-react": "^7.37.1",
"eslint-plugin-react": "^7.37.2",
"eslint-plugin-react-hooks": "^5.0.0",
"eslint-plugin-react-refresh": "^0.4.13",
"eslint-plugin-react-refresh": "^0.4.14",
"globals": "^15.11.0",
"vite": "^5.4.9"
"vite": "^5.4.10"
}
}
4 changes: 2 additions & 2 deletions packages/create-vite/template-solid-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
"preview": "vite preview"
},
"dependencies": {
"solid-js": "^1.9.2"
"solid-js": "^1.9.3"
},
"devDependencies": {
"typescript": "~5.6.2",
"vite": "^5.4.9",
"vite": "^5.4.10",
"vite-plugin-solid": "^2.10.2"
}
}
4 changes: 2 additions & 2 deletions packages/create-vite/template-solid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"preview": "vite preview"
},
"dependencies": {
"solid-js": "^1.9.2"
"solid-js": "^1.9.3"
},
"devDependencies": {
"vite": "^5.4.9",
"vite": "^5.4.10",
"vite-plugin-solid": "^2.10.2"
}
}
4 changes: 2 additions & 2 deletions packages/create-vite/template-svelte-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "^4.0.0",
"@tsconfig/svelte": "^5.0.4",
"svelte": "^5.0.3",
"svelte": "^5.1.3",
"svelte-check": "^4.0.5",
"tslib": "^2.8.0",
"typescript": "~5.6.2",
"vite": "^5.4.9"
"vite": "^5.4.10"
}
}
4 changes: 2 additions & 2 deletions packages/create-vite/template-svelte/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "^4.0.0",
"svelte": "^5.0.3",
"vite": "^5.4.9"
"svelte": "^5.1.3",
"vite": "^5.4.10"
}
}
Loading

0 comments on commit 5559465

Please sign in to comment.