@financial-times/n-myft-ui 30.4.5 → 31.0.1

package/.circleci/config.yml

@@ -8,7 +8,7 @@ references:
       - image: cimg/node:<< parameters.node-version >>-browsers
     parameters:
       node-version:
-        default: "16.14"
+        default: "18.18"
         type: string
 
   workspace_root: &workspace_root ~/project
@@ -71,8 +71,8 @@ jobs:
       - run:
           name: Checkout next-ci-shared-helpers
           command: git clone --depth 1
-            git@github.com:Financial-Times/next-ci-shared-helpers.git
-            .circleci/shared-helpers
+            git@github.com:Financial-Times/next-ci-shared-helpers.git --branch
+            unpin-heroku .circleci/shared-helpers
       - *restore_npm_cache
       - run:
           name: Install project dependencies
@@ -145,7 +145,7 @@ workflows:
           name: build-v<< matrix.node-version >>
           matrix:
             parameters:
-              node-version: ["16.14"]
+              node-version: [ "16.20", "18.18" ]
       - test:
           filters:
             <<: *filters_ignore_tags
@@ -154,12 +154,12 @@ workflows:
           name: test-v<< matrix.node-version >>
           matrix:
             parameters:
-              node-version: ["16.14"]
+              node-version: [ "16.20", "18.18" ]
       - deploy:
           filters:
             <<: *filters_only_main
           requires:
-            - build-v16.14
+            - build-v18.18
   build-test-publish:
     jobs:
       - build:
@@ -169,7 +169,7 @@ workflows:
           name: build-v<< matrix.node-version >>
           matrix:
             parameters:
-              node-version: ["16.14"]
+              node-version: [ "16.20", "18.18" ]
       - test:
           filters:
             <<: *filters_version_tag
@@ -178,13 +178,13 @@ workflows:
           name: test-v<< matrix.node-version >>
           matrix:
             parameters:
-              node-version: ["16.14"]
+              node-version: [ "16.20", "18.18" ]
       - publish:
           context: npm-publish-token
           filters:
             <<: *filters_version_tag
           requires:
-            - test-v16.14
+            - test-v18.18
 
   nightly:
     triggers:
@@ -198,7 +198,7 @@ workflows:
           name: build-v<< matrix.node-version >>
           matrix:
             parameters:
-              node-version: ["16.14"]
+              node-version: [ "16.20", "18.18" ]
       - test:
           requires:
             - build-v<< matrix.node-version >>
@@ -206,7 +206,7 @@ workflows:
           name: test-v<< matrix.node-version >>
           matrix:
             parameters:
-              node-version: ["16.14"]
+              node-version: [ "16.20", "18.18" ]
 
 notify:
   webhooks:

package/.circleci/shared-helpers/helper-setup-heroku-cli

@@ -13,9 +13,9 @@ set -eu -o pipefail
 # HELPER COMMANDS
 
 # Install Heroku CLI
-wget https://cli-assets.heroku.com/heroku-v7.30.1/heroku-v7.30.1-linux-x64.tar.gz -O heroku-linux-amd64.tar.gz
+wget https://cli-assets.heroku.com/channels/stable/heroku-linux-x64.tar.gz
 sudo mkdir -p /usr/local/lib /usr/local/bin
-sudo tar -xzf heroku-linux-amd64.tar.gz -C /usr/local/lib
+sudo tar -xzf heroku-linux-x64.tar.gz -C /usr/local/lib
 sudo ln -s /usr/local/lib/heroku/bin/heroku /usr/local/bin/heroku
 
 # Output heroku-cli version so user can see in

package/Makefile

@@ -4,6 +4,12 @@ node_modules/@financial-times/n-gage/index.mk:
 
 -include node_modules/@financial-times/n-gage/index.mk
 
+NODE_VERSION := $(shell node --version)
+NODE_MAJOR_VERSION := $(shell echo $(NODE_VERSION) | cut -c2-3)
+ifeq ($(NODE_MAJOR_VERSION),18)
+	NODE_OPTS := "--openssl-legacy-provider --dns-result-order=ipv4first"
+endif
+
 run:
 	node _test-server/app
 
@@ -22,10 +28,10 @@ static-demo: demo-build
 	@scripts/make-static-demo.sh
 
 test-build:
-	webpack --mode=development
+	@NODE_OPTIONS=$(NODE_OPTS) webpack --mode=development
 
 test-unit:
-	node_modules/karma/bin/karma start
+	@NODE_OPTIONS=$(NODE_OPTS) karma start
 
 a11y: demo-build
 	@node .pa11yci.js