Skip to content

Commit c32cbbf

Browse files
trentmwillisKrinkle
authored andcommitted
Build: replace yarn.lock with package-lock.json
Also update deps to fix vulnerabilities warnings. Closes #1409.
1 parent 5bea87b commit c32cbbf

File tree

5 files changed

+4746
-3580
lines changed

5 files changed

+4746
-3580
lines changed

.travis.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@ matrix:
1414
node_js: "10"
1515
# On Windows, run test:main only instead of test.
1616
# https://github.com/qunitjs/qunit/issues/1359
17-
# On Windows, disable yarn-gpg due to it causing the
18-
# build to never finish (background process)
19-
# https://travis-ci.community/t/timeout-after-build-finished-and-succeeded/1336
20-
env: NPM_SCRIPT=test:main YARN_GPG=no
17+
env: NPM_SCRIPT=test:main
2118
- os: osx
2219
# On Mac, test only the last LTS.
2320
node_js: "10"
@@ -27,7 +24,6 @@ matrix:
2724
script:
2825
- npm run $NPM_SCRIPT
2926
cache:
30-
yarn: true
3127
directories:
3228
- $HOME/.npm
3329
- $HOME/.cache

CONTRIBUTING.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,11 @@ Workflows for documentation or code changes are outlined below.
2323

2424
### Code
2525

26-
For code changes, you'll need to have [`node.js`](https://nodejs.org/en/) and
27-
[`yarn`](https://yarnpkg.com/en/) installed on your machine.
26+
For code changes, you'll need to have [`node.js`](https://nodejs.org/en/) installed on your machine.
2827

29-
Install dependencies in the repository via `yarn install`. Make your code
30-
changes and run `yarn test` to lint and test the changes. To run tests as you
31-
make changes to the code base, you can use `yarn dev` which will rebuild QUnit
28+
Install dependencies in the repository via `npm install`. Make your code
29+
changes and run `npm test` to lint and test the changes. To run tests as you
30+
make changes to the code base, you can use `npm run dev` which will rebuild QUnit
3231
and run tests any time you make a change to the source code.
3332

3433
Almost all code changes should be accompanied by new unit tests to verify the

0 commit comments

Comments
 (0)