Skip to content

Commit 26663b9

Browse files
committed
chore: qwikRouterConfig is no longer needed
it is imported internally but can still be overridden should someone be doing that
1 parent bc6b37d commit 26663b9

File tree

61 files changed

+108
-172
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+108
-172
lines changed

.changeset/green-drinks-strive.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@qwik.dev/router': minor
3+
---
4+
5+
FEAT: qwikRouter middleware no longer needs qwikRouterConfig, it handles it internally

e2e/adapters-e2e/adapters/express/vite.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export default extendConfig(baseConfig, () => {
77
build: {
88
ssr: true,
99
rollupOptions: {
10-
input: ['src/entry.express.tsx', '@qwik-router-config'],
10+
input: ['src/entry.express.tsx'],
1111
},
1212
},
1313
plugins: [nodeServerAdapter({ name: 'express' })],

e2e/adapters-e2e/src/entry.express.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
*/
1010
import { createQwikRouter } from '@qwik.dev/router/middleware/node';
1111
import 'dotenv/config';
12-
import qwikRouterConfig from '@qwik-router-config';
1312
import render from './entry.ssr';
1413
import express from 'express';
1514
import { fileURLToPath } from 'node:url';
@@ -25,7 +24,6 @@ const PORT = process.env.PORT ?? 3000;
2524
// Create the Qwik City Node middleware
2625
const { router, notFound } = createQwikRouter({
2726
render,
28-
qwikRouterConfig,
2927
// getOrigin(req) {
3028
// // If deploying under a proxy, you may need to build the origin from the request headers
3129
// // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-Proto

e2e/adapters-e2e/src/entry.preview.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@
1111
*
1212
*/
1313
import { createQwikRouter } from '@qwik.dev/router/middleware/node';
14-
import qwikRouterConfig from '@qwik-router-config';
1514
// make sure qwikCityPlan is imported before entry
1615
import render from './entry.ssr';
1716

1817
/** The default export is the QwikCity adapter used by Vite preview. */
19-
export default createQwikRouter({ render, qwikRouterConfig });
18+
export default createQwikRouter({ render });

packages/docs/adapters/cloudflare-pages/vite.config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export default extendConfig(baseConfig, () => {
77
build: {
88
ssr: true,
99
rollupOptions: {
10-
input: ['src/entry.cloudflare-pages.tsx', '@qwik-router-config'],
10+
input: ['src/entry.cloudflare-pages.tsx'],
1111
},
1212
minify: false,
1313
},
@@ -18,7 +18,7 @@ export default extendConfig(baseConfig, () => {
1818
exclude: ['/demo/*', '/shop/*'],
1919
origin:
2020
(process.env.CF_PAGES_BRANCH !== 'main' ? process.env.CF_PAGES_URL : null) ??
21-
'https://qwik.builder.io',
21+
'https://qwik.dev',
2222
},
2323
}),
2424
],
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import qwikRouterConfig from '@qwik-router-config';
21
import { createQwikRouter } from '@qwik.dev/router/middleware/cloudflare-pages';
32
import render from './entry.ssr';
43

5-
const fetch = createQwikRouter({ render, qwikRouterConfig });
4+
const fetch = createQwikRouter({ render });
65

76
export { fetch };

packages/docs/src/entry.preview.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import qwikRouterConfig from '@qwik-router-config';
21
import { createQwikRouter } from '@qwik.dev/router/middleware/node';
32
import render from './entry.ssr';
43

54
/** The default export is the QwikRouter adapter used by Vite preview. */
6-
export default createQwikRouter({ render, qwikRouterConfig });
5+
export default createQwikRouter({ render });

packages/docs/src/routes/docs/deployments/cloudflare-pages/index.mdx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,11 @@ export default extendConfig(baseConfig, () => {
152152
build: {
153153
ssr: true,
154154
rollupOptions: {
155-
input: ['src/entry.cloudflare-pages.tsx', '@qwik-router-config'],
155+
input: [
156+
'src/entry.cloudflare-pages.tsx',
157+
// This ensures that the SSG can read the routes from the config
158+
'@qwik-router-config',
159+
],
156160
}
157161
},
158162
plugins: [
@@ -204,10 +208,9 @@ import {
204208
createQwikRouter,
205209
type PlatformCloudflarePages,
206210
} from '@qwik.dev/router/middleware/cloudflare-pages';
207-
import qwikRouterConfig from '@qwik-router-config';
208211
import render from './entry.ssr';
209212

210-
const fetch = createQwikRouter({ render, qwikRouterConfig });
213+
const fetch = createQwikRouter({ render });
211214

212215
export { fetch };
213216
```

packages/docs/src/routes/docs/deployments/netlify-edge/index.mdx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,9 @@ When the `netlify-edge` adapter is added, a new entry file will be created at `s
130130

131131
```tsx title="src/entry.netlify-edge.tsx"
132132
import { createQwikRouter } from '@qwik.dev/router/middleware/netlify-edge';
133-
import qwikRouterConfig from '@qwik-router-config';
134133
import render from './entry.ssr';
135134

136-
export default createQwikRouter({ render, qwikRouterConfig });
135+
export default createQwikRouter({ render });
137136
```
138137

139138
The compiled middleware will be built in the `.netlify/edge-functions` directory.

packages/docs/src/routes/docs/deployments/node/index.mdx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,6 @@ If you want to disable CSRF protection, you can set `checkOrigin: false` in the
164164
// ...
165165
const { router, notFound, staticFile } = createQwikRouter({
166166
render,
167-
qwikRouterConfig,
168-
manifest,
169167
checkOrigin: false,
170168
});
171169
// ...

0 commit comments

Comments
 (0)