Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to NPM package lock over Yarn, and update dependencies #114

Merged
merged 6 commits into from
Sep 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,41 +2,38 @@ version: 2
jobs:
build:
docker:
- image: circleci/node:10-browsers
- image: circleci/node:12-browsers
environment:
LANG: en_US.UTF-8
steps:
- checkout
- run:
name: Update Yarn
command: 'sudo npm update -g yarn'
- restore-cache:
name: Restore Yarn Package Cache
name: Restore Package Cache
keys:
- yarn-packages-{{ checksum "yarn.lock" }}
- npm-packages-{{ checksum "package-lock.json" }}
- run:
name: Install Dependencies
command: yarn install
command: npm install
- save-cache:
name: Save Yarn Package Cache
key: yarn-packages-{{ checksum "yarn.lock" }}
name: Save Package Cache
key: npm-packages-{{ checksum "package-lock.json" }}
paths:
- ~/.cache/yarn
- ~/.cache/npm
- run:
name: Build
command: yarn run build
command: npm run build
- run:
name: Run Tests
command: yarn run ci:test
command: npm run ci:test
environment:
MOCHA_FILE: junit/test-results.xml
when: always
- run:
name: Run ES5 check
command: yarn run test:es-check:es5 && yarn run test:es-check:es2015:module
command: npm run test:es-check:es5 && npm run test:es-check:es2015:module
- run:
name: Generate Coverage
command: yarn run ci:coverage
command: npm run ci:coverage
- store_artifacts:
path: dist
- store_artifacts:
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,7 @@ build
# Release process
.release
.release-tmp-*/
out/
out/

# Yarn lock file
yarn.lock
Loading