Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
87738a8
chore(vite): move index.html from web/src to web
lisa-assistant May 17, 2026
40cebd8
fix(vite): set root to web/ in getMergedConfig
lisa-assistant May 17, 2026
eb7ff94
fix(vite): set root to web/ and normalize Windows paths
lisa-assistant May 17, 2026
dee1597
fix(create-cedar-app): fix index.html position in template snapshots
lisa-assistant May 17, 2026
d477d6b
Merge branch 'cedarjs:main' into lisa/move-index-html-to-web-root
lisa-assistant May 18, 2026
ec2892e
fix experimental setup template files
Tobbe May 18, 2026
7570168
adjust for web/src vs /src
Tobbe May 18, 2026
da6aafa
remove stale code and TODO
Tobbe May 18, 2026
11d0a13
fix pre-transform error for entry script src
Tobbe May 18, 2026
dc19296
fix index transform
Tobbe May 18, 2026
c7e4da1
respect user config
Tobbe May 18, 2026
7e6eb85
align vite config with web/ root default
Tobbe May 18, 2026
450a5d2
Restore root: cedarProjectPaths.web.src in storybook preset viteFinal
lisa-assistant May 18, 2026
81d3ca1
fix(vite): only inject entry script into Cedar's own index.html
lisa-assistant May 18, 2026
8b319dd
revert: remove root: web/src override from storybook preset
lisa-assistant May 18, 2026
a194a6e
fix(storybook): filter cedar-entry-injection from Storybook's Vite co…
lisa-assistant May 18, 2026
cf0ce55
chore: fix prettier formatting in preset.ts
lisa-assistant May 19, 2026
247d035
chore: fix prettier formatting (mergeConfig args)
lisa-assistant May 19, 2026
dd2be92
fix(storybook): restore root: web/src to fix routes dep scan
lisa-assistant May 19, 2026
338f447
fix(storybook): replace require() with static ESM import in MockProvi…
lisa-assistant May 19, 2026
e82e528
fix(storybook): remove root override from viteFinal
lisa-assistant May 19, 2026
da03110
fix(storybook): exclude storybook-framework-cedarjs from dep pre-bund…
lisa-assistant May 19, 2026
499a5ae
fix(storybook): move React import inside declare module block
lisa-assistant May 20, 2026
9eb23c2
Merge branch 'main' into lisa/move-index-html-to-web-root
Tobbe May 21, 2026
50eff1f
fix(storybook): force pre-bundle apollo CJS files excluded via storyb…
lisa-assistant May 21, 2026
8d63368
correct aliases
Tobbe May 21, 2026
d31068e
restore comment
Tobbe May 21, 2026
112a613
fix(storybook): alias apollo .cjs sub-paths to ESM equivalents in vit…
lisa-assistant May 21, 2026
079a361
fix(storybook): alias graphql/language/printer.js to graphql package …
lisa-assistant May 21, 2026
26c119e
fix(storybook): include rehackt in optimizeDeps to force pre-bundling
lisa-assistant May 21, 2026
699b202
fix(storybook): also define ~__REDWOOD__ aliases for backward compat
lisa-assistant May 21, 2026
bac6832
fix(storybook): remove ~__REDWOOD__ backward compat aliases from preset
lisa-assistant May 21, 2026
a2039fb
fix(storybook): exclude @cedarjs/web from Vite dep pre-bundling
Tobbe May 21, 2026
f921643
Revert "fix(storybook): exclude @cedarjs/web from Vite dep pre-bundling"
Tobbe May 21, 2026
02c3023
fix(storybook): pre-bundle react-hook-form and @cedarjs/forms
Tobbe May 21, 2026
b4ea2e1
fix(storybook): exclude @cedarjs/web from pre-bundling to fix context…
Tobbe May 22, 2026
7c61de9
Revert "fix(storybook): exclude @cedarjs/web from pre-bundling to fix…
Tobbe May 22, 2026
5f5f8d5
fix(storybook): eagerly pre-bundle Apollo and Cedar deps to prevent m…
Tobbe May 22, 2026
53d9aaa
Add esbuild dep scan plugin
Tobbe May 22, 2026
34067e0
chore(ci): Fix flaky cca tests
Tobbe May 22, 2026
b481ffc
Update esbuild plugin
Tobbe May 22, 2026
93ffb94
more cca flakyness fixes
Tobbe May 22, 2026
8067e7a
update plugin
Tobbe May 22, 2026
b732b70
use correct loader in plugin
Tobbe May 22, 2026
193379e
Merge branch 'main' into lisa/move-index-html-to-web-root
Tobbe May 22, 2026
97ef70b
fix(storybook): pre-bundle Apollo .cjs sub-paths to prevent mid-sessi…
Tobbe May 22, 2026
429acee
fix(storybook): pre-bundle polyfill shims and testing deps to prevent…
Tobbe May 22, 2026
dc4d18b
fix(storybook): pre-bundle @cedarjs/web to prevent duplicate GraphQLH…
Tobbe May 22, 2026
cb77eea
fix(storybook): stub Cell files completely in dep scan to prevent Gra…
Tobbe May 22, 2026
89f6ce0
fix(storybook): synthesize named-export stubs in cell-stub dep scan p…
Tobbe May 22, 2026
e492f1f
Explain +4 offset
Tobbe May 22, 2026
223e4b4
Merge branch 'main' into lisa/move-index-html-to-web-root
Tobbe May 22, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion __fixtures__/rsc-caching/web/src/entry.client.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const redwoodAppElement = document.getElementById('redwood-app')
if (!redwoodAppElement) {
throw new Error(
"Could not find an element with ID 'redwood-app'. Please ensure it " +
"exists in your 'web/src/index.html' file."
"exists in your 'web/index.html' file."
)
}

Expand Down
2 changes: 1 addition & 1 deletion __fixtures__/test-project-esm/web/src/entry.client.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const redwoodAppElement = document.getElementById('redwood-app')
if (!redwoodAppElement) {
throw new Error(
"Could not find an element with ID 'redwood-app'. Please ensure it " +
"exists in your 'web/src/index.html' file."
"exists in your 'web/index.html' file."
)
}

Expand Down
2 changes: 1 addition & 1 deletion __fixtures__/test-project-live/web/src/entry.client.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const redwoodAppElement = document.getElementById('redwood-app')
if (!redwoodAppElement) {
throw new Error(
"Could not find an element with ID 'redwood-app'. Please ensure it " +
"exists in your 'web/src/index.html' file."
"exists in your 'web/index.html' file."
)
}

Expand Down
2 changes: 1 addition & 1 deletion __fixtures__/test-project-rsa/web/src/entry.client.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const redwoodAppElement = document.getElementById('redwood-app')
if (!redwoodAppElement) {
throw new Error(
"Could not find an element with ID 'redwood-app'. Please ensure it " +
"exists in your 'web/src/index.html' file."
"exists in your 'web/index.html' file."
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const redwoodAppElement = document.getElementById('redwood-app')
if (!redwoodAppElement) {
throw new Error(
"Could not find an element with ID 'redwood-app'. Please ensure it " +
"exists in your 'web/src/index.html' file."
"exists in your 'web/index.html' file."
)
}

Expand Down
2 changes: 1 addition & 1 deletion __fixtures__/test-project/web/src/entry.client.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const redwoodAppElement = document.getElementById('redwood-app')
if (!redwoodAppElement) {
throw new Error(
"Could not find an element with ID 'redwood-app'. Please ensure it " +
"exists in your 'web/src/index.html' file."
"exists in your 'web/index.html' file."
)
}

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/deploy/baremetal.md
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ curl http://localhost:8910
wget http://localhost:8910
```

If you don't see the content of your `web/src/index.html` file then something isn't working. You'll need to fix those issues before you can deploy. Verify the api side is responding:
If you don't see the content of your `web/index.html` file then something isn't working. You'll need to fix those issues before you can deploy. Verify the api side is responding:

```bash
curl http://localhost:8910/.api/functions/graphql?query={redwood{version}}
Expand Down
2 changes: 1 addition & 1 deletion local-testing-project-live/web/src/entry.client.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const redwoodAppElement = document.getElementById('redwood-app')
if (!redwoodAppElement) {
throw new Error(
"Could not find an element with ID 'redwood-app'. Please ensure it " +
"exists in your 'web/src/index.html' file."
"exists in your 'web/index.html' file."
)
}

Expand Down
2 changes: 1 addition & 1 deletion local-testing-project/web/src/entry.client.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const redwoodAppElement = document.getElementById('redwood-app')
if (!redwoodAppElement) {
throw new Error(
"Could not find an element with ID 'redwood-app'. Please ensure it " +
"exists in your 'web/src/index.html' file."
"exists in your 'web/index.html' file."
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const redwoodAppElement = document.getElementById('redwood-app')
if (!redwoodAppElement) {
throw new Error(
"Could not find an element with ID 'redwood-app'. Please ensure it " +
"exists in your 'web/src/index.html' file."
"exists in your 'web/index.html' file."
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const redwoodAppElement = document.getElementById('redwood-app')
if (!redwoodAppElement) {
throw new Error(
"Could not find an element with ID 'redwood-app'. Please ensure it " +
"exists in your 'web/src/index.html' file."
"exists in your 'web/index.html' file."
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const redwoodAppElement = document.getElementById('redwood-app')
if (!redwoodAppElement) {
throw new Error(
"Could not find an element with ID 'redwood-app'. Please ensure it " +
"exists in your 'web/src/index.html' file."
"exists in your 'web/index.html' file."
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const redwoodAppElement = document.getElementById('redwood-app')
if (!redwoodAppElement) {
throw new Error(
"Could not find an element with ID 'redwood-app'. Please ensure it " +
"exists in your 'web/src/index.html' file."
"exists in your 'web/index.html' file."
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const redwoodAppElement = document.getElementById('redwood-app')
if (!redwoodAppElement) {
throw new Error(
"Could not find an element with ID 'redwood-app'. Please ensure it " +
"exists in your 'web/src/index.html' file."
"exists in your 'web/index.html' file."
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const redwoodAppElement = document.getElementById('redwood-app')
if (!redwoodAppElement) {
throw new Error(
"Could not find an element with ID 'redwood-app'. Please ensure it " +
"exists in your 'web/src/index.html' file."
"exists in your 'web/index.html' file."
)
}

Expand Down
8 changes: 4 additions & 4 deletions packages/create-cedar-app/tests/templates.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ test('files should not have changed unintentionally in TS template', () => {
"/scripts/seed.ts",
"/scripts/tsconfig.json",
"/web",
"/web/index.html",
"/web/jest.config.js",
"/web/package.json",
"/web/public",
Expand All @@ -72,7 +73,6 @@ test('files should not have changed unintentionally in TS template', () => {
"/web/src/components/.keep",
"/web/src/entry.client.tsx",
"/web/src/index.css",
"/web/src/index.html",
"/web/src/layouts",
"/web/src/layouts/.keep",
"/web/src/pages",
Expand Down Expand Up @@ -136,6 +136,7 @@ test('files should not have changed unintentionally in JS template', () => {
"/scripts/jsconfig.json",
"/scripts/seed.js",
"/web",
"/web/index.html",
"/web/jest.config.js",
"/web/jsconfig.json",
"/web/package.json",
Expand All @@ -150,7 +151,6 @@ test('files should not have changed unintentionally in JS template', () => {
"/web/src/components/.keep",
"/web/src/entry.client.jsx",
"/web/src/index.css",
"/web/src/index.html",
"/web/src/layouts",
"/web/src/layouts/.keep",
"/web/src/pages",
Expand Down Expand Up @@ -213,6 +213,7 @@ test('files should not have changed unintentionally in esm TS template', () => {
"/scripts/tsconfig.json",
"/vitest.config.ts",
"/web",
"/web/index.html",
"/web/package.json",
"/web/public",
"/web/public/README.md",
Expand All @@ -225,7 +226,6 @@ test('files should not have changed unintentionally in esm TS template', () => {
"/web/src/components/.keep",
"/web/src/entry.client.tsx",
"/web/src/index.css",
"/web/src/index.html",
"/web/src/layouts",
"/web/src/layouts/.keep",
"/web/src/pages",
Expand Down Expand Up @@ -290,6 +290,7 @@ test('files should not have changed unintentionally in esm JS template', () => {
"/scripts/seed.js",
"/vitest.config.mjs",
"/web",
"/web/index.html",
"/web/jsconfig.json",
"/web/package.json",
"/web/public",
Expand All @@ -303,7 +304,6 @@ test('files should not have changed unintentionally in esm JS template', () => {
"/web/src/components/.keep",
"/web/src/entry.client.jsx",
"/web/src/index.css",
"/web/src/index.html",
"/web/src/layouts",
"/web/src/layouts/.keep",
"/web/src/pages",
Expand Down
5 changes: 4 additions & 1 deletion packages/prerender/src/runPrerender.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,11 @@ function insertChunkLoadingScript(
const chunkPaths: string[] = []

if (route?.filePath) {
// + 4 skips the 'web/' prefix (4 chars). The resulting pagePath
// includes 'src/pages/...' which matches the build manifest keys which are
// relative to Vite's root, which is web/
const pagesIndex =
route.filePath.indexOf(path.join('web', 'src', 'pages')) + 8
route.filePath.indexOf(path.join('web', 'src', 'pages')) + 4
const pagePath = ensurePosixPath(route.filePath.slice(pagesIndex))
const pageChunkPath = buildManifest[pagePath]?.file

Expand Down
2 changes: 1 addition & 1 deletion packages/prerender/src/runPrerenderEsm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ function insertChunkLoadingScript(

if (route?.filePath) {
const pagesIndex =
route.filePath.indexOf(path.join('web', 'src', 'pages')) + 8
route.filePath.indexOf(path.join('web', 'src', 'pages')) + 4
const pagePath = ensurePosixPath(route.filePath.slice(pagesIndex))
const pageChunkPath = buildManifest[pagePath]?.file

Expand Down
2 changes: 1 addition & 1 deletion packages/project-config/src/__tests__/paths.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const DEFAULT_PATHS = {
generators: ['web', 'generators'],
app: ['web', 'src', 'App.tsx'],
document: ['web', 'src', 'Document'],
html: ['web', 'src', 'index.html'],
html: ['web', 'index.html'],
config: ['web', 'config'],
viteConfig: ['web', 'vite.config.ts'],
postcss: ['web', 'config', 'postcss.config.cjs'],
Expand Down
2 changes: 1 addition & 1 deletion packages/project-config/src/paths.ts
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ export function getPaths(BASE_DIR: string = getBaseDir()) {
generators: path.join(BASE_DIR, 'web/generators'),
app: resolveFile(path.join(BASE_DIR, 'web/src/App')) as string,
document: resolveFile(path.join(BASE_DIR, 'web/src/Document')) as string,
html: path.join(BASE_DIR, 'web/src/index.html'),
html: path.join(BASE_DIR, 'web/index.html'),
config: path.join(BASE_DIR, 'web/config'),
viteConfig,
postcss: path.join(BASE_DIR, 'web/config/postcss.config.cjs'),
Expand Down
Loading
Loading