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
fix: Report unsupported Node versions at CLI startup (#6201)
Oleg Isonenb1d23f69c0f8
diff --git a/packages/cli/bin.js b/packages/cli/bin.jsindex f6afaf63e2..53e0a2be03 100755--- a/packages/cli/bin.js+++ b/packages/cli/bin.js@@ -1,5 +1,24 @@#!/usr/bin/env node-import { main } from "./lib/cli.js";+import { createRequire } from "node:module";+import semver from "semver";-await main();+const require = createRequire(import.meta.url);+const packageJson = require("./package.json");++const start = async () => {+ const currentVersion = process.versions.node;+ const supportedVersionRange = packageJson.engines.node;+ if (semver.satisfies(currentVersion, supportedVersionRange) === false) {+ console.error(+ `Webstudio CLI requires Node.js ${supportedVersionRange}. Detected Node.js ${currentVersion}. Install a supported Node.js version and try again.`+ );+ process.exitCode = 1;+ return;+ }++ const { main } = await import("./lib/cli.js");+ await main();+};++await start();diff --git a/packages/cli/package.json b/packages/cli/package.jsonindex 613e37e6af..28250688a8 100644--- a/packages/cli/package.json+++ b/packages/cli/package.json@@ -66,6 +66,7 @@"path-key": "^4.0.0","picocolors": "^1.1.1","reserved-identifiers": "^1.0.0",+ "semver": "7.7.1","tinyexec": "^0.3.2","tus-js-client": "^4.3.1","warn-once": "^0.1.1",@@ -91,6 +92,7 @@"@types/mdast": "^4.0.4","@types/react": "^18.2.70","@types/react-dom": "^18.2.25",+ "@types/semver": "^7.7.0","@types/which": "^3.0.4","@types/yargs": "^17.0.33","@vercel/react-router": "^1.1.0",diff --git a/packages/cli/src/bin.test.ts b/packages/cli/src/bin.test.tsindex 158af1b633..ed8c17e122 100644--- a/packages/cli/src/bin.test.ts+++ b/packages/cli/src/bin.test.ts@@ -8,6 +8,7 @@ import { expect, test } from "vitest";const packageRoot = join(dirname(fileURLToPath(import.meta.url)), "..");const localPath = join(packageRoot, "local.js");+const publishedPath = join(packageRoot, "bin.js");const rootPackagePath = join(packageRoot, "../..", "package.json");test("keeps local source launcher wired to the root script", async () => {@@ -16,6 +17,27 @@ test("keeps local source launcher wired to the root script", async () => {expect(rootPackageJson.scripts.webstudio).toBe("node packages/cli/local.js");});+test("published launcher reports unsupported Node.js before loading the CLI", () => {+ const unsupportedNodeVersion = "20.19.5";+ const preload = `data:text/javascript,${encodeURIComponent(+ `Object.defineProperty(process.versions, "node", { value: "${unsupportedNodeVersion}" });`+ )}`;+ const result = spawnSync(+ process.execPath,+ ["--import", preload, publishedPath, "--version"],+ {+ cwd: packageRoot,+ encoding: "utf-8",+ }+ );++ expect(result.status).toBe(1);+ expect(result.stdout).toBe("");+ expect(result.stderr).toBe(+ `Webstudio CLI requires Node.js >=22.12.0. Detected Node.js ${unsupportedNodeVersion}. Install a supported Node.js version and try again.\n`+ );+});+test("local launcher bootstraps source cli without caller-provided node options", () => {const env = { ...process.env };delete env.NODE_OPTIONS;diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex b85a8e0194..9dd9d360a4 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -1333,6 +1333,9 @@ importers:reserved-identifiers:specifier: ^1.0.0version: 1.0.0+ semver:+ specifier: 7.7.1+ version: 7.7.1tinyexec:specifier: ^0.3.2version: 0.3.2@@ -1403,6 +1406,9 @@ importers:'@types/react-dom':specifier: ^18.2.25version: 18.2.25+ '@types/semver':+ specifier: ^7.7.0+ version: 7.8.0'@types/which':specifier: ^3.0.4version: 3.0.4@@ -6798,6 +6804,9 @@ packages:'@types/[email protected]':resolution: {integrity: sha512-n9wjs8bCOTyN/ynwD8s/nTcTreIHB1vf31vhLMGqUPNHaweKC4/fAl4Dj+hUlCTKYgm4P3k83fmiFfzkZ6sgMA==}+ '@types/[email protected]':+ resolution: {integrity: sha512-1mAINjtQCXXeLkJ9ehXkwOcBpqtLxiVtKhpUf83DdRNdQKV0iXZpaHYqRr7nj+wvxuJzoAmAwXI+sCNMv1CzLQ==}+'@types/[email protected]':resolution: {integrity: sha512-Uqt8rPBE8SY0RK8JB1EzVOIZ32uqy8HwdxCnoCOsYrvnswqmFZ/k+9Ikidlk/ImhsdvBsloHbAlewb2IEBV/Og==}@@ -10698,11 +10707,6 @@ packages:resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}hasBin: true- resolution: {integrity: sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==}- engines: {node: '>=10'}- hasBin: true-resolution: {integrity: sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==}engines: {node: '>=10'}@@ -15751,7 +15755,7 @@ snapshots:jsdoc-type-pratt-parser: 4.1.0process: 0.11.10recast: 0.23.9- semver: 7.6.3+ semver: 7.7.1util: 0.12.5ws: 8.18.0optionalDependencies:@@ -16060,6 +16064,8 @@ snapshots:dependencies:htmlparser2: 10.1.0+ '@types/[email protected]': {}+'@types/[email protected]':dependencies:'@types/mime': 1.3.5@@ -20618,8 +20624,6 @@ snapshots:- [email protected]: {}-