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.

build: upgrade to pnpm v9 (#3198)

Bogdan Chadkin708cb61842fa
diff --git a/.github/workflows/cli-test.yml b/.github/workflows/cli-test.yml
index c1e711b37f..9d3a986000 100644
--- a/.github/workflows/cli-test.yml
+++ b/.github/workflows/cli-test.yml
@@ -35,8 +35,8 @@ jobs:
- uses: ./.github/actions/ci-setup
- - name: Build cli
- run: pnpm --filter='./packages/*' build
+ - name: Build cli and other fixtures dependencies
+ run: pnpm --filter='{./fixtures/*}^...' build
# Testing fixtures for vercel template
- name: Test cli --help flag
diff --git a/.npmrc b/.npmrc
deleted file mode 100644
index e89abf7de8..0000000000
--- a/.npmrc
+++ /dev/null
@@ -1,3 +0,0 @@
-prefer-symlinked-executables=false
-shell-emulator=true
-enable-pre-post-scripts=true
diff --git a/devops/cli/Dockerfile b/devops/cli/Dockerfile
index dd925279e8..cf896950ee 100644
--- a/devops/cli/Dockerfile
+++ b/devops/cli/Dockerfile
@@ -16,7 +16,7 @@ ENV PNPM_HOME="/.pnpm/store"
ENV PATH="$PNPM_HOME:$PATH"
RUN corepack enable pnpm && mkdir -p $PNPM_HOME
RUN pnpm install --ignore-scripts
-RUN pnpm -r --filter './packages/*' run build
+RUN pnpm --filter 'webstudio-cloudlfare-template^...' run build
RUN pnpm --filter 'webstudio-cloudlfare-template' deploy /cloudlfare-template
WORKDIR /cloudlfare-template
@@ -80,4 +80,4 @@ WORKDIR /cloudlfare-template
# # Clean up
# RUN rm -rf dist && rm -rf build && rm -rf .wrangler
-# TODO: Layered build, production deps only
\ No newline at end of file
+# TODO: Layered build, production deps only
diff --git a/fixtures/webstudio-cloudlfare-template/package.json b/fixtures/webstudio-cloudlfare-template/package.json
index 950add8901..104536bbd6 100644
--- a/fixtures/webstudio-cloudlfare-template/package.json
+++ b/fixtures/webstudio-cloudlfare-template/package.json
@@ -1,7 +1,7 @@
{
"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: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 saas-helpers --template cloudflare --preview && pnpm prettier --write ./app/ ./package.json",
"build": "remix vite:build",
diff --git a/fixtures/webstudio-custom-template/package.json b/fixtures/webstudio-custom-template/package.json
index 7a94b54f3f..fee02c56e0 100644
--- a/fixtures/webstudio-custom-template/package.json
+++ b/fixtures/webstudio-custom-template/package.json
@@ -6,7 +6,7 @@
"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: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"
},
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/package.json b/fixtures/webstudio-remix-netlify-edge-functions/package.json
index 4a6aff999e..a2268a35e0 100644
--- a/fixtures/webstudio-remix-netlify-edge-functions/package.json
+++ b/fixtures/webstudio-remix-netlify-edge-functions/package.json
@@ -5,7 +5,7 @@
"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: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"
},
diff --git a/fixtures/webstudio-remix-netlify-functions/package.json b/fixtures/webstudio-remix-netlify-functions/package.json
index 4a2a42c5eb..1fc123215d 100644
--- a/fixtures/webstudio-remix-netlify-functions/package.json
+++ b/fixtures/webstudio-remix-netlify-functions/package.json
@@ -4,7 +4,7 @@
"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: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"
},
diff --git a/fixtures/webstudio-remix-vercel/package.json b/fixtures/webstudio-remix-vercel/package.json
index 5cbc2ffabf..b8b2e87540 100644
--- a/fixtures/webstudio-remix-vercel/package.json
+++ b/fixtures/webstudio-remix-vercel/package.json
@@ -4,7 +4,7 @@
"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: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"
},
diff --git a/package.json b/package.json
index 45df3e10a4..e1f1e7cd2c 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
{
- "packageManager": "[email protected]",
+ "packageManager": "[email protected]",
"name": "webstudio-root",
"version": "0.0.0",
"private": true,
@@ -41,7 +41,7 @@
},
"engines": {
"node": "18",
- "pnpm": "8.15",
+ "pnpm": "9.0",
"yarn": "This project is configured to use pnpm"
},
"nano-staged": {