From 7c5e323c7fe930344481b86bdbdc0e2e28641606 Mon Sep 17 00:00:00 2001 From: Charles de Dreuille Date: Sun, 23 Mar 2025 16:52:50 +0000 Subject: [PATCH 1/2] Fix watch mode Signed-off-by: Charles de Dreuille --- package.json | 1 + packages/canon/package.json | 3 ++- yarn.lock | 31 ++++++++++++++++++++++++++++++- 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 083c70e483..2635dfb341 100644 --- a/package.json +++ b/package.json @@ -130,6 +130,7 @@ "@types/webpack": "^5.28.0", "array-to-table": "^1.0.1", "command-exists": "^1.2.9", + "concurrently": "^9.1.2", "cross-env": "^7.0.0", "e2e-test": "workspace:*", "eslint": "^8.6.0", diff --git a/packages/canon/package.json b/packages/canon/package.json index 5227e63fa5..411857d1a4 100644 --- a/packages/canon/package.json +++ b/packages/canon/package.json @@ -36,7 +36,7 @@ "lint": "backstage-cli package lint", "prepack": "backstage-cli package prepack", "postpack": "backstage-cli package postpack", - "start": "yarn build:css:watch && yarn storybook", + "start": "concurrently \"yarn build:css:watch\" \"yarn storybook\"", "storybook": "storybook dev -p 6006", "test": "backstage-cli package test" }, @@ -60,6 +60,7 @@ "@types/react": "^18.0.0", "@types/react-dom": "^18.0.0", "chalk": "^5.4.1", + "concurrently": "^9.1.2", "eslint-plugin-storybook": "^0.11.4", "glob": "^11.0.1", "globals": "^15.11.0", diff --git a/yarn.lock b/yarn.lock index bb1e6d2214..f0dadb8c9f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3794,6 +3794,7 @@ __metadata: "@types/react-dom": ^18.0.0 chalk: ^5.4.1 clsx: ^2.1.1 + concurrently: ^9.1.2 eslint-plugin-storybook: ^0.11.4 glob: ^11.0.1 globals: ^15.11.0 @@ -25314,6 +25315,24 @@ __metadata: languageName: node linkType: hard +"concurrently@npm:^9.1.2": + version: 9.1.2 + resolution: "concurrently@npm:9.1.2" + dependencies: + chalk: ^4.1.2 + lodash: ^4.17.21 + rxjs: ^7.8.1 + shell-quote: ^1.8.1 + supports-color: ^8.1.1 + tree-kill: ^1.2.2 + yargs: ^17.7.2 + bin: + conc: dist/bin/concurrently.js + concurrently: dist/bin/concurrently.js + checksum: 9e25e8ee6272ada26739aff1fb43e96ac458fafca82f45b8360bdd9115d60bbc679d282dfc52001b861b6e9f32b3063aed975691d8dec9e62807a9679763a1d8 + languageName: node + linkType: hard + "conf@npm:^10.2.0": version: 10.2.0 resolution: "conf@npm:10.2.0" @@ -42434,6 +42453,7 @@ __metadata: "@useoptic/optic": ^1.0.0 array-to-table: ^1.0.1 command-exists: ^1.2.9 + concurrently: ^9.1.2 cross-env: ^7.0.0 e2e-test: "workspace:*" eslint: ^8.6.0 @@ -42496,7 +42516,7 @@ __metadata: languageName: node linkType: hard -"rxjs@npm:7.8.1, rxjs@npm:^7.2.0, rxjs@npm:^7.5.5": +"rxjs@npm:7.8.1": version: 7.8.1 resolution: "rxjs@npm:7.8.1" dependencies: @@ -42514,6 +42534,15 @@ __metadata: languageName: node linkType: hard +"rxjs@npm:^7.2.0, rxjs@npm:^7.5.5, rxjs@npm:^7.8.1": + version: 7.8.2 + resolution: "rxjs@npm:7.8.2" + dependencies: + tslib: ^2.1.0 + checksum: 2f233d7c832a6c255dabe0759014d7d9b1c9f1cb2f2f0d59690fd11c883c9826ea35a51740c06ab45b6ade0d9087bde9192f165cba20b6730d344b831ef80744 + languageName: node + linkType: hard + "sade@npm:^1.7.3": version: 1.8.1 resolution: "sade@npm:1.8.1" From 1d7e840089c2c58bb26dd5b723fac8471b74917b Mon Sep 17 00:00:00 2001 From: Charles de Dreuille Date: Tue, 25 Mar 2025 11:34:03 +0000 Subject: [PATCH 2/2] Removed package Signed-off-by: Charles de Dreuille --- package.json | 1 - yarn.lock | 1 - 2 files changed, 2 deletions(-) diff --git a/package.json b/package.json index 2635dfb341..083c70e483 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,6 @@ "@types/webpack": "^5.28.0", "array-to-table": "^1.0.1", "command-exists": "^1.2.9", - "concurrently": "^9.1.2", "cross-env": "^7.0.0", "e2e-test": "workspace:*", "eslint": "^8.6.0", diff --git a/yarn.lock b/yarn.lock index f0dadb8c9f..2261bc2e38 100644 --- a/yarn.lock +++ b/yarn.lock @@ -42453,7 +42453,6 @@ __metadata: "@useoptic/optic": ^1.0.0 array-to-table: ^1.0.1 command-exists: ^1.2.9 - concurrently: ^9.1.2 cross-env: ^7.0.0 e2e-test: "workspace:*" eslint: ^8.6.0