Merge pull request #690 from Financial-Times/fixup

Miscellaneous fixes for major release

.circleci/config.yml

@@ -52,17 +52,12 @@ references:
       only:
         - main
 
-  filters_only_renovate_nori:
-    &filters_only_renovate_nori
-    branches:
-      only: /(^renovate-.*|^nori\/.*)/
-
-  filters_ignore_tags_renovate_nori_build_main:
-    &filters_ignore_tags_renovate_nori_build_main
+  filters_ignore_main:
+    &filters_ignore_main
     tags:
       ignore: /.*/
     branches:
-      ignore: /(^renovate-.*|^nori\/.*|^gh-pages|^main$)/
+      ignore: /^main$/
 
   filters_main_branch:
     &filters_main_branch
@@ -180,7 +175,7 @@ workflows:
     jobs:
       - build:
           filters:
-            <<: *filters_ignore_tags_renovate_nori_build_main
+            <<: *filters_ignore_main
           name: build-v<< matrix.node-version >>
           matrix:
             parameters:
@@ -218,13 +213,7 @@ workflows:
           - scheduled_pipeline
           - << pipeline.trigger_source >>
     jobs:
-      - waiting-for-approval:
-          type: approval
-          filters:
-            <<: *filters_only_renovate_nori
       - build:
-          requires:
-            - waiting-for-approval
           name: build-v<< matrix.node-version >>
           matrix:
             parameters:

core/cli/src/config.ts

@@ -53,10 +53,6 @@ export function validateConfig(config: ValidPluginsConfig): ValidConfig {
   const pluginOptionConflicts = findConflicts(Object.values(config.pluginOptions))
   const taskOptionConflicts = findConflicts(Object.values(config.taskOptions))
 
-  const definedCommandTaskConflicts = commandTaskConflicts.filter((conflict) => {
-    return conflict.conflicting[0].id in config.hooks
-  })
-
   let shouldThrow = false
   const error = new ToolKitConflictError(
     'There are problems with your Tool Kit configuration.',
@@ -71,7 +67,7 @@ export function validateConfig(config: ValidPluginsConfig): ValidConfig {
 
   if (
     hookConflicts.length > 0 ||
-    definedCommandTaskConflicts.length > 0 ||
+    commandTaskConflicts.length > 0 ||
     taskConflicts.length > 0 ||
     pluginOptionConflicts.length > 0 ||
     taskOptionConflicts.length > 0
@@ -82,8 +78,8 @@ export function validateConfig(config: ValidPluginsConfig): ValidConfig {
       error.details += formatHookConflicts(hookConflicts)
     }
 
-    if (definedCommandTaskConflicts.length) {
-      error.details += formatCommandTaskConflicts(definedCommandTaskConflicts)
+    if (commandTaskConflicts.length) {
+      error.details += formatCommandTaskConflicts(commandTaskConflicts)
     }
 
     if (taskConflicts.length) {

plugins/circleci-deploy/.toolkitrc.yml

@@ -21,7 +21,6 @@ options:
               - name: 'deploy-review'
                 requires:
                   - 'setup'
-                  - 'waiting-for-approval'
                 splitIntoMatrix: false
                 runOnRelease: false
                 custom:
@@ -77,7 +76,6 @@ options:
               - name: 'deploy-review'
                 requires:
                   - 'setup'
-                  - 'waiting-for-approval'
                 splitIntoMatrix: false
                 runOnRelease: false
                 custom:

plugins/circleci/test/files/with-hook/.circleci/config.yml

@@ -3,6 +3,5 @@ workflows:
     jobs:
       - tool-kit/test-job:
           requires:
-            - waiting-for-approval
             - tool-kit/that-job
           executor: node

plugins/frontend-app/.toolkitrc.yml

@@ -5,8 +5,11 @@ plugins:
 
 commands:
   'run:local':
-    - WebpackDevelopment # run a webpack compile before starting the server because dotcom-server-asset-loader expects a manifest to exist
+    - Webpack:
+        envName: development # run a webpack compile before starting the server because dotcom-server-asset-loader expects a manifest to exist
     - Node
-    - WebpackWatch
+    - Webpack:
+        envName: development
+        watch: true
 
 version: 2

plugins/webpack/.toolkitrc.yml

@@ -2,9 +2,18 @@ tasks:
   Webpack: './lib/tasks/webpack'
 
 commands:
-  'build:local': Webpack
-  'build:ci': Webpack
-  'build:remote': Webpack
-  'run:local': Webpack
+  'build:local':
+    Webpack:
+      envName: development
+  'build:ci':
+    Webpack:
+      envName: production
+  'build:remote':
+    Webpack:
+      envName: production
+  'run:local':
+    Webpack:
+      envName: development
+      watch: true
 
 version: 2