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.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
build: Switch on aws s3 copy, fix typo (#3210)
Ivan Starkovb0a28b8c40b0
diff --git a/.github/workflows/cli-r2.yaml b/.github/workflows/cli-r2.yamlindex ee5e602531..b9e57b322d 100644--- a/.github/workflows/cli-r2.yaml+++ b/.github/workflows/cli-r2.yaml@@ -41,43 +41,35 @@ jobs:run: pnpm install --ignore-scripts- name: pnpm build- run: pnpm --filter 'webstudio-cloudlfare-template^...' run build+ run: pnpm --filter 'webstudio-cloudflare-template^...' run build# Ideally, execute 'pnpm deploy --prod', but @remix-run/dev doesn't support this flag.# Despite being listed as a dependency, @remix-run/dev does not install the remix cli.# TODO: Minimize artefact size due to frequent downloads on each publish.- name: pnpm deploy- run: pnpm --filter 'webstudio-cloudlfare-template' deploy "${{ github.workspace }}/../cloudlfare-template"+ run: pnpm --filter 'webstudio-cloudflare-template' deploy "${{ github.workspace }}/../cloudflare-template"- name: Make archiverun: |- tar --use-compress-program="zstd -19" -cf cloudlfare-template.tar.zst cloudlfare-template+ tar --use-compress-program="zstd -19" -cf cloudflare-template.tar.zst cloudflare-templateworking-directory: ${{ github.workspace }}/..- name: Copy artifactrun: |- curl https://rclone.org/install.sh | sudo bash-- ls -la-# For staging- rclone copyto -P -M \- --no-check-dest \- cloudlfare-template.tar.zst "r2:/${ARTEFACT_BUCKET_NAME}/public/cloudlfare-template/${{ github.ref_name }}.tar.zst"+ aws s3 cp cloudflare-template.tar.zst "s3://${ARTEFACT_BUCKET_NAME}/public/cloudflare-template/${{ github.ref_name }}.tar.zst"- # For production- rclone copyto -P -M \- --no-check-dest \- cloudlfare-template.tar.zst "r2:/${ARTEFACT_BUCKET_NAME}/public/cloudlfare-template/${{ github.sha }}.tar.zst"+ # For production can be cached forever+ aws s3 cp \+ --metadata-directive REPLACE --cache-control "public,max-age=31536102,immutable" \+ cloudflare-template.tar.zst "s3://${ARTEFACT_BUCKET_NAME}/public/cloudflare-template/${{ github.sha }}.tar.zst"working-directory: ${{ github.workspace }}/..env:- RCLONE_CONFIG_R2_ACCESS_KEY_ID: ${{ secrets.RCLONE_CONFIG_R2_ACCESS_KEY_ID }}- RCLONE_CONFIG_R2_ACL: ${{ secrets.RCLONE_CONFIG_R2_ACL }}- RCLONE_CONFIG_R2_ENDPOINT: ${{ secrets.RCLONE_CONFIG_R2_ENDPOINT }}- RCLONE_CONFIG_R2_PROVIDER: ${{ secrets.RCLONE_CONFIG_R2_PROVIDER }}- RCLONE_CONFIG_R2_TYPE: ${{ secrets.RCLONE_CONFIG_R2_TYPE }}- RCLONE_CONFIG_R2_SECRET_ACCESS_KEY: ${{ secrets.RCLONE_CONFIG_R2_SECRET_ACCESS_KEY }}+ AWS_ENDPOINT_URL_S3: ${{ secrets.AWS_ENDPOINT_URL_S3 }}+ AWS_REGION: ${{ secrets.AWS_REGION }}+ AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}+ AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}ARTEFACT_BUCKET_NAME: ${{ secrets.ARTEFACT_BUCKET_NAME }}checks:@@ -98,18 +90,18 @@ jobs:node-version: "18.x"- name: Copy atrifact via http- run: curl -o cloudlfare-template.tar.zst ${{ secrets.ARTEFACT_BUCKET_URL }}/public/cloudlfare-template/${{ github.ref_name }}.tar.zst+ run: curl -o cloudflare-template.tar.zst ${{ secrets.ARTEFACT_BUCKET_URL }}/public/cloudflare-template/${{ github.ref_name }}.tar.zst- name: Extract archive- run: tar --use-compress-program="zstd -d" -xf cloudlfare-template.tar.zst -C .+ run: tar --use-compress-program="zstd -d" -xf cloudflare-template.tar.zst -C .- name: Webstudio Buildrun: pnpm webstudio build --template internal --template saas-helpers --template cloudflare --assets false- working-directory: ${{ github.workspace }}/cloudlfare-template+ working-directory: ${{ github.workspace }}/cloudflare-template- name: Remix Buildrun: pnpm build- working-directory: ${{ github.workspace }}/cloudlfare-template+ working-directory: ${{ github.workspace }}/cloudflare-template- name: WRANGLER Buildrun: |@@ -122,4 +114,4 @@ jobs:--outdir dist \'./functions/[[path]].ts'- working-directory: ${{ github.workspace }}/cloudlfare-template+ working-directory: ${{ github.workspace }}/cloudflare-templatediff --git a/fixtures/webstudio-cloudlfare-template/.webstudio/config.json b/fixtures/webstudio-cloudflare-template/.webstudio/config.jsonsimilarity index 100%rename from fixtures/webstudio-cloudlfare-template/.webstudio/config.jsonrename to fixtures/webstudio-cloudflare-template/.webstudio/config.jsondiff --git a/fixtures/webstudio-cloudlfare-template/.webstudio/data.json b/fixtures/webstudio-cloudflare-template/.webstudio/data.jsonsimilarity index 100%rename from fixtures/webstudio-cloudlfare-template/.webstudio/data.jsonrename to fixtures/webstudio-cloudflare-template/.webstudio/data.jsondiff --git a/fixtures/webstudio-cloudlfare-template/WS_CF_README.md b/fixtures/webstudio-cloudflare-template/WS_CF_README.mdsimilarity index 100%rename from fixtures/webstudio-cloudlfare-template/WS_CF_README.mdrename to fixtures/webstudio-cloudflare-template/WS_CF_README.mddiff --git a/fixtures/webstudio-cloudlfare-template/app/__generated__/[sitemap.xml].ts b/fixtures/webstudio-cloudflare-template/app/__generated__/[sitemap.xml].tssimilarity index 100%rename from fixtures/webstudio-cloudlfare-template/app/__generated__/[sitemap.xml].tsrename to fixtures/webstudio-cloudflare-template/app/__generated__/[sitemap.xml].tsdiff --git a/fixtures/webstudio-cloudlfare-template/app/__generated__/_index.server.tsx b/fixtures/webstudio-cloudflare-template/app/__generated__/_index.server.tsxsimilarity index 100%rename from fixtures/webstudio-cloudlfare-template/app/__generated__/_index.server.tsxrename to fixtures/webstudio-cloudflare-template/app/__generated__/_index.server.tsxdiff --git a/fixtures/webstudio-cloudlfare-template/app/__generated__/_index.tsx b/fixtures/webstudio-cloudflare-template/app/__generated__/_index.tsxsimilarity index 100%rename from fixtures/webstudio-cloudlfare-template/app/__generated__/_index.tsxrename to fixtures/webstudio-cloudflare-template/app/__generated__/_index.tsxdiff --git a/fixtures/webstudio-cloudlfare-template/app/__generated__/index.css b/fixtures/webstudio-cloudflare-template/app/__generated__/index.csssimilarity index 100%rename from fixtures/webstudio-cloudlfare-template/app/__generated__/index.cssrename to fixtures/webstudio-cloudflare-template/app/__generated__/index.cssdiff --git a/fixtures/webstudio-cloudlfare-template/app/constants.mjs b/fixtures/webstudio-cloudflare-template/app/constants.mjssimilarity index 100%rename from fixtures/webstudio-cloudlfare-template/app/constants.mjsrename to fixtures/webstudio-cloudflare-template/app/constants.mjsdiff --git a/fixtures/webstudio-cloudlfare-template/app/extension.ts b/fixtures/webstudio-cloudflare-template/app/extension.tssimilarity index 100%rename from fixtures/webstudio-cloudlfare-template/app/extension.tsrename to fixtures/webstudio-cloudflare-template/app/extension.tsdiff --git a/fixtures/webstudio-cloudlfare-template/app/root.tsx b/fixtures/webstudio-cloudflare-template/app/root.tsxsimilarity index 100%rename from fixtures/webstudio-cloudlfare-template/app/root.tsxrename to fixtures/webstudio-cloudflare-template/app/root.tsxdiff --git a/fixtures/webstudio-cloudlfare-template/app/routes/[robots.txt].tsx b/fixtures/webstudio-cloudflare-template/app/routes/[robots.txt].tsxsimilarity index 100%rename from fixtures/webstudio-cloudlfare-template/app/routes/[robots.txt].tsxrename to fixtures/webstudio-cloudflare-template/app/routes/[robots.txt].tsxdiff --git a/fixtures/webstudio-cloudlfare-template/app/routes/[sitemap.xml].tsx b/fixtures/webstudio-cloudflare-template/app/routes/[sitemap.xml].tsxsimilarity index 100%rename from fixtures/webstudio-cloudlfare-template/app/routes/[sitemap.xml].tsxrename to fixtures/webstudio-cloudflare-template/app/routes/[sitemap.xml].tsxdiff --git a/fixtures/webstudio-cloudlfare-template/app/routes/_index.tsx b/fixtures/webstudio-cloudflare-template/app/routes/_index.tsxsimilarity index 100%rename from fixtures/webstudio-cloudlfare-template/app/routes/_index.tsxrename to fixtures/webstudio-cloudflare-template/app/routes/_index.tsxdiff --git a/fixtures/webstudio-cloudlfare-template/functions/[[path]].ts b/fixtures/webstudio-cloudflare-template/functions/[[path]].tssimilarity index 100%rename from fixtures/webstudio-cloudlfare-template/functions/[[path]].tsrename to fixtures/webstudio-cloudflare-template/functions/[[path]].tsdiff --git a/fixtures/webstudio-cloudlfare-template/load-context.ts b/fixtures/webstudio-cloudflare-template/load-context.tssimilarity index 100%rename from fixtures/webstudio-cloudlfare-template/load-context.tsrename to fixtures/webstudio-cloudflare-template/load-context.tsdiff --git a/fixtures/webstudio-cloudlfare-template/package.json b/fixtures/webstudio-cloudflare-template/package.jsonsimilarity index 98%rename from fixtures/webstudio-cloudlfare-template/package.jsonrename to fixtures/webstudio-cloudflare-template/package.jsonindex 104536bbd6..3247f0ac12 100644--- a/fixtures/webstudio-cloudlfare-template/package.json+++ b/fixtures/webstudio-cloudflare-template/package.json@@ -15,7 +15,7 @@},"private": true,"sideEffects": false,- "name": "webstudio-cloudlfare-template",+ "name": "webstudio-cloudflare-template","version": "0.0.1","description": "","main": "index.js",diff --git a/fixtures/webstudio-cloudlfare-template/public/favicon.ico b/fixtures/webstudio-cloudflare-template/public/favicon.icosimilarity index 100%rename from fixtures/webstudio-cloudlfare-template/public/favicon.icorename to fixtures/webstudio-cloudflare-template/public/favicon.icodiff --git a/fixtures/webstudio-cloudlfare-template/tsconfig.json b/fixtures/webstudio-cloudflare-template/tsconfig.jsonsimilarity index 100%rename from fixtures/webstudio-cloudlfare-template/tsconfig.jsonrename to fixtures/webstudio-cloudflare-template/tsconfig.jsondiff --git a/fixtures/webstudio-cloudlfare-template/vite.config.ts b/fixtures/webstudio-cloudflare-template/vite.config.tssimilarity index 100%rename from fixtures/webstudio-cloudlfare-template/vite.config.tsrename to fixtures/webstudio-cloudflare-template/vite.config.tsdiff --git a/fixtures/webstudio-cloudlfare-template/worker-configuration.d.ts b/fixtures/webstudio-cloudflare-template/worker-configuration.d.tssimilarity index 100%rename from fixtures/webstudio-cloudlfare-template/worker-configuration.d.tsrename to fixtures/webstudio-cloudflare-template/worker-configuration.d.tsdiff --git a/fixtures/webstudio-cloudlfare-template/wrangler.toml b/fixtures/webstudio-cloudflare-template/wrangler.tomlsimilarity index 100%rename from fixtures/webstudio-cloudlfare-template/wrangler.tomlrename to fixtures/webstudio-cloudflare-template/wrangler.tomldiff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 072c6b354c..5bcf653f4f 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -455,7 +455,7 @@ importers:specifier: ^5.2.8version: 5.2.8(@types/[email protected])- fixtures/webstudio-cloudlfare-template:+ fixtures/webstudio-cloudflare-template:dependencies:'@remix-run/cloudflare':specifier: ^2.8.1