Skip to content

Commit f228cc4

Browse files
authored
chore: remove manual chunking and rollup patch (#1137)
* chore: remove manual chunking and rollup patch * fix: vite 7 and node 18 not compatible
1 parent d74de4d commit f228cc4

File tree

12 files changed

+3635
-2567
lines changed

12 files changed

+3635
-2567
lines changed

.github/actions/setup/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ inputs:
66
node_version:
77
description: Node Version
88
required: false
9-
default: '18'
9+
default: '20'
1010

1111
runs:
1212
using: composite

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
strategy:
1313
matrix:
14-
node_version: [18, 20, 22]
14+
node_version: [20, 22]
1515

1616
steps:
1717
- uses: actions/checkout@v3

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
strategy:
1515
matrix:
16-
node_version: [18, 20, 22]
16+
node_version: [20, 22]
1717

1818
steps:
1919
- name: Cancel Previous Runs

apps/website/src/root.tsx

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,6 @@ export default component$(() => {
3737

3838
useContextProvider(APP_STATE_CONTEXT_ID, appState);
3939

40-
const unregisterPrefetchServiceWorkers = `
41-
;(function () {
42-
navigator.serviceWorker?.getRegistrations().then((regs) => {
43-
for (const reg of regs) {
44-
if (
45-
reg.active?.scriptURL.includes('service-worker.js') ||
46-
reg.active?.scriptURL.includes('qwik-prefetch-service-worker.js')
47-
) {
48-
reg.unregister();
49-
}
50-
}
51-
});
52-
})();
53-
`;
54-
5540
return (
5641
<QwikCityProvider>
5742
<head>
@@ -60,7 +45,6 @@ export default component$(() => {
6045
<RouterHead />
6146
</head>
6247
<body lang="en">
63-
<script dangerouslySetInnerHTML={unregisterPrefetchServiceWorkers} />
6448
<ThemeProvider
6549
attribute="class"
6650
enableSystem={false}

apps/website/src/routes/service-worker.ts

Lines changed: 0 additions & 18 deletions
This file was deleted.

apps/website/vite.config.ts

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -59,21 +59,6 @@ export default defineConfig(async () => {
5959
},
6060
build: {
6161
target: 'es2022',
62-
rollupOptions: {
63-
output: {
64-
manualChunks: (id: string) => {
65-
if (id.includes('node_modules') && id.includes('css-tree')) {
66-
return 'css-tree';
67-
}
68-
if (
69-
id.includes('node_modules') &&
70-
(id.includes('tailwind-merge') || id.includes('clsx'))
71-
) {
72-
return 'cn';
73-
}
74-
},
75-
},
76-
},
7762
},
7863
preview: {
7964
headers: {

package.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@
117117
"prettier-plugin-tailwindcss": "^0.6.13",
118118
"pretty-quick": "^4.0.0",
119119
"qwik-nx": "^3.2.0",
120-
"rollup": "4.50.0",
121120
"sass": "^1.77.2",
122121
"shiki": "^3.4.2",
123122
"simple-git-hooks": "2.11.1",
@@ -131,14 +130,13 @@
131130
"tslib": "^2.6.2",
132131
"tw-animate-css": "1.3.4",
133132
"typescript": "5.7.3",
134-
"undici": "5.28.4",
133+
"undici": "*",
135134
"unified": "^11.0.4",
136135
"verdaccio": "6.1.2",
137-
"vite": "6.3.5",
136+
"vite": "7.1.7",
138137
"vite-plugin-dts": "4.5.4",
139138
"vite-plugin-eslint": "^1.8.1",
140-
"vite-plugin-inspect": "^0.8.4",
141-
"vite-plugin-static-copy": "1.0.4",
139+
"vite-plugin-inspect": "11.3.3",
142140
"vite-tsconfig-paths": "4.3.2",
143141
"vitest": "^1.6.0",
144142
"wrangler": "^3.57.1",

packages/kit-headless/vite.config.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { dirname, join } from 'path';
44
import { fileURLToPath } from 'url';
55
import { defineConfig } from 'vite';
66
import dts from 'vite-plugin-dts';
7-
import { viteStaticCopy } from 'vite-plugin-static-copy';
87
import tsconfigPaths from 'vite-tsconfig-paths';
98
import pkg from './package.json';
109

@@ -33,9 +32,6 @@ export default defineConfig({
3332
return;
3433
},
3534
}),
36-
viteStaticCopy({
37-
targets: [{ src: './README.md', dest: './' }],
38-
}),
3935
],
4036
server: {
4137
fs: {

packages/utils/vite.config.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { defineConfig } from 'vite';
33
import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
44
import * as path from 'path';
55
import dts from 'vite-plugin-dts';
6-
import { viteStaticCopy } from 'vite-plugin-static-copy';
76
import viteTsConfigPaths from 'vite-tsconfig-paths';
87
import pkg from './package.json';
98

@@ -31,9 +30,6 @@ export default defineConfig({
3130
viteTsConfigPaths({
3231
root: '../../',
3332
}),
34-
viteStaticCopy({
35-
targets: [{ src: './README.md', dest: './' }],
36-
}),
3733
nxViteTsPaths(),
3834
],
3935

patches/rollup.patch

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)