Skip to content

Use npm instead of Yarn #47

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.

Sign up for GitHub

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

Merged
merged 7 commits into from
Nov 14, 2020
Merged

Use npm instead of Yarn #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a43e5a5
Use npm instead of Yarn
nickserv Sep 10, 2020
ebe8548
Don't disable npm lock file
nickserv Nov 10, 2020
dc645f7
Temporarily restore yarn.lock for migration to npm
nickserv Nov 10, 2020
03d4e45
Update lock files for npm 7
nickserv Nov 10, 2020
a1d0c7c
Revert "Temporarily restore yarn.lock for migration to npm"
nickserv Nov 10, 2020
6e39e97
Use npm 7+ in CI
nickserv Nov 13, 2020
10980fc
Fix npm 7 not being installed in CI
nickserv Nov 14, 2020
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
2 changes: 0 additions & 2 deletions .npmignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,3 @@ coverage/
.nyc_output/
.vscode/
test/

yarn.lock
14 changes: 7 additions & 7 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
dist: trusty
language: node_js
cache: yarn
notifications:
email: false
node_js:
Expand All @@ -16,13 +15,14 @@ env:
- PPTR_OVERRIDE_VERSION=5.x.x
- PPTR_OVERRIDE_VERSION=latest
before_install:
- npm install -g yarn coveralls nyc @patrickhulce/scripts
- npm install -g npm@7
- npm install -g coveralls nyc @patrickhulce/scripts
before_script:
- yarn add -D "puppeteer@${PPTR_OVERRIDE_VERSION}"
- yarn add -D "@types/puppeteer@${PPTR_OVERRIDE_VERSION}" || echo "No types available"
- npm install -D "puppeteer@${PPTR_OVERRIDE_VERSION}"
- npm install -D "@types/puppeteer@${PPTR_OVERRIDE_VERSION}" || echo "No types available"
script:
- yarn rebuild
- yarn test:lint
- yarn test:unit --coverage --runInBand --verbose
- npm run rebuild
- npm run test:lint
- npm run test:unit --coverage --runInBand --verbose
after_success:
- cat coverage/lcov.info | coveralls || echo 'Failed to upload to coveralls...'
Loading