Merge pull request #917 from Financial-Times/npm7

CPP-675 Update to npm 8
Financial-Times · Dec 3, 2021 · 8e5e0b4 · 8e5e0b4
2 parents e521583 + 799defa
commit 8e5e0b4
Show file tree

Hide file tree

Showing 27 changed files with 275 additions and 91 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,4 +1,7 @@
-version: 2
+version: 2.1
+
+orbs:
+  node: circleci/node@4.6.0
 
 references:
 
@@ -71,6 +74,8 @@ jobs:
     steps:
       - checkout
       - *restore_cache
+      - node/install-npm:
+          version: "8"
       - run:
           name: Install project dependencies
           command: npm install

diff --git a/package.json b/package.json
@@ -20,7 +20,8 @@
     "prettier": "prettier --write '**/*.{ts,tsx,js,jsx,json}'",
     "storybook": "start-storybook -p 9001 -c .storybook",
     "storybook:ci": "start-storybook -c .storybook --ci --smoke-test",
-    "deploy-storybook:ci": "storybook-to-ghpages --ci"
+    "deploy-storybook:ci": "storybook-to-ghpages --ci",
+    "preinstall": "[ \"$INIT_CWD\" != \"$PWD\" ] || npm_config_yes=true npx check-engine"
   },
   "lint-staged": {
     "**/*.{ts,tsx,js,jsx}": [
@@ -59,6 +60,7 @@
     "@typescript-eslint/parser": "^3.0.0",
     "babel-loader": "^8.0.4",
     "bower": "^1.8.8",
+    "check-engine": "^1.10.1",
     "css-loader": "^3.0.0",
     "enzyme": "^3.10.0",
     "enzyme-adapter-react-16": "^1.15.1",
@@ -69,7 +71,7 @@
     "husky": "^4.0.0",
     "jest": "^26.0.0",
     "jest-enzyme": "^7.1.1",
-    "jest-puppeteer": "^4.2.0",
+    "jest-puppeteer": "^5.0.4",
     "lint-staged": "^10.0.0",
     "prettier": "^2.0.2",
     "puppeteer": "^3.0.0",
@@ -84,7 +86,8 @@
     "typescript": "3.9.5"
   },
   "engines": {
-    "node": ">= 12.0.0"
+    "node": ">= 12.0.0",
+    "npm": "7.x || 8.x"
   },
   "husky": {
     "hooks": {
@@ -94,5 +97,9 @@
   "workspaces": [
     "packages/*",
     "examples/*"
-  ]
+  ],
+  "volta": {
+    "node": "12.22.7",
+    "npm": "8.1.3"
+  }
 }
diff --git a/packages/dotcom-build-base/package.json b/packages/dotcom-build-base/package.json
@@ -12,7 +12,8 @@
     "clean:node_modules": "rm -rf node_modules",
     "build": "npm run build:node",
     "build:node": "npm run tsc -- --module commonjs --outDir ./dist/node",
-    "dev": "npm run build:node -- --watch"
+    "dev": "npm run build:node -- --watch",
+    "preinstall": "[ \"$INIT_CWD\" != \"$PWD\" ] || npm_config_yes=true npx check-engine"
   },
   "keywords": [],
   "author": "",
@@ -23,18 +24,23 @@
     "webpack-assets-manifest": "^3.1.1"
   },
   "devDependencies": {
-    "@types/webpack": "^4.41.7"
+    "@types/webpack": "^4.41.7",
+    "check-engine": "^1.10.1"
   },
   "peerDependencies": {
     "webpack": "^4.39.2"
   },
   "engines": {
-    "node": ">= 12.0.0"
+    "node": ">= 12.0.0",
+    "npm": "7.x || 8.x"
   },
   "repository": {
     "type": "git",
     "repository": "https://github.com/Financial-Times/dotcom-page-kit.git",
     "directory": "packages/dotcom-build-base"
   },
-  "homepage": "https://github.com/Financial-Times/dotcom-page-kit/tree/HEAD/packages/dotcom-build-base"
+  "homepage": "https://github.com/Financial-Times/dotcom-page-kit/tree/HEAD/packages/dotcom-build-base",
+  "volta": {
+    "extends": "../../package.json"
+  }
 }
diff --git a/packages/dotcom-build-bower-resolve/package.json b/packages/dotcom-build-bower-resolve/package.json
@@ -12,7 +12,8 @@
     "clean:node_modules": "rm -rf node_modules",
     "build": "npm run build:node",
     "build:node": "npm run tsc -- --module commonjs --outDir ./dist/node",
-    "dev": "npm run build:node -- --watch"
+    "dev": "npm run build:node -- --watch",
+    "preinstall": "[ \"$INIT_CWD\" != \"$PWD\" ] || npm_config_yes=true npx check-engine"
   },
   "keywords": [],
   "author": "",
@@ -24,15 +25,20 @@
     "bower-resolve-webpack-plugin": "^1.0.5"
   },
   "devDependencies": {
-    "@types/webpack": "^4.41.7"
+    "@types/webpack": "^4.41.7",
+    "check-engine": "^1.10.1"
   },
   "engines": {
-    "node": ">= 12.0.0"
+    "node": ">= 12.0.0",
+    "npm": "7.x || 8.x"
   },
   "repository": {
     "type": "git",
     "repository": "https://github.com/Financial-Times/dotcom-page-kit.git",
     "directory": "packages/dotcom-build-bower-resolve"
   },
-  "homepage": "https://github.com/Financial-Times/dotcom-page-kit/tree/HEAD/packages/dotcom-build-bower-resolve"
+  "homepage": "https://github.com/Financial-Times/dotcom-page-kit/tree/HEAD/packages/dotcom-build-bower-resolve",
+  "volta": {
+    "extends": "../../package.json"
+  }
 }
diff --git a/packages/dotcom-build-code-splitting/package.json b/packages/dotcom-build-code-splitting/package.json
@@ -12,7 +12,8 @@
     "clean:node_modules": "rm -rf node_modules",
     "build": "npm run build:node",
     "build:node": "npm run tsc -- --module commonjs --outDir ./dist/node",
-    "dev": "npm run build:node -- --watch"
+    "dev": "npm run build:node -- --watch",
+    "preinstall": "[ \"$INIT_CWD\" != \"$PWD\" ] || npm_config_yes=true npx check-engine"
   },
   "keywords": [],
   "author": "",
@@ -28,15 +29,20 @@
     "reliable-module-ids-plugin": "^1.0.1"
   },
   "devDependencies": {
-    "@types/webpack": "^4.41.7"
+    "@types/webpack": "^4.41.7",
+    "check-engine": "^1.10.1"
   },
   "engines": {
-    "node": ">= 12.0.0"
+    "node": ">= 12.0.0",
+    "npm": "7.x || 8.x"
   },
   "repository": {
     "type": "git",
     "repository": "https://github.com/Financial-Times/dotcom-page-kit.git",
     "directory": "packages/dotcom-build-code-splitting"
   },
-  "homepage": "https://github.com/Financial-Times/dotcom-page-kit/tree/HEAD/packages/dotcom-build-code-splitting"
+  "homepage": "https://github.com/Financial-Times/dotcom-page-kit/tree/HEAD/packages/dotcom-build-code-splitting",
+  "volta": {
+    "extends": "../../package.json"
+  }
 }
diff --git a/packages/dotcom-build-images/package.json b/packages/dotcom-build-images/package.json
@@ -12,7 +12,8 @@
     "clean:node_modules": "rm -rf node_modules",
     "build": "npm run build:node",
     "build:node": "npm run tsc -- --module commonjs --outDir ./dist/node",
-    "dev": "npm run build:node -- --watch"
+    "dev": "npm run build:node -- --watch",
+    "preinstall": "[ \"$INIT_CWD\" != \"$PWD\" ] || npm_config_yes=true npx check-engine"
   },
   "keywords": [],
   "author": "",
@@ -25,15 +26,20 @@
     "glob": "^7.1.6"
   },
   "devDependencies": {
-    "@types/webpack": "^4.41.7"
+    "@types/webpack": "^4.41.7",
+    "check-engine": "^1.10.1"
   },
   "engines": {
-    "node": ">= 12.0.0"
+    "node": ">= 12.0.0",
+    "npm": "7.x || 8.x"
   },
   "repository": {
     "type": "git",
     "repository": "https://github.com/Financial-Times/dotcom-page-kit.git",
     "directory": "packages/dotcom-build-images"
   },
-  "homepage": "https://github.com/Financial-Times/dotcom-page-kit/tree/HEAD/packages/dotcom-build-images"
+  "homepage": "https://github.com/Financial-Times/dotcom-page-kit/tree/HEAD/packages/dotcom-build-images",
+  "volta": {
+    "extends": "../../package.json"
+  }
 }
diff --git a/packages/dotcom-build-js/package.json b/packages/dotcom-build-js/package.json
@@ -12,7 +12,8 @@
     "clean:node_modules": "rm -rf node_modules",
     "build": "npm run build:node",
     "build:node": "npm run tsc -- --module commonjs --outDir ./dist/node",
-    "dev": "npm run build:node -- --watch"
+    "dev": "npm run build:node -- --watch",
+    "preinstall": "[ \"$INIT_CWD\" != \"$PWD\" ] || npm_config_yes=true npx check-engine"
   },
   "keywords": [],
   "author": "",
@@ -32,15 +33,20 @@
     "babel-loader": "^8.0.6"
   },
   "devDependencies": {
-    "@types/webpack": "^4.41.7"
+    "@types/webpack": "^4.41.7",
+    "check-engine": "^1.10.1"
   },
   "engines": {
-    "node": ">= 12.0.0"
+    "node": ">= 12.0.0",
+    "npm": "7.x || 8.x"
   },
   "repository": {
     "type": "git",
     "repository": "https://github.com/Financial-Times/dotcom-page-kit.git",
     "directory": "packages/dotcom-build-js"
   },
-  "homepage": "https://github.com/Financial-Times/dotcom-page-kit/tree/HEAD/packages/dotcom-build-js"
+  "homepage": "https://github.com/Financial-Times/dotcom-page-kit/tree/HEAD/packages/dotcom-build-js",
+  "volta": {
+    "extends": "../../package.json"
+  }
 }
diff --git a/packages/dotcom-build-sass/package.json b/packages/dotcom-build-sass/package.json
@@ -12,7 +12,8 @@
     "clean:node_modules": "rm -rf node_modules",
     "build": "npm run build:node",
     "build:node": "npm run tsc -- --module commonjs --outDir ./dist/node",
-    "dev": "npm run build:node -- --watch"
+    "dev": "npm run build:node -- --watch",
+    "preinstall": "[ \"$INIT_CWD\" != \"$PWD\" ] || npm_config_yes=true npx check-engine"
   },
   "keywords": [],
   "author": "",
@@ -31,15 +32,20 @@
     "webpack-fix-style-only-entries": "^0.5.0"
   },
   "devDependencies": {
-    "@types/webpack": "^4.41.7"
+    "@types/webpack": "^4.41.7",
+    "check-engine": "^1.10.1"
   },
   "engines": {
-    "node": ">= 12.0.0"
+    "node": ">= 12.0.0",
+    "npm": "7.x || 8.x"
   },
   "repository": {
     "type": "git",
     "repository": "https://github.com/Financial-Times/dotcom-page-kit.git",
     "directory": "packages/dotcom-build-sass"
   },
-  "homepage": "https://github.com/Financial-Times/dotcom-page-kit/tree/HEAD/packages/dotcom-build-sass"
+  "homepage": "https://github.com/Financial-Times/dotcom-page-kit/tree/HEAD/packages/dotcom-build-sass",
+  "volta": {
+    "extends": "../../package.json"
+  }
 }
diff --git a/packages/dotcom-middleware-app-context/package.json b/packages/dotcom-middleware-app-context/package.json
@@ -12,25 +12,31 @@
     "clean:node_modules": "rm -rf node_modules",
     "build": "npm run build:node",
     "dev": "npm run build:node -- --watch",
-    "build:node": "npm run tsc -- --module commonjs --outDir ./dist/node"
+    "build:node": "npm run tsc -- --module commonjs --outDir ./dist/node",
+    "preinstall": "[ \"$INIT_CWD\" != \"$PWD\" ] || npm_config_yes=true npx check-engine"
   },
   "keywords": [],
   "author": "",
   "license": "MIT",
   "devDependencies": {
+    "check-engine": "^1.10.1",
     "node-mocks-http": "^1.7.5"
   },
   "dependencies": {
-    "@types/express": "^4.16.1",
-    "@financial-times/dotcom-server-app-context": "file:../dotcom-server-app-context"
+    "@financial-times/dotcom-server-app-context": "file:../dotcom-server-app-context",
+    "@types/express": "^4.16.1"
   },
   "engines": {
-    "node": ">= 12.0.0"
+    "node": ">= 12.0.0",
+    "npm": "7.x || 8.x"
   },
   "repository": {
     "type": "git",
     "repository": "https://github.com/Financial-Times/dotcom-page-kit.git",
     "directory": "packages/dotcom-middleware-app-context"
   },
-  "homepage": "https://github.com/Financial-Times/dotcom-page-kit/tree/HEAD/packages/dotcom-middleware-app-context"
+  "homepage": "https://github.com/Financial-Times/dotcom-page-kit/tree/HEAD/packages/dotcom-middleware-app-context",
+  "volta": {
+    "extends": "../../package.json"
+  }
 }
diff --git a/packages/dotcom-middleware-asset-loader/package.json b/packages/dotcom-middleware-asset-loader/package.json
@@ -12,26 +12,32 @@
     "clean:node_modules": "rm -rf node_modules",
     "build": "npm run build:node",
     "build:node": "npm run tsc -- --module commonjs --outDir ./dist/node",
-    "dev": "npm run build:node -- --watch"
+    "dev": "npm run build:node -- --watch",
+    "preinstall": "[ \"$INIT_CWD\" != \"$PWD\" ] || npm_config_yes=true npx check-engine"
   },
   "keywords": [],
   "author": "",
   "license": "MIT",
   "dependencies": {
+    "@financial-times/dotcom-server-asset-loader": "file:../../packages/dotcom-server-asset-loader",
     "@types/express": "^4.16.0",
-    "express": "^4.16.4",
-    "@financial-times/dotcom-server-asset-loader": "file:../../packages/dotcom-server-asset-loader"
+    "express": "^4.16.4"
   },
   "devDependencies": {
+    "check-engine": "^1.10.1",
     "node-mocks-http": "^1.7.3"
   },
   "engines": {
-    "node": ">= 12.0.0"
+    "node": ">= 12.0.0",
+    "npm": "7.x || 8.x"
   },
   "repository": {
     "type": "git",
     "repository": "https://github.com/Financial-Times/dotcom-page-kit.git",
     "directory": "packages/dotcom-middleware-asset-loader"
   },
-  "homepage": "https://github.com/Financial-Times/dotcom-page-kit/tree/HEAD/packages/dotcom-middleware-asset-loader"
+  "homepage": "https://github.com/Financial-Times/dotcom-page-kit/tree/HEAD/packages/dotcom-middleware-asset-loader",
+  "volta": {
+    "extends": "../../package.json"
+  }
 }
diff --git a/packages/dotcom-middleware-navigation/package.json b/packages/dotcom-middleware-navigation/package.json
@@ -12,7 +12,8 @@
     "clean:node_modules": "rm -rf node_modules",
     "build": "npm run build:node",
     "build:node": "npm run tsc -- --module commonjs --outDir ./dist/node",
-    "dev": "npm run build:node -- --watch"
+    "dev": "npm run build:node -- --watch",
+    "preinstall": "[ \"$INIT_CWD\" != \"$PWD\" ] || npm_config_yes=true npx check-engine"
   },
   "keywords": [],
   "author": "",
@@ -22,15 +23,20 @@
     "@financial-times/dotcom-types-navigation": "file:../dotcom-types-navigation"
   },
   "devDependencies": {
+    "check-engine": "^1.10.1",
     "node-mocks-http": "^1.7.3"
   },
   "engines": {
-    "node": ">= 12.0.0"
+    "node": ">= 12.0.0",
+    "npm": "7.x || 8.x"
   },
   "repository": {
     "type": "git",
     "repository": "https://github.com/Financial-Times/dotcom-page-kit.git",
     "directory": "packages/dotcom-middleware-navigation"
   },
-  "homepage": "https://github.com/Financial-Times/dotcom-page-kit/tree/HEAD/packages/dotcom-middleware-navigation"
+  "homepage": "https://github.com/Financial-Times/dotcom-page-kit/tree/HEAD/packages/dotcom-middleware-navigation",
+  "volta": {
+    "extends": "../../package.json"
+  }
 }