chore: update turbo to version 2

mistic100 · Nov 8, 2024 · a51554c · a51554c
1 parent 80207ed
commit a51554c
Show file tree

Hide file tree

Showing 10 changed files with 106 additions and 99 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -50,9 +50,7 @@ jobs:
         uses: ./.github/workflows/shared/setup
 
       - name: e2e
-        run: |
-          yarn ci:build
-          yarn ci:e2e
+        run: yarn ci:e2e
 
       - name: test summary
         uses: phoenix-actions/test-reporting@v15

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -28,4 +28,4 @@ jobs:
         uses: ./.github/workflows/shared/setup
 
       - name: build
-        run: yarn ci:build-doc
+        run: yarn doc:build
diff --git a/build/select-packages.mjs b/build/select-packages.mjs
@@ -26,6 +26,6 @@ prompt([
         choices: [{ value: 'core', checked: true }, ...packages],
     },
 ]).then((answers) => {
-    const filters = ['//', ...answers.packages].map((p) => `--filter=${p}`).join(' ');
-    process.stdout.write(filters);
+    const filters = answers.packages.map((p) => `--filter=@photo-sphere-viewer/${p}`).join(' ');
+    process.stdout.write(`--filter=// ${filters}`);
 });
diff --git a/cypress/package.json b/cypress/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "photo-sphere-viewer-e2e",
+  "name": "@photo-sphere-viewer/e2e",
   "version": "0.0.0",
   "private": true,
   "license": "MIT",

diff --git a/docs/package.json b/docs/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "photo-sphere-viewer-doc",
+  "name": "@photo-sphere-viewer/docs",
   "version": "0.0.0",
   "private": true,
   "license": "MIT",

diff --git a/package.json b/package.json
@@ -1,8 +1,9 @@
 {
-  "name": "photo-sphere-viewer",
+  "name": "@photo-sphere-viewer/parent",
   "version": "0.0.0",
   "private": true,
   "license": "MIT",
+  "packageManager": "[email protected]",
   "workspaces": [
     "docs",
     "cypress",
@@ -17,11 +18,10 @@
     "serve": "turbo run watch --concurrency 50",
     "serve:filter": "run() { read filters; turbo run watch --concurrency 50 $filters; }; FORCE_COLOR=true node ./build/select-packages.mjs | run",
     "npm-link": "turbo run npm-link --output-logs=new-only",
-    "doc:build": "turbo run build-doc --force",
+    "doc:build": "turbo run build-doc",
     "doc:serve": "turbo run serve-doc",
-    "ci:build": "turbo run lint build test --cache-dir=.turbo",
-    "ci:build-doc": "turbo run build-doc --cache-dir=.turbo",
-    "ci:e2e": "node ./build/start-and-test.mjs \"watch --e2e\" e2e:run",
+    "ci:build": "turbo run lint build test",
+    "ci:e2e": "yarn build && node ./build/start-and-test.mjs \"watch --e2e\" \"e2e:run\"",
     "ci:version": "set-versions --workspaces",
     "ci:publish": "turbo run publish-dist --concurrency=1",
     "e2e:open": "cypress open --e2e --browser=electron",
@@ -56,7 +56,7 @@
     "ts-node": "^10.9.1",
     "tsc": "^2.0.4",
     "tsup": "^8.3.0",
-    "turbo": "^1.13.3",
+    "turbo": "^2.2.3",
     "typedoc": "^0.26.7",
     "typedoc-plugin-extras": "^3.1.0",
     "typescript": "^5.6.2"

diff --git a/packages/shared/tests/generate-typedoc-readme.spec.ts b/packages/shared/tests/generate-typedoc-readme.spec.ts
@@ -6,6 +6,10 @@ import assert from 'assert';
 const testDir = path.join(__dirname, 'fixtures/generate-typedoc-readme');
 
 describe('generate-typedoc-readme', () => {
+    beforeEach(() => {
+        execSync(`git clean -Xdf`, { cwd: testDir });
+    });
+
     it('should generate the readme', () => {
         execSync(`node ${path.join(__dirname, '../../../build/generate-typedoc-readme.mjs')}`, { cwd: testDir });
 

diff --git a/packages/shared/tests/prepare-changelog.spec.ts b/packages/shared/tests/prepare-changelog.spec.ts
@@ -1,11 +1,15 @@
-import { exec } from 'child_process';
+import assert from 'assert';
+import { exec, execSync } from 'child_process';
 import { readFileSync } from 'fs';
 import path from 'path';
-import assert from 'assert';
 
 const testDir = path.join(__dirname, 'fixtures/prepare-changelog');
 
 describe('prepare-changelog', () => {
+    beforeEach(() => {
+        execSync(`git clean -Xdf`, { cwd: testDir });
+    });
+
     it('should generate the changelog', (done) => {
         const gitLog = readFileSync(path.join(testDir, 'git-log.txt'), { encoding: 'utf8' });
 

diff --git a/turbo.json b/turbo.json
@@ -7,25 +7,38 @@
     ".stylelintrc.json",
     "packages/shared/*.{ts,scss,glsl}"
   ],
-  "pipeline": {
+  "tasks": {
     "build": {
-      "dependsOn": ["^build"],
-      "inputs": ["src/**"],
-      "outputs": ["dist/**"]
+      "dependsOn": [
+        "^build"
+      ],
+      "inputs": [
+        "src/**"
+      ],
+      "outputs": [
+        "dist/**"
+      ]
     },
     "lint": {
-      "inputs": ["src/**"]
+      "inputs": [
+        "src/**"
+      ]
     },
-    "photo-sphere-viewer-e2e#lint": {
-      "inputs": ["e2e/**", "support/**", "utils/**"]
+    "@photo-sphere-viewer/e2e#lint": {
+      "inputs": [
+        "e2e/**",
+        "support/**",
+        "utils/**"
+      ]
     },
     "test": {
-      "inputs": ["src/**"],
-      "outputs": ["reports/**"]
-    },
-    "build-doc": {},
-    "//#build-doc": {
-      "dependsOn": ["photo-sphere-viewer-doc#build-doc"]
+      "inputs": [
+        "src/**",
+        "tests/**"
+      ],
+      "outputs": [
+        "reports/**"
+      ]
     },
     "watch": {
       "cache": false,
@@ -35,15 +48,28 @@
       "cache": false,
       "persistent": true
     },
+    "build-doc": {
+      "cache": false
+    },
+    "//#build-doc": {
+      "dependsOn": [
+        "@photo-sphere-viewer/docs#build-doc"
+      ],
+      "cache": false
+    },
     "serve-doc": {
       "cache": false
     },
     "npm-link": {
-      "dependsOn": ["build"],
+      "dependsOn": [
+        "build"
+      ],
       "cache": false
     },
     "publish-dist": {
-      "dependsOn": ["^publish-dist"],
+      "dependsOn": [
+        "^publish-dist"
+      ],
       "cache": false
     }
   }

diff --git a/yarn.lock b/yarn.lock
@@ -5207,16 +5207,7 @@ stream-combiner@^0.2.2:
     duplexer "~0.1.1"
     through "~2.3.4"
 
-"string-width-cjs@npm:string-width@^4.2.0":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -5242,14 +5233,7 @@ stringify-entities@^4.0.0:
     character-entities-html4 "^2.0.0"
     character-entities-legacy "^3.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -5647,47 +5631,47 @@ tunnel-agent@^0.6.0:
   dependencies:
     safe-buffer "^5.0.1"
 
-turbo-darwin-64@1.13.3:
-  version "1.13.3"
-  resolved "https://registry.yarnpkg.com/turbo-darwin-64/-/turbo-darwin-64-1.13.3.tgz#01d750e0f9ce4fced510357f1a9f7fe6312756ba"
-  integrity sha512-glup8Qx1qEFB5jerAnXbS8WrL92OKyMmg5Hnd4PleLljAeYmx+cmmnsmLT7tpaVZIN58EAAwu8wHC6kIIqhbWA==
-
-turbo-darwin-arm64@1.13.3:
-  version "1.13.3"
-  resolved "https://registry.yarnpkg.com/turbo-darwin-arm64/-/turbo-darwin-arm64-1.13.3.tgz#a99950c8aff83d14070eeca987b0ee53dc881b2d"
-  integrity sha512-/np2xD+f/+9qY8BVtuOQXRq5f9LehCFxamiQnwdqWm5iZmdjygC5T3uVSYuagVFsZKMvX3ycySwh8dylGTl6lg==
-
-turbo-linux-64@1.13.3:
-  version "1.13.3"
-  resolved "https://registry.yarnpkg.com/turbo-linux-64/-/turbo-linux-64-1.13.3.tgz#a8ea12c3d79f5bbc78b2ef37f47019edb8928219"
-  integrity sha512-G+HGrau54iAnbXLfl+N/PynqpDwi/uDzb6iM9hXEDG+yJnSJxaHMShhOkXYJPk9offm9prH33Khx2scXrYVW1g==
-
-turbo-linux-arm64@1.13.3:
-  version "1.13.3"
-  resolved "https://registry.yarnpkg.com/turbo-linux-arm64/-/turbo-linux-arm64-1.13.3.tgz#e8691ebfab0e31e276020deee83b3866b4eb966f"
-  integrity sha512-qWwEl5VR02NqRyl68/3pwp3c/olZuSp+vwlwrunuoNTm6JXGLG5pTeme4zoHNnk0qn4cCX7DFrOboArlYxv0wQ==
-
-turbo-windows-64@1.13.3:
-  version "1.13.3"
-  resolved "https://registry.yarnpkg.com/turbo-windows-64/-/turbo-windows-64-1.13.3.tgz#6629174c8f654e75c342a0e1b826620cb6e2795b"
-  integrity sha512-Nudr4bRChfJzBPzEmpVV85VwUYRCGKecwkBFpbp2a4NtrJ3+UP1VZES653ckqCu2FRyRuS0n03v9euMbAvzH+Q==
-
-turbo-windows-arm64@1.13.3:
-  version "1.13.3"
-  resolved "https://registry.yarnpkg.com/turbo-windows-arm64/-/turbo-windows-arm64-1.13.3.tgz#327b8c87d8a01533deb3b7c3a108855aa7b6611d"
-  integrity sha512-ouJCgsVLd3icjRLmRvHQDDZnmGzT64GBupM1Y+TjtYn2LVaEBoV6hicFy8x5DUpnqdLy+YpCzRMkWlwhmkX7sQ==
-
-turbo@^1.13.3:
-  version "1.13.3"
-  resolved "https://registry.yarnpkg.com/turbo/-/turbo-1.13.3.tgz#afb7bee4fa9f5b6041dac5b4a7d35fb98f279827"
-  integrity sha512-n17HJv4F4CpsYTvKzUJhLbyewbXjq1oLCi90i5tW1TiWDz16ML1eDG7wi5dHaKxzh5efIM56SITnuVbMq5dk4g==
+turbo-darwin-64@2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/turbo-darwin-64/-/turbo-darwin-64-2.2.3.tgz#f0ced75ed031091e52851cbe8bb05d21a161a22b"
+  integrity sha512-Rcm10CuMKQGcdIBS3R/9PMeuYnv6beYIHqfZFeKWVYEWH69sauj4INs83zKMTUiZJ3/hWGZ4jet9AOwhsssLyg==
+
+turbo-darwin-arm64@2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/turbo-darwin-arm64/-/turbo-darwin-arm64-2.2.3.tgz#0b4741383ab5070d8383891a65861a8869cc7202"
+  integrity sha512-+EIMHkuLFqUdJYsA3roj66t9+9IciCajgj+DVek+QezEdOJKcRxlvDOS2BUaeN8kEzVSsNiAGnoysFWYw4K0HA==
+
+turbo-linux-64@2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/turbo-linux-64/-/turbo-linux-64-2.2.3.tgz#2b339db50c12bc52ce99139c156d5555717a209d"
+  integrity sha512-UBhJCYnqtaeOBQLmLo8BAisWbc9v9daL9G8upLR+XGj6vuN/Nz6qUAhverN4Pyej1g4Nt1BhROnj6GLOPYyqxQ==
+
+turbo-linux-arm64@2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/turbo-linux-arm64/-/turbo-linux-arm64-2.2.3.tgz#a4daf6e0872a4e2652e2d05d68ad18cee5b10e94"
+  integrity sha512-hJYT9dN06XCQ3jBka/EWvvAETnHRs3xuO/rb5bESmDfG+d9yQjeTMlhRXKrr4eyIMt6cLDt1LBfyi+6CQ+VAwQ==
+
+turbo-windows-64@2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/turbo-windows-64/-/turbo-windows-64-2.2.3.tgz#d44b3385948bd0f2ef5c2d53391f142bdd467b18"
+  integrity sha512-NPrjacrZypMBF31b4HE4ROg4P3nhMBPHKS5WTpMwf7wydZ8uvdEHpESVNMOtqhlp857zbnKYgP+yJF30H3N2dQ==
+
+turbo-windows-arm64@2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/turbo-windows-arm64/-/turbo-windows-arm64-2.2.3.tgz#d0625ec53f467013a6f259f87f7fc4ae8670aaa4"
+  integrity sha512-fnNrYBCqn6zgKPKLHu4sOkihBI/+0oYFr075duRxqUZ+1aLWTAGfHZLgjVeLh3zR37CVzuerGIPWAEkNhkWEIw==
+
+turbo@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/turbo/-/turbo-2.2.3.tgz#0f45612d62526c98c75da0682aa8c26b902b5e07"
+  integrity sha512-5lDvSqIxCYJ/BAd6rQGK/AzFRhBkbu4JHVMLmGh/hCb7U3CqSnr5Tjwfy9vc+/5wG2DJ6wttgAaA7MoCgvBKZQ==
   optionalDependencies:
-    turbo-darwin-64 "1.13.3"
-    turbo-darwin-arm64 "1.13.3"
-    turbo-linux-64 "1.13.3"
-    turbo-linux-arm64 "1.13.3"
-    turbo-windows-64 "1.13.3"
-    turbo-windows-arm64 "1.13.3"
+    turbo-darwin-64 "2.2.3"
+    turbo-darwin-arm64 "2.2.3"
+    turbo-linux-64 "2.2.3"
+    turbo-linux-arm64 "2.2.3"
+    turbo-windows-64 "2.2.3"
+    turbo-windows-arm64 "2.2.3"
 
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
@@ -6001,7 +5985,7 @@ workerpool@^6.5.1:
   resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544"
   integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -6019,15 +6003,6 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"