@financial-times/n-conversion-forms 20.3.0 → 20.3.4

package/.circleci/config.yml

@@ -6,7 +6,7 @@ references:
   container_config_node12: &container_config_node12
     working_directory: ~/project/build
     docker:
-      - image: circleci/node:12-browsers
+      - image: cimg/node:14.18-browsers
 
   container_config_lambda_node12: &container_config_lambda_node12
     working_directory: ~/project/build
@@ -57,7 +57,10 @@ references:
     branches:
       ignore: /.*/
 
-version: 2
+version: 2.1
+
+orbs:
+  node: circleci/node@4.7.0
 
 jobs:
 
@@ -69,12 +72,11 @@ jobs:
           name: Checkout next-ci-shared-helpers
           command: git clone --depth 1 git@github.com:Financial-Times/next-ci-shared-helpers.git .circleci/shared-helpers
       - *restore_npm_cache
+      - node/install-npm:
+          version: "7"
       - run:
           name: Install project dependencies
           command: make install
-      - run:
-          name: shared-helper / npm-install-peer-deps
-          command: .circleci/shared-helpers/helper-npm-install-peer-deps
       - run:
           name: shared-helper / npm-update
           command: .circleci/shared-helpers/helper-npm-update
@@ -100,7 +102,7 @@ jobs:
       - *attach_workspace
       - run:
           name: Run tests
-          command: make test
+          command: npm run lint && make test
           environment:
             JEST_JUNIT_OUTPUT: test-results/jest/results.xml
             MOCHA_FILE: test-results/mocha/results.xml

package/.circleci/shared-helpers/helper-npm-install-peer-deps

@@ -11,10 +11,10 @@
 #
 # Why we pass the flags we do to `npm install`:
 #
-# --no-package-lock - While we now use package-lock.json 
-#   in our repos, skip package-lock.json in this instance 
-#   as we don't want to accidentally modify the file 
-#   for subsequent steps in the workflow, e.g cache keys 
+# --no-package-lock - While we now use package-lock.json
+#   in our repos, skip package-lock.json in this instance
+#   as we don't want to accidentally modify the file
+#   for subsequent steps in the workflow, e.g cache keys
 #   and artefact generation.
 #
 # --no-save - We don't want to modify package.json as we
@@ -34,6 +34,7 @@ if [ -e package.json ]; then
 
     npm ls --production --parseable 2>&1 >/dev/null | \
       sed -n -e 's/^npm ERR! peer dep missing: \(.*\),.*/\1/p' | \
-        xargs -I{} npm install --no-package-lock --no-save "{}"
+          xargs -I{} echo -n '"{}" ' | \
+            xargs npm install --no-package-lock --no-save
 
 fi

package/.eslintignore

@@ -0,0 +1,3 @@
+/bower_components
+/dist
+/.eslintrc.js

package/.github/workflows/gh-pages-deploy.yml

@@ -13,11 +13,12 @@ jobs:
     steps:
       - uses: actions/setup-node@v2
         with:
-          node-version: 12.x
+          node-version: 14.x
       - uses: actions/checkout@v2
         with:
           persist-credentials: false
       - run: git config --global url."https://${{ secrets.NEXT_USER_PAT }}@github.com/".insteadOf ssh://git@github.com/
+      - run: npm install -g npm@7.24.2
       - run: make install
       - run: npm run build-storybook
       - name: Deploy