From 9942f2cf88be372ce7553c3162b09a01b5c8b6d5 Mon Sep 17 00:00:00 2001
From: jptaranto <jacktaranto@gmail.com>
Date: Thu, 1 Aug 2024 11:46:36 +1000
Subject: [PATCH 1/6] use npm commands, dont unit test, allow storybook persist

---
 src/jobs/build_frontend.yml | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/src/jobs/build_frontend.yml b/src/jobs/build_frontend.yml
index 9e34611..0556671 100644
--- a/src/jobs/build_frontend.yml
+++ b/src/jobs/build_frontend.yml
@@ -1,17 +1,16 @@
 description: |
-  Build the Drupal front-end.
+  Build the front-end.
 
-  The following Make targets are required and will be called:
-   - init-frontend
-   - lint-frontend
-   - build-frontend
+  The following npm commands are required and will be called:
+   - npm run lint
+   - npm run build
 
 parameters:
   executor:
     type: executor
     description: The executor to use.
-  theme_path:
-    description: The Drupal theme path.
+  storybook_path:
+    description: The Storybook build path.
     type: string
   library_path:
     description: The Drupal library path.
@@ -22,26 +21,22 @@ parameters:
     description: Initialise the front-end dependencies.
     default:
       - run:
-          name: Init
-          command: make init-frontend
+          name: Install
+          command: npm -q ci
   lint:
     type: steps
     description: Check the codebase against style guidelines.
     default:
       - run:
           name: Lint
-          command: make lint-frontend
+          command: npm run lint
   build:
     type: steps
     description: Build the front-end components.
     default:
       - run:
           name: Build
-          command: make build-frontend
-  unit-test:
-    type: steps
-    description: Run the front-end unit tests.
-    default: []
+          command: npm run build
   cache-version:
     description: An optional version number for cache dependencies, e.g. v1
     type: string
@@ -61,12 +56,9 @@ steps:
         - ~/.npm
   - steps: <<parameters.lint>>
   - steps: <<parameters.build>>
-  - steps: <<parameters.unit-test>>
   - persist_to_workspace:
       root: /data
       paths:
-        - app/styleguide
+        - <<parameters.storybook_path>>
         - <<parameters.library_path>>
-        - <<parameters.theme_path>>/css
-        - <<parameters.theme_path>>/js
         - node_modules

From 81401e04a1bb9582725a02d5fe4f08bd7d0cf312 Mon Sep 17 00:00:00 2001
From: jptaranto <jacktaranto@gmail.com>
Date: Thu, 1 Aug 2024 13:33:32 +1000
Subject: [PATCH 2/6] bump to 3.0

---
 src/@orb.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/@orb.yml b/src/@orb.yml
index d0b9a67..793b6ec 100755
--- a/src/@orb.yml
+++ b/src/@orb.yml
@@ -1,4 +1,4 @@
-version: 2.1
+version: 3.0
 
 description: >
   Use the standard PreviousNext build and test workflows.

From 0da4225bbe679ccda3eb9e7c21fda9fbaaaf8d7b Mon Sep 17 00:00:00 2001
From: jptaranto <jacktaranto@gmail.com>
Date: Thu, 1 Aug 2024 13:43:06 +1000
Subject: [PATCH 3/6] fix version

---
 src/@orb.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/@orb.yml b/src/@orb.yml
index 793b6ec..d0b9a67 100755
--- a/src/@orb.yml
+++ b/src/@orb.yml
@@ -1,4 +1,4 @@
-version: 3.0
+version: 2.1
 
 description: >
   Use the standard PreviousNext build and test workflows.

From 8b4cce38e1cba19f3bc068cae3610102bcadb24b Mon Sep 17 00:00:00 2001
From: jptaranto <jacktaranto@gmail.com>
Date: Thu, 1 Aug 2024 13:43:14 +1000
Subject: [PATCH 4/6] update build_frontend example

---
 src/examples/example.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/examples/example.yml b/src/examples/example.yml
index 0239003..5f0d8f1 100755
--- a/src/examples/example.yml
+++ b/src/examples/example.yml
@@ -15,8 +15,8 @@ usage:
             context: skpr-example
             executor:
               name: drupal/node
-              tag: 14-1.x
-            theme_path: app/themes/mytheme
+              tag: 20-v2-edge
+            storybook_path: app/storybook
             library_path: app/libraries/mylibrary
         - drupal/build_backend:
             context: skpr-example

From f3ce1bd3e49b611711503133a559824107136fd2 Mon Sep 17 00:00:00 2001
From: jptaranto <jacktaranto@gmail.com>
Date: Thu, 1 Aug 2024 13:43:25 +1000
Subject: [PATCH 5/6] remove nightwatch from drupal/test

---
 src/jobs/test.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/jobs/test.yml b/src/jobs/test.yml
index bb8ba63..4b57160 100644
--- a/src/jobs/test.yml
+++ b/src/jobs/test.yml
@@ -4,7 +4,6 @@ description: |
   The following Make targets will be called by default:
    - deploy
    - test-init
-   - ci-nightwatch
 
   The default test step assumes you have installed the
   https://packagist.org/packages/previousnext/phpunit-finder package.
@@ -37,9 +36,6 @@ parameters:
       - run:
           name: "Test: Application"
           command: for i in `./bin/phpunit-finder | circleci tests split --split-by=timings`; do /bin/bash -c "./bin/phpunit $i --log-junit $(pwd)/build/logs/phpunit/$(basename $i).xml"; done
-      - run:
-          name: "Test: Nightwatch"
-          command: make ci-nightwatch
   post-test:
     type: steps
     description: Provide any optional post-test steps you would like to run.
@@ -69,7 +65,4 @@ steps:
   - store_artifacts:
       path: app/sites/simpletest
       destination: tr1
-  - store_artifacts:
-      path: build/logs/nightwatch
-      destination: tr1
   - steps: <<parameters.post-test>>

From 94f228aad0ea07b1866b80c697947175074546dd Mon Sep 17 00:00:00 2001
From: jptaranto <jacktaranto@gmail.com>
Date: Thu, 1 Aug 2024 14:42:45 +1000
Subject: [PATCH 6/6] [semver:major] Version bump