Merge branch 'main' into dsw-2307-pie-radio

Author: xander-marjoram

.changeset/neat-forks-add.md

@@ -0,0 +1,5 @@
+---
+"pie-docs": minor
+---
+
+[Changed] - Use only css to apply columns to docs site contents tables

.changeset/ninety-monkeys-run.md

@@ -0,0 +1,8 @@
+---
+"pie-storybook": patch
+"pie-docs": patch
+"pie-monorepo": patch
+---
+
+[Changed] - Add caching for `generate:component-statuses` build.
+[Added] - New `copy:component-statuses` script for `pie-docs` and `pie-storybook` which copies the status file from the root.

apps/pie-docs/package.json

@@ -12,7 +12,7 @@
     "build:dev": "DEPLOYMENT_ENVIRONMENT='development' eleventy",
     "clean": "run -T rimraf dist",
     "dev": "npx @11ty/eleventy --serve --port=8080",
-    "generate:component-statuses": "npx generate-component-statuses",
+    "copy:component-statuses": "cp -v ../../component-statuses.json .",
     "lint:scripts": "run -T eslint .",
     "lint:scripts:fix": "run -T eslint . --fix",
     "lint:style": "run -T stylelint ./src/**/*.{css,scss}",

apps/pie-docs/src/assets/js/contents.js

@@ -14,6 +14,4 @@ window.addEventListener('DOMContentLoaded', () => {
             item.setAttribute('data-title', textContent);
         }
     });
-
-    list[0].style.setProperty('--column-count', columns);
 });

apps/pie-docs/src/assets/styles/components/_contentList.scss

@@ -13,14 +13,14 @@ $tooltip-border-radius: 100px;
     max-width: $contentList-maxWidth;
 
     ol {
-        column-width: $contentList-column-width 1;
         column-gap: var(--dt-spacing-f);
         padding: 0;
         column-fill: auto;
+        column-count: 1;
 
         @include f.media('>=mid') {
             max-height: $contentList-maxHeight;
-            column-count: var(--column-count);
+            column-count: 3;
         }
     }
 

apps/pie-docs/turbo.json

@@ -13,7 +13,7 @@
       "dependsOn": [
         "^build",
         "clean",
-        "generate:component-statuses"
+        "copy:component-statuses"
       ],
       "outputs": [
         "dist/**"
@@ -23,7 +23,7 @@
       "cache": true,
       "dependsOn": [
         "^build",
-        "generate:component-statuses"
+        "copy:component-statuses"
       ]
     },
     "dev": {
@@ -32,6 +32,12 @@
         "build:dev"
       ]
     },
+    "copy:component-statuses": {
+      "dependsOn": [
+        "//#generate:component-statuses"
+      ],
+      "cache": false
+    },
     "test:generate-routes": {
       "cache": true,
       "dependsOn": [

apps/pie-storybook/package.json

@@ -8,7 +8,7 @@
     "build": "storybook build --output-dir dist && cp -R ./static ./dist",
     "lint:scripts": "run -T eslint .",
     "lint:scripts:fix": "run -T eslint . --fix",
-    "generate:component-statuses": "npx generate-component-statuses"
+    "copy:component-statuses": "cp -v ../../component-statuses.json ."
   },
   "author": "Just Eat Takeaway.com - Design System Team",
   "license": "Apache-2.0",

apps/pie-storybook/turbo.json

@@ -8,15 +8,21 @@
       "cache": false,
       "dependsOn": [
         "^build",
-        "generate:component-statuses"
+        "copy:component-statuses"
       ]
     },
     "build": {
       "cache": true,
       "dependsOn": [
         "^build",
-        "generate:component-statuses"
+        "copy:component-statuses"
       ]
+    },
+    "copy:component-statuses": {
+      "dependsOn": [
+        "//#generate:component-statuses"
+      ],
+      "cache": false
     }
   }
 }

package.json

@@ -34,6 +34,7 @@
     "clean": "turbo run clean --filter=!pie-monorepo",
     "cz": "./packages/tools/pie-git-hooks-scripts/check-branch-name.js $(git symbolic-ref --short HEAD) && ./node_modules/cz-customizable/standalone.js",
     "dev": "turbo run dev --filter=!pie-monorepo",
+    "copy:component-statuses": "cross-env-shell turbo run copy:component-statuses --filter=!pie-monorepo",
     "generate:component-statuses": "npx generate-component-statuses",
     "generate:examples": "cross-env-shell turbo run generate:examples --filter=!pie-monorepo --token=${TURBO_TOKEN}",
     "lint:config:fix": "eslint --fix turbo.json (packages|apps)/**/turbo.json",

turbo.json

@@ -6,7 +6,7 @@
       "dependsOn": [
         "^build",
         "build:react-wrapper",
-        "generate:component-statuses"
+        "//#generate:component-statuses"
       ],
       "outputs": [
         "dist/**"
@@ -55,12 +55,19 @@
         ".output/**"
       ]
     },
-    "generate:component-statuses": {
-      "cache": false,
+    "//#generate:component-statuses": {
+      "cache": true,
+      "inputs": [
+        "packages/components/**/package.json",
+        "!packages/components/pie-webc",
+        "!packages/components/pie-webc-core",
+        "!packages/components/pie-webc-testing"
+      ],
       "outputs": [
-        "**/component-statuses.json"
+        "component-statuses.json"
       ]
     },
+    "copy:component-statuses": {},
     "watch": {
       "cache": true,
       "dependsOn": []
@@ -167,7 +174,7 @@
       "cache": false,
       "dependsOn": [
         "^build",
-        "generate:component-statuses"
+        "//#generate:component-statuses"
       ]
     }
   }