chore(fix): Github runner killed

mistic100 · Nov 11, 2024 · 7522b29 · 7522b29
1 parent 8e1a186
commit 7522b29
Show file tree

Hide file tree

Showing 22 changed files with 30 additions and 27 deletions.
diff --git a/build/templates/package.ts b/build/templates/package.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import sortPackageJson, { sortOrder } from 'sort-package-json';
 
 sortOrder.splice(sortOrder.indexOf('style') + 1, 0, 'sass');
@@ -25,6 +26,8 @@ export const packageJson = (pkg: any) => {
             homepage: 'https://www.strangeplanet.fr',
         },
         keywords: ['photosphere', 'panorama', 'threejs', ...(pkg.keywords || [])],
+        dependencies: _.pickBy(pkg.dependencies, (val, key) => !key.startsWith('@photo-sphere-viewer')),
+        peerDependencies: _.pickBy(pkg.dependencies, (val, key) => key.startsWith('@photo-sphere-viewer')),
     };
 
     if (pkg.psv.style) {

diff --git a/cypress.config.ts b/cypress.config.ts
@@ -1,5 +1,5 @@
 
-import fs from 'fs';
+import fs from 'fs-extra';
 import registerCodeCoverageTasks from '@cypress/code-coverage/task';
 import { defineConfig } from 'cypress';
 // @ts-ignore
@@ -21,7 +21,7 @@ export default defineConfig({
         setupNodeEvents(on, config) {
             on = cypressOnFix(on);
 
-            fs.rmdirSync('.nyc_output', { recursive: true });
+            fs.removeSync('.nyc_output');
 
             registerCodeCoverageTasks(on, config);
             configureVisualRegression(on);

diff --git a/package.json b/package.json
@@ -21,8 +21,8 @@
     "npm-link": "turbo run npm-link --output-logs=new-only",
     "doc:build": "turbo run build-doc",
     "doc:serve": "turbo run serve-doc",
-    "ci:build": "turbo run lint build test",
-    "ci:e2e": "turbo run build instrument -- --env.E2E && node ./build/start-and-test.mjs \"watch --e2e\" \"e2e:run\"",
+    "ci:build": "turbo run lint build test --concurrency=100%",
+    "ci:e2e": "turbo run build instrument --concurrency=100% -- --env.E2E && 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",

diff --git a/packages/autorotate-plugin/package.json b/packages/autorotate-plugin/package.json
@@ -10,7 +10,7 @@
     "virtual-tour",
     "keypoint"
   ],
-  "peerDependencies": {
+  "dependencies": {
     "@photo-sphere-viewer/core": "0.0.0"
   },
   "scripts": {

diff --git a/packages/compass-plugin/package.json b/packages/compass-plugin/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
-  "peerDependencies": {
+  "dependencies": {
     "@photo-sphere-viewer/core": "0.0.0"
   },
   "scripts": {

diff --git a/packages/cubemap-adapter/package.json b/packages/cubemap-adapter/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
-  "peerDependencies": {
+  "dependencies": {
     "@photo-sphere-viewer/core": "0.0.0"
   },
   "scripts": {

diff --git a/packages/cubemap-tiles-adapter/package.json b/packages/cubemap-tiles-adapter/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
-  "peerDependencies": {
+  "dependencies": {
     "@photo-sphere-viewer/core": "0.0.0",
     "@photo-sphere-viewer/cubemap-adapter": "0.0.0"
   },

diff --git a/packages/cubemap-video-adapter/package.json b/packages/cubemap-video-adapter/package.json
@@ -6,8 +6,9 @@
   "license": "MIT",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
-  "peerDependencies": {
-    "@photo-sphere-viewer/core": "0.0.0"
+  "dependencies": {
+    "@photo-sphere-viewer/core": "0.0.0",
+    "@photo-sphere-viewer/video-plugin": "0.0.0"
   },
   "scripts": {
     "build": "tsup",

diff --git a/packages/equirectangular-tiles-adapter/package.json b/packages/equirectangular-tiles-adapter/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
-  "peerDependencies": {
+  "dependencies": {
     "@photo-sphere-viewer/core": "0.0.0"
   },
   "scripts": {

diff --git a/packages/equirectangular-video-adapter/package.json b/packages/equirectangular-video-adapter/package.json
@@ -6,8 +6,9 @@
   "license": "MIT",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
-  "peerDependencies": {
-    "@photo-sphere-viewer/core": "0.0.0"
+  "dependencies": {
+    "@photo-sphere-viewer/core": "0.0.0",
+    "@photo-sphere-viewer/video-plugin": "0.0.0"
   },
   "scripts": {
     "build": "tsup",

diff --git a/packages/gallery-plugin/package.json b/packages/gallery-plugin/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
-  "peerDependencies": {
+  "dependencies": {
     "@photo-sphere-viewer/core": "0.0.0"
   },
   "scripts": {

diff --git a/packages/gyroscope-plugin/package.json b/packages/gyroscope-plugin/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
-  "peerDependencies": {
+  "dependencies": {
     "@photo-sphere-viewer/core": "0.0.0"
   },
   "scripts": {

diff --git a/packages/map-plugin/package.json b/packages/map-plugin/package.json
@@ -10,7 +10,7 @@
     "plan",
     "cartography"
   ],
-  "peerDependencies": {
+  "dependencies": {
     "@photo-sphere-viewer/core": "0.0.0"
   },
   "scripts": {

diff --git a/packages/markers-plugin/package.json b/packages/markers-plugin/package.json
@@ -12,7 +12,7 @@
     "polygon",
     "green-screen"
   ],
-  "peerDependencies": {
+  "dependencies": {
     "@photo-sphere-viewer/core": "0.0.0"
   },
   "scripts": {

diff --git a/packages/overlays-plugin/package.json b/packages/overlays-plugin/package.json
@@ -10,7 +10,7 @@
     "video",
     "green-screen"
   ],
-  "peerDependencies": {
+  "dependencies": {
     "@photo-sphere-viewer/core": "0.0.0"
   },
   "scripts": {

diff --git a/packages/plan-plugin/package.json b/packages/plan-plugin/package.json
@@ -12,14 +12,12 @@
     "cartography"
   ],
   "dependencies": {
+    "@photo-sphere-viewer/core": "0.0.0",
     "leaflet": "^1.9.4"
   },
   "devDependencies": {
     "@types/leaflet": "^1.9.8"
   },
-  "peerDependencies": {
-    "@photo-sphere-viewer/core": "0.0.0"
-  },
   "scripts": {
     "build": "tsup",
     "watch": "tsup --watch",

diff --git a/packages/resolution-plugin/package.json b/packages/resolution-plugin/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
-  "peerDependencies": {
+  "dependencies": {
     "@photo-sphere-viewer/core": "0.0.0",
     "@photo-sphere-viewer/settings-plugin": "0.0.0"
   },

diff --git a/packages/settings-plugin/package.json b/packages/settings-plugin/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
-  "peerDependencies": {
+  "dependencies": {
     "@photo-sphere-viewer/core": "0.0.0"
   },
   "scripts": {

diff --git a/packages/stereo-plugin/package.json b/packages/stereo-plugin/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
-  "peerDependencies": {
+  "dependencies": {
     "@photo-sphere-viewer/core": "0.0.0",
     "@photo-sphere-viewer/gyroscope-plugin": "0.0.0"
   },

diff --git a/packages/video-plugin/package.json b/packages/video-plugin/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
-  "peerDependencies": {
+  "dependencies": {
     "@photo-sphere-viewer/core": "0.0.0"
   },
   "scripts": {

diff --git a/packages/virtual-tour-plugin/package.json b/packages/virtual-tour-plugin/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
-  "peerDependencies": {
+  "dependencies": {
     "@photo-sphere-viewer/core": "0.0.0"
   },
   "scripts": {

diff --git a/packages/visible-range-plugin/package.json b/packages/visible-range-plugin/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
-  "peerDependencies": {
+  "dependencies": {
     "@photo-sphere-viewer/core": "0.0.0"
   },
   "scripts": {