Update v2.1.10 to v2.2.10 with the latest spec v2 changes.

.github/workflows/add-new-issues-and-pull-requests-to-origami-project-board.yml

@@ -2,7 +2,6 @@ name: Add new issues and pull requests to Origami Project Board
 on:
   - issues
   - pull_request_target
-  - pull_request
 
 jobs:
   origami_project_board_job:

.github/workflows/apply-labels.yml

@@ -2,7 +2,6 @@ name: Apply Origami labels
 on:
   - issues
   - pull_request_target
-  - pull_request
 jobs:
   apply-labels:
     runs-on: ubuntu-latest

.github/workflows/auto-approve.yml

@@ -1,12 +1,23 @@
 name: Auto Approve Dependabot PRs
 
-on: pull_request
+on:
+  pull_request_target:
+    types: [labeled]
 
 jobs:
-  auto-approve:
+  auto-update-dependabot:
+    name: Auto-Approve and enable Auto-Merge for all Dependabot PRs
     runs-on: ubuntu-latest
+    if: github.event.pull_request.user.login == 'dependabot[bot]' && contains(github.event.pull_request.labels.*.name, 'dependencies')
     steps:
-      - uses: hmarr/auto-approve-action@v2.0.0
-        if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
-        with:
-          github-token: "${{ secrets.ORIGAMI_FOX_ACCESS_TOKEN }}"
+
+    # Enable auto-merge *before* issuing an approval.
+    - name: Enable Github Automerge
+      uses: alexwilson/enable-github-automerge-action@main
+      with:
+        github-token: "${{ secrets.ORIGAMI_FOX_ACCESS_TOKEN }}"
+
+    # We "trust" dependabot updates (this still requires all other checks to pass!)
+    - uses: hmarr/auto-approve-action@5d04a5ca6da9aeb8ca9f31a5239b96fc3e003029
+      with:
+        github-token: "${{ secrets.ORIGAMI_FOX_ACCESS_TOKEN }}"

.github/workflows/npm-audit-fix.yml

@@ -2,27 +2,26 @@ name: npm audit fix
 
 on:
   schedule:
-    - cron: 36 0 * * * # Runs at 00:00 UTC every day
-  push:
-    branches:
-      - 'master'
+    - cron: 0 0 * * * # Runs at 00:00 UTC every day
+
+# on:
+#   push:
+#     branches:
+#       - 'master'
 
 jobs:
   run:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-node@v2.1.5
+    - uses: actions/setup-node@v2.1.4
       with:
-        node-version: '12.x'
+        node-version: '14.x'
         registry-url: 'https://registry.npmjs.org'
     - run: npm install -g "npm@^7"
-    - uses: miyajan/npm-audit-pr@v1.0.4
+    - uses: ybiquitous/npm-audit-fix-action@v3
       with:
-        token: ${{ secrets.ORIGAMI_GITHUB_TOKEN }}
-#     - uses: ybiquitous/npm-audit-fix-action@v2.1.6
-#       with:
-#         github_token: ${{ secrets.ORIGAMI_GITHUB_TOKEN }}
+        github_token: ${{ secrets.ORIGAMI_GITHUB_TOKEN }}
         # branch: "npm-audit-fix"
         # default_branch: "master"
         # commit_title: "chore(deps): npm audit fix"

.github/workflows/publish-to-npm-as-latest.yml

@@ -10,7 +10,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v2.1.5
       with:
-        node-version: '12.x'
+        node-version: '14.x'
         registry-url: 'https://registry.npmjs.org'
     - run: npm ci
     - name: Get the version
@@ -19,4 +19,4 @@ jobs:
     - run: npm version --no-git-tag-version ${{ steps.version.outputs.VERSION }}
     - run: npm publish
       env:
-        NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/publish-to-npm-as-prerelease.yml

@@ -10,7 +10,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v2.1.5
       with:
-        node-version: '12.x'
+        node-version: '14.x'
         registry-url: 'https://registry.npmjs.org'
     - run: npm ci
     - name: Get the version
@@ -19,4 +19,4 @@ jobs:
     - run: npm version --no-git-tag-version ${{ steps.version.outputs.VERSION }}
     - run: npm publish --tag prerelease
       env:
-        NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/sync-repo-labels.yml

@@ -2,7 +2,6 @@ name: Sync Origami labels
 on:
   - issues
   - pull_request_target
-  - pull_request
 jobs:
   sync-labels:
     runs-on: ubuntu-latest

.github/workflows/test-origami-component.yml

@@ -9,10 +9,7 @@ jobs:
       with:
         node-version: 12.x
     - run: npm install -g npm@^7
-    - run: npm install -g origami-build-tools@v11.0.0-beta.15
+    - run: npm install -g origami-build-tools@prerelease
     - run: obt install
-      continue-on-error: true
     - run: obt verify
-      continue-on-error: true
     - run: obt test
-      continue-on-error: true

demos/src/demo.scss

@@ -1,3 +1,3 @@
-@import '../../';
+@import '../../main';
 
 @include oTestComponent();

main.scss

@@ -1,7 +1,6 @@
 @import "mathsass/dist/math";
-@import "@financial-times/o-brand";
+@import "@financial-times/o-brand/main";
 
-@import './src/scss/variables';
 @import './src/scss/brand';
 @import './src/scss/functions';
 
@@ -15,9 +14,3 @@
 		}
 	}
 }
-
-@if $o-test-component-is-silent == false {
-	@include oTestComponent();
-	// Don't output twice
-	$o-test-component-is-silent: true !global;
-}

origami.json

@@ -1,6 +1,6 @@
 {
 	"supportStatus": "deprecated",
-	"origamiType": "module",
+	"origamiType": "component",
 	"description": "A component used to test origami tools and services",
 	"origamiVersion": "2.0",
 	"support": "origami.support@ft.com",