From 025ebc9309aab2d73eb31cb8c1cc6d2beae0c194 Mon Sep 17 00:00:00 2001 From: Charles de Dreuille Date: Tue, 25 Feb 2025 11:30:30 +0000 Subject: [PATCH 1/3] Remove side effects Signed-off-by: Charles de Dreuille --- packages/canon/.gitignore | 3 +++ packages/canon/package.json | 4 ++-- packages/canon/scripts/build-css.mjs | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/canon/.gitignore b/packages/canon/.gitignore index 86fa479d2f..e7c52ff306 100644 --- a/packages/canon/.gitignore +++ b/packages/canon/.gitignore @@ -1,2 +1,5 @@ # Build output storybook-static + +# CSS output +css diff --git a/packages/canon/package.json b/packages/canon/package.json index a4feb707fa..4b4f7b45e9 100644 --- a/packages/canon/package.json +++ b/packages/canon/package.json @@ -19,11 +19,11 @@ "directory": "packages/canon" }, "license": "Apache-2.0", - "sideEffects": false, "main": "src/index.ts", "types": "src/index.ts", "files": [ - "dist" + "dist", + "css" ], "scripts": { "build": "yarn build:app && yarn build:css", diff --git a/packages/canon/scripts/build-css.mjs b/packages/canon/scripts/build-css.mjs index f0ca17c73e..4ea38f8085 100644 --- a/packages/canon/scripts/build-css.mjs +++ b/packages/canon/scripts/build-css.mjs @@ -24,7 +24,7 @@ import { glob } from 'glob'; // Check if core.css and components.css exist const cssDir = 'src/css'; -const distDir = 'dist/css'; +const distDir = 'css'; const componentsDir = 'src/components'; // Core files From 5a5db2973fda54d635cf08797e3715305038cd86 Mon Sep 17 00:00:00 2001 From: Charles de Dreuille Date: Tue, 25 Feb 2025 11:36:05 +0000 Subject: [PATCH 2/3] Create angry-plants-peel.md Signed-off-by: Charles de Dreuille --- .changeset/angry-plants-peel.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/angry-plants-peel.md diff --git a/.changeset/angry-plants-peel.md b/.changeset/angry-plants-peel.md new file mode 100644 index 0000000000..a2abd76c4e --- /dev/null +++ b/.changeset/angry-plants-peel.md @@ -0,0 +1,5 @@ +--- +'@backstage/canon': minor +--- + +Fix CSS imports and move CSS outputs out of the dist folder. From 3ece69b174d3d35a364bd9f053ca651d910d0f82 Mon Sep 17 00:00:00 2001 From: Charles de Dreuille Date: Tue, 25 Feb 2025 11:47:13 +0000 Subject: [PATCH 3/3] Update package.json Signed-off-by: Charles de Dreuille --- packages/canon/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/canon/package.json b/packages/canon/package.json index 4b4f7b45e9..2eed0fbfd6 100644 --- a/packages/canon/package.json +++ b/packages/canon/package.json @@ -19,6 +19,7 @@ "directory": "packages/canon" }, "license": "Apache-2.0", + "sideEffects": true, "main": "src/index.ts", "types": "src/index.ts", "files": [