Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

chore: rename fixtures/ssg to ssg-cloudflare-pages to prevent concurrent build race condition (#5662)

Oleg Isonen7a68357334d1
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8f9fb4437a..fab7186d90 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -140,7 +140,7 @@ jobs:
}
}
const results = [
- await assertSize('./fixtures/ssg/dist/client', 356),
+ await assertSize('./fixtures/ssg-cloudflare-pages/dist/client', 356),
await assertSize('./fixtures/react-router-netlify/build/client', 376),
await assertSize('./fixtures/webstudio-features/build/client', 3312),
]
diff --git a/fixtures/ssg/.npmrc b/fixtures/ssg-cloudflare-pages/.npmrc
similarity index 100%
rename from fixtures/ssg/.npmrc
rename to fixtures/ssg-cloudflare-pages/.npmrc
diff --git a/fixtures/ssg/.webstudio/config.json b/fixtures/ssg-cloudflare-pages/.webstudio/config.json
similarity index 100%
rename from fixtures/ssg/.webstudio/config.json
rename to fixtures/ssg-cloudflare-pages/.webstudio/config.json
diff --git a/fixtures/ssg/.webstudio/data.json b/fixtures/ssg-cloudflare-pages/.webstudio/data.json
similarity index 100%
rename from fixtures/ssg/.webstudio/data.json
rename to fixtures/ssg-cloudflare-pages/.webstudio/data.json
diff --git a/fixtures/ssg/app/__generated__/$resources.assets.ts b/fixtures/ssg-cloudflare-pages/app/__generated__/$resources.assets.ts
similarity index 100%
rename from fixtures/ssg/app/__generated__/$resources.assets.ts
rename to fixtures/ssg-cloudflare-pages/app/__generated__/$resources.assets.ts
diff --git a/fixtures/ssg/app/__generated__/$resources.sitemap.xml.ts b/fixtures/ssg-cloudflare-pages/app/__generated__/$resources.sitemap.xml.ts
similarity index 100%
rename from fixtures/ssg/app/__generated__/$resources.sitemap.xml.ts
rename to fixtures/ssg-cloudflare-pages/app/__generated__/$resources.sitemap.xml.ts
diff --git a/fixtures/ssg/app/__generated__/[another-page]._index.server.tsx b/fixtures/ssg-cloudflare-pages/app/__generated__/[another-page]._index.server.tsx
similarity index 100%
rename from fixtures/ssg/app/__generated__/[another-page]._index.server.tsx
rename to fixtures/ssg-cloudflare-pages/app/__generated__/[another-page]._index.server.tsx
diff --git a/fixtures/ssg/app/__generated__/[another-page]._index.tsx b/fixtures/ssg-cloudflare-pages/app/__generated__/[another-page]._index.tsx
similarity index 100%
rename from fixtures/ssg/app/__generated__/[another-page]._index.tsx
rename to fixtures/ssg-cloudflare-pages/app/__generated__/[another-page]._index.tsx
diff --git a/fixtures/ssg/app/__generated__/_index.server.tsx b/fixtures/ssg-cloudflare-pages/app/__generated__/_index.server.tsx
similarity index 100%
rename from fixtures/ssg/app/__generated__/_index.server.tsx
rename to fixtures/ssg-cloudflare-pages/app/__generated__/_index.server.tsx
diff --git a/fixtures/ssg/app/__generated__/_index.tsx b/fixtures/ssg-cloudflare-pages/app/__generated__/_index.tsx
similarity index 100%
rename from fixtures/ssg/app/__generated__/_index.tsx
rename to fixtures/ssg-cloudflare-pages/app/__generated__/_index.tsx
diff --git a/fixtures/ssg/app/__generated__/index.css b/fixtures/ssg-cloudflare-pages/app/__generated__/index.css
similarity index 100%
rename from fixtures/ssg/app/__generated__/index.css
rename to fixtures/ssg-cloudflare-pages/app/__generated__/index.css
diff --git a/fixtures/ssg/app/constants.mjs b/fixtures/ssg-cloudflare-pages/app/constants.mjs
similarity index 100%
rename from fixtures/ssg/app/constants.mjs
rename to fixtures/ssg-cloudflare-pages/app/constants.mjs
diff --git a/fixtures/ssg/package.json b/fixtures/ssg-cloudflare-pages/package.json
similarity index 95%
rename from fixtures/ssg/package.json
rename to fixtures/ssg-cloudflare-pages/package.json
index d96cb5b3f1..59b0ff1d94 100644
--- a/fixtures/ssg/package.json
+++ b/fixtures/ssg-cloudflare-pages/package.json
@@ -1,9 +1,9 @@
{
- "name": "ssg",
+ "name": "ssg-cloudflare-pages",
"version": "1.0.0",
"description": "",
"scripts": {
- "build": "vite build",
+ "build": "vite build && vike prerender",
"postbuild": "prettier --write \"dist/**/*.html\" || true",
"dev": "vite dev",
"typecheck": "tsgo --noEmit",
diff --git a/fixtures/ssg/pages/+config.ts b/fixtures/ssg-cloudflare-pages/pages/+config.ts
similarity index 84%
rename from fixtures/ssg/pages/+config.ts
rename to fixtures/ssg-cloudflare-pages/pages/+config.ts
index c55d5f36c6..143122d87f 100644
--- a/fixtures/ssg/pages/+config.ts
+++ b/fixtures/ssg-cloudflare-pages/pages/+config.ts
@@ -1,7 +1,7 @@
import type { Config } from "vike/types";
export default {
- prerender: true,
+ prerender: { disableAutoRun: true },
meta: {
Head: {
env: { server: true, client: true },
diff --git a/fixtures/ssg/pages/another-page/+Head.tsx b/fixtures/ssg-cloudflare-pages/pages/another-page/+Head.tsx
similarity index 100%
rename from fixtures/ssg/pages/another-page/+Head.tsx
rename to fixtures/ssg-cloudflare-pages/pages/another-page/+Head.tsx
diff --git a/fixtures/ssg/pages/another-page/+Page.tsx b/fixtures/ssg-cloudflare-pages/pages/another-page/+Page.tsx
similarity index 100%
rename from fixtures/ssg/pages/another-page/+Page.tsx
rename to fixtures/ssg-cloudflare-pages/pages/another-page/+Page.tsx
diff --git a/fixtures/ssg/pages/another-page/+data.ts b/fixtures/ssg-cloudflare-pages/pages/another-page/+data.ts
similarity index 100%
rename from fixtures/ssg/pages/another-page/+data.ts
rename to fixtures/ssg-cloudflare-pages/pages/another-page/+data.ts
diff --git a/fixtures/ssg/pages/index/+Head.tsx b/fixtures/ssg-cloudflare-pages/pages/index/+Head.tsx
similarity index 100%
rename from fixtures/ssg/pages/index/+Head.tsx
rename to fixtures/ssg-cloudflare-pages/pages/index/+Head.tsx
diff --git a/fixtures/ssg/pages/index/+Page.tsx b/fixtures/ssg-cloudflare-pages/pages/index/+Page.tsx
similarity index 100%
rename from fixtures/ssg/pages/index/+Page.tsx
rename to fixtures/ssg-cloudflare-pages/pages/index/+Page.tsx
diff --git a/fixtures/ssg/pages/index/+data.ts b/fixtures/ssg-cloudflare-pages/pages/index/+data.ts
similarity index 100%
rename from fixtures/ssg/pages/index/+data.ts
rename to fixtures/ssg-cloudflare-pages/pages/index/+data.ts
diff --git a/fixtures/ssg/public/assets/147-1478573_cat-icon-png-black-cat-png-icon.png_ZJ6-qJjk1RlFzuYwyCXdp.jpeg b/fixtures/ssg-cloudflare-pages/public/assets/147-1478573_cat-icon-png-black-cat-png-icon.png_ZJ6-qJjk1RlFzuYwyCXdp.jpeg
similarity index 100%
rename from fixtures/ssg/public/assets/147-1478573_cat-icon-png-black-cat-png-icon.png_ZJ6-qJjk1RlFzuYwyCXdp.jpeg
rename to fixtures/ssg-cloudflare-pages/public/assets/147-1478573_cat-icon-png-black-cat-png-icon.png_ZJ6-qJjk1RlFzuYwyCXdp.jpeg
diff --git a/fixtures/ssg/public/assets/iconly_svg_converted-converted_zMaMiAAutUl8XrITgz7d1.svg b/fixtures/ssg-cloudflare-pages/public/assets/iconly_svg_converted-converted_zMaMiAAutUl8XrITgz7d1.svg
similarity index 100%
rename from fixtures/ssg/public/assets/iconly_svg_converted-converted_zMaMiAAutUl8XrITgz7d1.svg
rename to fixtures/ssg-cloudflare-pages/public/assets/iconly_svg_converted-converted_zMaMiAAutUl8XrITgz7d1.svg
diff --git a/fixtures/ssg/public/favicon.ico b/fixtures/ssg-cloudflare-pages/public/favicon.ico
similarity index 100%
rename from fixtures/ssg/public/favicon.ico
rename to fixtures/ssg-cloudflare-pages/public/favicon.ico
diff --git a/fixtures/ssg/renderer/+onRenderClient.tsx b/fixtures/ssg-cloudflare-pages/renderer/+onRenderClient.tsx
similarity index 100%
rename from fixtures/ssg/renderer/+onRenderClient.tsx
rename to fixtures/ssg-cloudflare-pages/renderer/+onRenderClient.tsx
diff --git a/fixtures/ssg/renderer/+onRenderHtml.tsx b/fixtures/ssg-cloudflare-pages/renderer/+onRenderHtml.tsx
similarity index 100%
rename from fixtures/ssg/renderer/+onRenderHtml.tsx
rename to fixtures/ssg-cloudflare-pages/renderer/+onRenderHtml.tsx
diff --git a/fixtures/ssg/tsconfig.json b/fixtures/ssg-cloudflare-pages/tsconfig.json
similarity index 100%
rename from fixtures/ssg/tsconfig.json
rename to fixtures/ssg-cloudflare-pages/tsconfig.json
diff --git a/fixtures/ssg/vike.d.ts b/fixtures/ssg-cloudflare-pages/vike.d.ts
similarity index 100%
rename from fixtures/ssg/vike.d.ts
rename to fixtures/ssg-cloudflare-pages/vike.d.ts
diff --git a/fixtures/ssg/vite.config.ts b/fixtures/ssg-cloudflare-pages/vite.config.ts
similarity index 100%
rename from fixtures/ssg/vite.config.ts
rename to fixtures/ssg-cloudflare-pages/vite.config.ts
diff --git a/fixtures/ssg-netlify-by-project-id/package.json b/fixtures/ssg-netlify-by-project-id/package.json
index f555e3e046..0646a4b404 100644
--- a/fixtures/ssg-netlify-by-project-id/package.json
+++ b/fixtures/ssg-netlify-by-project-id/package.json
@@ -3,7 +3,7 @@
"version": "1.0.0",
"description": "",
"scripts": {
- "build": "vite build",
+ "build": "vite build && vike prerender",
"postbuild": "prettier --write \"dist/**/*.html\" || true",
"dev": "vite dev",
"typecheck": "tsgo --noEmit",
diff --git a/fixtures/ssg-netlify-by-project-id/pages/+config.ts b/fixtures/ssg-netlify-by-project-id/pages/+config.ts
index c55d5f36c6..143122d87f 100644
--- a/fixtures/ssg-netlify-by-project-id/pages/+config.ts
+++ b/fixtures/ssg-netlify-by-project-id/pages/+config.ts
@@ -1,7 +1,7 @@
import type { Config } from "vike/types";
export default {
- prerender: true,
+ prerender: { disableAutoRun: true },
meta: {
Head: {
env: { server: true, client: true },
diff --git a/packages/cli/templates/ssg/package.json b/packages/cli/templates/ssg/package.json
index dae6a43a03..4ebd1da3dc 100644
--- a/packages/cli/templates/ssg/package.json
+++ b/packages/cli/templates/ssg/package.json
@@ -3,7 +3,7 @@
"private": true,
"sideEffects": false,
"scripts": {
- "build": "vite build",
+ "build": "vite build && vike prerender",
"dev": "vite dev",
"typecheck": "tsgo --noEmit"
},
diff --git a/packages/cli/templates/ssg/pages/+config.ts b/packages/cli/templates/ssg/pages/+config.ts
index c55d5f36c6..143122d87f 100644
--- a/packages/cli/templates/ssg/pages/+config.ts
+++ b/packages/cli/templates/ssg/pages/+config.ts
@@ -1,7 +1,7 @@
import type { Config } from "vike/types";
export default {
- prerender: true,
+ prerender: { disableAutoRun: true },
meta: {
Head: {
env: { server: true, client: true },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index adc7bfbe41..a9624fd55e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -736,7 +736,7 @@ importers:
specifier: 5.8.2
version: 5.8.2
- fixtures/ssg:
+ fixtures/ssg-cloudflare-pages:
dependencies:
'@webstudio-is/image':
specifier: workspace:*