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: run webstudio cli without rebuilding (#3513)
Bogdan Chadkinfde5e8a6f11a
diff --git a/.github/workflows/cli-test.yml b/.github/workflows/cli-test.ymlindex ea3ee41b40..cdb144203b 100644--- a/.github/workflows/cli-test.yml+++ b/.github/workflows/cli-test.yml@@ -35,9 +35,6 @@ jobs:- uses: ./.github/actions/ci-setup- - name: Build cli and other fixtures dependencies- run: pnpm --filter='{./fixtures/*}^...' build-# Testing fixtures for vercel template- name: Test cli --help flagworking-directory: ./fixtures/webstudio-remix-verceldiff --git a/fixtures/webstudio-cloudflare-template/.npmrc b/fixtures/webstudio-cloudflare-template/.npmrcindex 5e3cde50ab..43ce02f127 100644--- a/fixtures/webstudio-cloudflare-template/.npmrc+++ b/fixtures/webstudio-cloudflare-template/.npmrc@@ -1 +1,3 @@force=true+# to support using NODE_OPTIONS for windows tests+shell-emulator=truediff --git a/fixtures/webstudio-cloudflare-template/package.json b/fixtures/webstudio-cloudflare-template/package.jsonindex 1cc1c017d2..f03573c70b 100644--- a/fixtures/webstudio-cloudflare-template/package.json+++ b/fixtures/webstudio-cloudflare-template/package.json@@ -1,9 +1,10 @@{"type": "module","scripts": {- "fixtures:link": "webstudio link --link \"https://main.development.webstudio.is/builder/d845c167-ea07-4875-b08d-83e97c09dcce?authToken=e9d1343f-9298-4fd3-a66e-f89a5af2dd93&\"",- "fixtures:sync": "webstudio sync && pnpm prettier --write ./.webstudio/",- "fixtures:build": "webstudio build --template internal --template cloudflare --template saas-helpers --preview && pnpm prettier --write ./app/ ./package.json",+ "webstudio": "NODE_OPTIONS='--conditions=webstudio --import=tsx' webstudio",+ "fixtures:link": "pnpm webstudio link --link \"https://main.development.webstudio.is/builder/d845c167-ea07-4875-b08d-83e97c09dcce?authToken=e9d1343f-9298-4fd3-a66e-f89a5af2dd93&\"",+ "fixtures:sync": "pnpm webstudio sync && pnpm prettier --write ./.webstudio/",+ "fixtures:build": "pnpm webstudio build --template internal --template cloudflare --template saas-helpers --preview && pnpm prettier --write ./app/ ./package.json","build": "remix vite:build","dev": "remix vite:dev","typecheck": "tsc",diff --git a/fixtures/webstudio-custom-template/.npmrc b/fixtures/webstudio-custom-template/.npmrcindex 5e3cde50ab..43ce02f127 100644--- a/fixtures/webstudio-custom-template/.npmrc+++ b/fixtures/webstudio-custom-template/.npmrc@@ -1 +1,3 @@force=true+# to support using NODE_OPTIONS for windows tests+shell-emulator=truediff --git a/fixtures/webstudio-custom-template/package.json b/fixtures/webstudio-custom-template/package.jsonindex 24e5fc8e97..4916d1ce04 100644--- a/fixtures/webstudio-custom-template/package.json+++ b/fixtures/webstudio-custom-template/package.json@@ -6,9 +6,10 @@"typecheck": "tsc","checks": "pnpm typecheck","size-test": "rm -rf ./public && remix build && size-limit",- "fixtures:link": "webstudio link --link \"https://main.development.webstudio.is/builder/0d856812-61d8-4014-a20a-82e01c0eb8ee?authToken=d225fafb-4f20-4340-9359-c21df7c49a3f\"",- "fixtures:sync": "webstudio sync && pnpm prettier --write ./.webstudio/",- "fixtures:build": "webstudio build --template internal --template ./custom-template --template ./custom-template-stage --preview && pnpm prettier --write ./app/ ./package.json"+ "webstudio": "NODE_OPTIONS='--conditions=webstudio --import=tsx' webstudio",+ "fixtures:link": "pnpm webstudio link --link \"https://main.development.webstudio.is/builder/0d856812-61d8-4014-a20a-82e01c0eb8ee?authToken=d225fafb-4f20-4340-9359-c21df7c49a3f\"",+ "fixtures:sync": "pnpm webstudio sync && pnpm prettier --write ./.webstudio/",+ "fixtures:build": "pnpm webstudio build --template internal --template ./custom-template --template ./custom-template-stage --preview && pnpm prettier --write ./app/ ./package.json"},"private": true,"sideEffects": false,diff --git a/fixtures/webstudio-remix-netlify-edge-functions/.npmrc b/fixtures/webstudio-remix-netlify-edge-functions/.npmrcindex 5e3cde50ab..43ce02f127 100644--- a/fixtures/webstudio-remix-netlify-edge-functions/.npmrc+++ b/fixtures/webstudio-remix-netlify-edge-functions/.npmrc@@ -1 +1,3 @@force=true+# to support using NODE_OPTIONS for windows tests+shell-emulator=truediff --git a/fixtures/webstudio-remix-netlify-edge-functions/package.json b/fixtures/webstudio-remix-netlify-edge-functions/package.jsonindex 6f413e96d5..24f042e82f 100644--- a/fixtures/webstudio-remix-netlify-edge-functions/package.json+++ b/fixtures/webstudio-remix-netlify-edge-functions/package.json@@ -5,9 +5,10 @@"build": "remix vite:build","dev": "remix vite:dev","typecheck": "tsc",- "fixtures:link": "webstudio link --link \"https://main.development.webstudio.is/builder/d845c167-ea07-4875-b08d-83e97c09dcce?authToken=e9d1343f-9298-4fd3-a66e-f89a5af2dd93&\"",- "fixtures:sync": "webstudio sync && pnpm prettier --write ./.webstudio/",- "fixtures:build": "webstudio build --template internal --template netlify-edge-functions --preview && pnpm prettier --write ./app/ ./package.json"+ "webstudio": "NODE_OPTIONS='--conditions=webstudio --import=tsx' webstudio",+ "fixtures:link": "pnpm webstudio link --link \"https://main.development.webstudio.is/builder/d845c167-ea07-4875-b08d-83e97c09dcce?authToken=e9d1343f-9298-4fd3-a66e-f89a5af2dd93&\"",+ "fixtures:sync": "pnpm webstudio sync && pnpm prettier --write ./.webstudio/",+ "fixtures:build": "pnpm webstudio build --template internal --template netlify-edge-functions --preview && pnpm prettier --write ./app/ ./package.json"},"dependencies": {"@netlify/edge-functions": "^2.8.1",diff --git a/fixtures/webstudio-remix-netlify-functions/.npmrc b/fixtures/webstudio-remix-netlify-functions/.npmrcindex 5e3cde50ab..43ce02f127 100644--- a/fixtures/webstudio-remix-netlify-functions/.npmrc+++ b/fixtures/webstudio-remix-netlify-functions/.npmrc@@ -1 +1,3 @@force=true+# to support using NODE_OPTIONS for windows tests+shell-emulator=truediff --git a/fixtures/webstudio-remix-netlify-functions/package.json b/fixtures/webstudio-remix-netlify-functions/package.jsonindex 23a4d7d535..16cadf48a0 100644--- a/fixtures/webstudio-remix-netlify-functions/package.json+++ b/fixtures/webstudio-remix-netlify-functions/package.json@@ -4,9 +4,10 @@"dev": "remix vite:dev","start": "netlify serve","typecheck": "tsc",- "fixtures:link": "webstudio link --link \"https://main.development.webstudio.is/builder/d845c167-ea07-4875-b08d-83e97c09dcce?authToken=e9d1343f-9298-4fd3-a66e-f89a5af2dd93\"",- "fixtures:sync": "webstudio sync && pnpm prettier --write ./.webstudio/",- "fixtures:build": "webstudio build --template internal --template netlify-functions --preview && pnpm prettier --write ./app/ ./package.json"+ "webstudio": "NODE_OPTIONS='--conditions=webstudio --import=tsx' webstudio",+ "fixtures:link": "pnpm webstudio link --link \"https://main.development.webstudio.is/builder/d845c167-ea07-4875-b08d-83e97c09dcce?authToken=e9d1343f-9298-4fd3-a66e-f89a5af2dd93\"",+ "fixtures:sync": "pnpm webstudio sync && pnpm prettier --write ./.webstudio/",+ "fixtures:build": "pnpm webstudio build --template internal --template netlify-functions --preview && pnpm prettier --write ./app/ ./package.json"},"dependencies": {"@netlify/functions": "^2.7.0",diff --git a/fixtures/webstudio-remix-vercel/.npmrc b/fixtures/webstudio-remix-vercel/.npmrcindex 5e3cde50ab..43ce02f127 100644--- a/fixtures/webstudio-remix-vercel/.npmrc+++ b/fixtures/webstudio-remix-vercel/.npmrc@@ -1 +1,3 @@force=true+# to support using NODE_OPTIONS for windows tests+shell-emulator=truediff --git a/fixtures/webstudio-remix-vercel/package.json b/fixtures/webstudio-remix-vercel/package.jsonindex 526f3e1ec5..5225ca6a5f 100644--- a/fixtures/webstudio-remix-vercel/package.json+++ b/fixtures/webstudio-remix-vercel/package.json@@ -4,9 +4,10 @@"build": "remix vite:build","dev": "remix vite:dev","typecheck": "tsc",- "fixtures:link": "webstudio link --link \"https://main.development.webstudio.is/builder/cddc1d44-af37-4cb6-a430-d300cf6f932d?authToken=1cdc6026-dd5b-4624-b89b-9bd45e9bcc3d&mode=preview\"",- "fixtures:sync": "webstudio sync && pnpm prettier --write ./.webstudio/",- "fixtures:build": "webstudio build --template internal --template vercel --preview && pnpm prettier --write ./app/ ./package.json"+ "webstudio": "NODE_OPTIONS='--conditions=webstudio --import=tsx' webstudio",+ "fixtures:link": "pnpm webstudio link --link \"https://main.development.webstudio.is/builder/cddc1d44-af37-4cb6-a430-d300cf6f932d?authToken=1cdc6026-dd5b-4624-b89b-9bd45e9bcc3d&mode=preview\"",+ "fixtures:sync": "pnpm webstudio sync && pnpm prettier --write ./.webstudio/",+ "fixtures:build": "pnpm webstudio build --template internal --template vercel --preview && pnpm prettier --write ./app/ ./package.json"},"private": true,"sideEffects": false,diff --git a/packages/cli/bin.js b/packages/cli/bin.jsindex f6afaf63e2..f4ff09add4 100755--- a/packages/cli/bin.js+++ b/packages/cli/bin.js@@ -1,5 +1,5 @@#!/usr/bin/env node-import { main } from "./lib/cli.js";+import { main } from "#cli";await main();diff --git a/packages/cli/package.json b/packages/cli/package.jsonindex 79d2e6fe96..6f00c9a04f 100644--- a/packages/cli/package.json+++ b/packages/cli/package.json@@ -9,6 +9,12 @@"webstudio-cli": "./bin.js","webstudio": "./bin.js"},+ "imports": {+ "#cli": {+ "webstudio": "./src/cli.ts",+ "default": "./lib/cli.js"+ }+ },"files": ["lib/*","templates/*",@@ -19,7 +25,6 @@"typecheck": "tsc","checks": "pnpm typecheck","build": "rm -rf lib && esbuild src/cli.ts --outdir=lib --bundle --format=esm --packages=external",- "local-run": "tsx --no-warnings ./src/bin.ts","dev": "esbuild src/cli.ts --watch --bundle --format=esm --packages=external --outdir=./lib","test": "NODE_OPTIONS=--experimental-vm-modules jest"},diff --git a/packages/cli/src/bin.ts b/packages/cli/src/bin.tsdeleted file mode 100644index 435506e3bc..0000000000--- a/packages/cli/src/bin.ts+++ /dev/null@@ -1,5 +0,0 @@-#!/usr/bin/env node --experimental-specifier-resolution=node --no-warnings-// pnpm tsx --no-warnings ./src/bin.ts-import { main } from "./cli";--await main();diff --git a/packages/cli/templates/internal/.npmrc b/packages/cli/templates/internal/.npmrcnew file mode 100644index 0000000000..43ce02f127--- /dev/null+++ b/packages/cli/templates/internal/.npmrc@@ -0,0 +1,3 @@+force=true+# to support using NODE_OPTIONS for windows tests+shell-emulator=truediff --git a/packages/sdk-cli/src/bin.ts b/packages/sdk-cli/src/bin.tsindex 2238a101b9..a7eb366312 100755--- a/packages/sdk-cli/src/bin.ts+++ b/packages/sdk-cli/src/bin.ts@@ -1,2 +1,2 @@-#!/usr/bin/env tsx --conditions=webstudio --experimental-specifier-resolution=node --no-warnings+#!/usr/bin/env tsx --conditions=webstudioimport "./cli";