Skip to content

Commit

Permalink
Merge pull request #100 from Financial-Times/ACC-1242-upgrade-to-npm7
Browse files Browse the repository at this point in the history
[ACC-1242] Update to npm@7
  • Loading branch information
aasanchez authored Jan 11, 2022
2 parents 9604189 + 8e89e2b commit ed55ff1
Show file tree
Hide file tree
Showing 4 changed files with 38,014 additions and 18 deletions.
25 changes: 12 additions & 13 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@ references:

npm_cache_keys: &npm_cache_keys
keys:
- v2-dependency-npm-{{ checksum "package.json" }}-
- v2-dependency-npm-{{ checksum "package.json" }}
- v2-dependency-npm-
- v2-dependency-npm-{{ checksum "package.json" }}-
- v2-dependency-npm-{{ checksum "package.json" }}
- v2-dependency-npm-

cache_npm_cache: &cache_npm_cache
save_cache:
key: v2-dependency-npm-{{ checksum "package.json" }}-{{ epoch }}
paths:
key: v2-dependency-npm-{{ checksum "package.json" }}-{{ epoch }}
paths:
- ./node_modules/

restore_npm_cache: &restore_npm_cache
restore_cache:
<<: *npm_cache_keys
<<: *npm_cache_keys

filters_only_main: &filters_only_main
branches:
Expand All @@ -55,7 +55,10 @@ references:
branches:
ignore: /.*/

version: 2
version: 2.1

orbs:
node: circleci/node@4.6.0

jobs:

Expand All @@ -67,15 +70,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
- run:
name: shared-helper / generate-build-state-artifacts
command: .circleci/shared-helpers/helper-generate-build-state-artifacts
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
.editorconfig
.eslintrc.js
.stylelintrc
package-lock.json*
.vscode
*.env*

Expand Down
Loading

0 comments on commit ed55ff1

Please sign in to comment.