Merge pull request #157 from Financial-Times/updateToolkit

Update to toolkit v4

.circleci/config.yml

@@ -1,7 +1,7 @@
 # CONFIG GENERATED BY DOTCOM-TOOL-KIT, DO NOT EDIT BY HAND
 version: 2.1
 orbs:
-  tool-kit: financial-times/dotcom-tool-kit@4
+  tool-kit: financial-times/dotcom-tool-kit@5
 executors:
   node:
     docker:
@@ -12,8 +12,10 @@ jobs:
       - image: cimg/base:stable
     steps:
       - checkout
-      - tool-kit/persist-workspace:
-          path: .
+      - persist_to_workspace:
+          root: .
+          paths:
+            - .
 workflows:
   tool-kit:
     when:
@@ -26,56 +28,29 @@ workflows:
           filters:
             tags:
               only: /^v\d+\.\d+\.\d+(-.+)?/
-      - waiting-for-approval:
-          type: approval
-          filters:
-            branches:
-              only: /(^renovate-.*|^nori/.*)/
       - tool-kit/setup:
-          name: tool-kit/setup-<< matrix.executor >>
+          executor: node
           requires:
             - checkout
-            - waiting-for-approval
-          matrix:
-            parameters:
-              executor:
-                - node
           filters:
             tags:
               only: /^v\d+\.\d+\.\d+(-.+)?/
       - tool-kit/build:
-          name: tool-kit/build-<< matrix.executor >>
+          executor: node
           requires:
-            - tool-kit/setup-<< matrix.executor >>
-          matrix:
-            parameters:
-              executor:
-                - node
-          filters:
-            tags:
-              only: /^v\d+\.\d+\.\d+(-.+)?/
+            - tool-kit/setup
       - tool-kit/test:
-          name: tool-kit/test-<< matrix.executor >>
+          executor: node
           requires:
-            - tool-kit/build-<< matrix.executor >>
-          matrix:
-            parameters:
-              executor:
-                - node
-          filters:
-            tags:
-              only: /^v\d+\.\d+\.\d+(-.+)?/
+            - tool-kit/build
       - tool-kit/publish-tag:
-          requires:
-            - tool-kit/test-node
-          name: tool-kit/publish-tag-node
           executor: node
+          requires:
+            - tool-kit/test
+          context: npm-publish-token
           filters:
-            tags:
-              only: /^v\d+\.\d+\.\d+(-.+)?/
             branches:
               ignore: /.*/
-          context: npm-publish-token
   nightly:
     when:
       and:
@@ -88,26 +63,14 @@ workflows:
     jobs:
       - checkout
       - tool-kit/setup:
-          name: tool-kit/setup-<< matrix.executor >>
+          executor: node
           requires:
             - checkout
-          matrix:
-            parameters:
-              executor:
-                - node
       - tool-kit/build:
-          name: tool-kit/build-<< matrix.executor >>
+          executor: node
           requires:
-            - tool-kit/setup-<< matrix.executor >>
-          matrix:
-            parameters:
-              executor:
-                - node
+            - tool-kit/setup
       - tool-kit/test:
-          name: tool-kit/test-<< matrix.executor >>
+          executor: node
           requires:
-            - tool-kit/build-<< matrix.executor >>
-          matrix:
-            parameters:
-              executor:
-                - node
+            - tool-kit/build

.toolkitrc.yml

@@ -3,15 +3,18 @@ plugins:
   - "@dotcom-tool-kit/component"
   - "@dotcom-tool-kit/jest"
   - "@dotcom-tool-kit/eslint"
-hooks:
+commands:
   test:local:
     - Eslint
-    - JestLocal
+    - Jest
   test:ci:
-    - JestCI
+    - Jest:
+        ci: true
   build:local:
-    - WebpackDevelopment
+    - Webpack:
+        envName: 'development'
+
 options:
-  '@dotcom-tool-kit/circleci':
-    nodeVersion:
-      - '22.12-browsers'
+  plugins:
+    '@dotcom-tool-kit/circleci':
+      cimgNodeVersions: [22.12-browsers]