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.

Upgrade turbo (#1319)

Bogdan Chadkin2a7340353c62
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3ae898c5bf..b41509f12f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,5 +16,4 @@ jobs:
- uses: actions/checkout@v3
- uses: ./.github/actions/ci-setup
- - run: pnpm build
- - run: pnpm checks
+ - run: pnpm turbo run size-test build checks
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index f171760bd7..f48074a146 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -19,7 +19,7 @@ jobs:
- uses: actions/checkout@v3
- uses: ./.github/actions/ci-setup
- - run: pnpm build
+ - run: pnpm size-test build
- name: Creating .npmrc
run: |
diff --git a/.github/workflows/vis-reg-tests.yml b/.github/workflows/vis-reg-tests.yml
index 337e29de99..9ad1652c60 100644
--- a/.github/workflows/vis-reg-tests.yml
+++ b/.github/workflows/vis-reg-tests.yml
@@ -20,6 +20,9 @@ jobs:
builder:
timeout-minutes: 20
runs-on: ubuntu-latest
+ env:
+ DATABASE_URL: postgres://
+ AUTH_SECRET: test
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/ci-setup
diff --git a/package.json b/package.json
index 0964a43607..c6cfa3478d 100644
--- a/package.json
+++ b/package.json
@@ -1,17 +1,18 @@
{
"packageManager": "[email protected]",
- "name": "turbo",
+ "name": "webstudio",
"version": "0.0.0",
"private": true,
"scripts": {
- "build-packages": "pnpm run --recursive --parallel --filter='!./apps/*' --filter='!./packages/sdk-size-test' build",
"build": "turbo run build",
+ "build-packages": "turbo run build --filter=\"!@webstudio-is/builder\"",
+ "size-test": "turbo run size-test",
"checks": "turbo run checks",
"dev": "pnpm run --parallel --recursive dev",
"format": "prettier --write \"**/*.{ts,tsx,md}\"",
"build-storybook": "build-storybook",
"storybook": "pnpm run --parallel --recursive storybook:run",
- "storybook:build": "npm run build && turbo run storybook:build",
+ "storybook:build": "turbo run storybook:build",
"migrations": "cd apps/builder && pnpm migrations --dev",
"build-figma-tokens": "cd packages/design-system && pnpm build-figma-tokens",
"prepare": "git config core.hooksPath .git/hooks/ && simple-git-hooks"
@@ -30,7 +31,7 @@
"prettier": "2.8.4",
"simple-git-hooks": "^2.8.1",
"tsx": "^3.12.6",
- "turbo": "^1.7.0",
+ "turbo": "^1.8.6",
"typescript": "4.9.5"
},
"engines": {
diff --git a/packages/sdk-size-test/package.json b/packages/sdk-size-test/package.json
index e59a36e4ea..34c0be1286 100644
--- a/packages/sdk-size-test/package.json
+++ b/packages/sdk-size-test/package.json
@@ -4,7 +4,7 @@
"private": true,
"sideEffects": false,
"scripts": {
- "build": "rm -rf ./public && rm -rf ./functions && remix build && size-limit",
+ "size-test": "rm -rf ./public && rm -rf ./functions && remix build && size-limit",
"typecheck": "tsc --noEmit"
},
"size-limit": [
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index de080e5b1e..74094adb47 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -40,8 +40,8 @@ importers:
specifier: ^3.12.6
version: 3.12.6
turbo:
- specifier: ^1.7.0
- version: 1.7.0
+ specifier: ^1.8.6
+ version: 1.8.6
typescript:
specifier: 4.9.5
version: 4.9.5
@@ -19436,65 +19436,65 @@ packages:
safe-buffer: 5.2.1
dev: false
- resolution: {integrity: sha512-hSGAueSf5Ko8J67mpqjpt9FsP6ePn1nMcl7IVPoJq5dHsgX3anCP/BPlexJ502bNK+87DDyhQhJ/LPSJXKrSYQ==}
+ resolution: {integrity: sha512-VlXkQR0TEBAEyBRsvAXBax+fj1EdPKPliwBaCnRLiDUcA/8wYlKte/Kk6ubmj9E0n7U/B4keCxxHiJZqW/5Rqg==}
cpu: [x64]
os: [darwin]
requiresBuild: true
dev: true
optional: true
- resolution: {integrity: sha512-BLLOW5W6VZxk5+0ZOj5AO1qjM0P5isIgjbEuyAl8lHZ4s9antUbY4CtFrspT32XxPTYoDl4UjviPMcSsbcl3WQ==}
+ resolution: {integrity: sha512-w4L2QLj90ex68UXxTPoqtZPl8mWzc6a1RtPjQhoxAWtZf9T2WXi813dCzYEbVUVC09/DOW/VxZRN7sb2r0KP9A==}
cpu: [arm64]
os: [darwin]
requiresBuild: true
dev: true
optional: true
- resolution: {integrity: sha512-aw2qxmfZa+kT87SB3GNUoFimqEPzTlzlRqhPgHuAAT6Uf0JHnmebPt4K+ZPtDNl5yfVmtB05bhHPqw+5QV97Yg==}
+ resolution: {integrity: sha512-eV245jefIhMAZskqQKalFwreC5UEdQcuHcBiWcgUk0py76fbwB7+1HfH5cmeJlb3a1sB6f3H0HHmGPmb34feCA==}
cpu: [x64]
os: [linux]
requiresBuild: true
dev: true
optional: true
- resolution: {integrity: sha512-AJEx2jX+zO5fQtJpO3r6uhTabj4oSA5ZhB7zTs/rwu/XqoydsvStA4X8NDW4poTbOjF7DcSHizqwi04tSMzpJw==}
+ resolution: {integrity: sha512-Kiw3nyEvNU6Bpil4zE5FwhasPAOi59R4YdCmjJp0Sen6V9u+/Jij6SWwaoUdATORJLiYQBbhontWBH55B53VDw==}
cpu: [arm64]
os: [linux]
requiresBuild: true
dev: true
optional: true
- resolution: {integrity: sha512-ewj7PPv2uxqv0r31hgnBa3E5qwUu7eyVRP5M1gB/TJXfSHduU79gbxpKCyxIZv2fL/N2/3U7EPOQPSZxBAoljA==}
+ resolution: {integrity: sha512-34BkAG9r4nE00xeMeVahaF82h8R6SO+IIOcD60fNr2p+Ch+YcQa+DbEWA/KUj3coUTIiNP5XnRCLRUYADdlxjQ==}
cpu: [x64]
os: [win32]
requiresBuild: true
dev: true
optional: true
- resolution: {integrity: sha512-LzjOUzveWkvTD0jP8DBMYiAnYemmydsvqxdSmsUapHHJkl6wKZIOQNSO7pxsy+9XM/1/+0f9Y9F9ZNl5lePTEA==}
+ resolution: {integrity: sha512-4jWUaI7Lmonp2I3x81GruiCYd0aQsG/xDOYhuv9+j2yIgB/UHJFz/P8PWp/nziwPtGpRd/AheDlPzzyd9lWoqw==}
cpu: [arm64]
os: [win32]
requiresBuild: true
dev: true
optional: true
- resolution: {integrity: sha512-cwympNwQNnQZ/TffBd8yT0i0O10Cf/hlxccCYgUcwhcGEb9rDjE5thDbHoHw1hlJQUF/5ua7ERJe7Zr0lNE/ww==}
+ resolution: {integrity: sha512-6IOOaa8ytgjnSCTnp3LKAd2uGBZ/Kmx8ZPlI/YMWuKMUqvkXKLbh+w76ApMgMm+faUqti+QujVWovCu2kY6KuQ==}
hasBin: true
requiresBuild: true
optionalDependencies:
- turbo-darwin-64: 1.7.0
- turbo-darwin-arm64: 1.7.0
- turbo-linux-64: 1.7.0
- turbo-linux-arm64: 1.7.0
- turbo-windows-64: 1.7.0
- turbo-windows-arm64: 1.7.0
+ turbo-darwin-64: 1.8.6
+ turbo-darwin-arm64: 1.8.6
+ turbo-linux-64: 1.8.6
+ turbo-linux-arm64: 1.8.6
+ turbo-windows-64: 1.8.6
+ turbo-windows-arm64: 1.8.6
dev: true
diff --git a/turbo.json b/turbo.json
index ff75c36006..e98e743788 100644
--- a/turbo.json
+++ b/turbo.json
@@ -1,17 +1,20 @@
{
"$schema": "https://turbo.build/schema.json",
+ "globalEnv": ["AUTH_SECRET", "DATABASE_URL"],
"pipeline": {
"build": {
"dependsOn": ["^build"],
"outputs": ["lib/**", "dist/**", "build/**", "api/**", "public/build/**"]
},
"checks": {
- "dependsOn": ["^checks"],
- "outputs": []
+ "dependsOn": ["^checks"]
},
"storybook:build": {
- "dependsOn": ["@webstudio-is/icons#build"],
- "cache": false
+ "dependsOn": ["build"],
+ "outputs": ["storybook-static/**"]
+ },
+ "size-test": {
+ "dependsOn": ["^build"]
}
}
}