Skip to content

Commit 4edbcdd

Browse files
committed
clean up all references to yarn
1 parent 29614e0 commit 4edbcdd

File tree

25 files changed

+192
-155
lines changed

25 files changed

+192
-155
lines changed

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,3 @@ terraform*
2222
.env.production.local
2323

2424
npm-debug.log*
25-
yarn-debug.log*
26-
yarn-error.log*

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
language: node_js
22
node_js:
33
- 9
4-
cache: yarn
4+
cache: npm
55
branches:
66
except:
77
- /^no-ci.*$/
88
script:
9-
- yarn format:ci
10-
- yarn build-css
11-
- yarn tslint -p .
12-
- yarn test-coveralls
9+
- npm run format:ci
10+
- npm run build-css
11+
- npm run tslint -p .
12+
- npm run test-coveralls

package-lock.json

Lines changed: 76 additions & 76 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
"build-js": "react-scripts-ts build",
1616
"coverage": "./scripts/coverage-fix.sh do && react-scripts-ts test --env=jsdom --coverage && ./scripts/coverage-fix.sh undo",
1717
"format": "prettier --write 'src/**/*.{ts,tsx}' 'externalLibs/**/*.js' '!externalLibs/assert_compiled.js'; prettier --write --parser scss 'src/**/*.scss'",
18-
"format:ci": "prettier --list-different 'src/**/*.{ts,tsx}' && prettier --list-different --parser scss 'src/**/*.scss'",
18+
"format:tsx": "prettier --list-different 'src/**/*.{ts,tsx}'",
19+
"format:scss": "prettier --list-different --parser scss 'src/**/*.scss'",
20+
"format:ci": "npm run format:tsx && npm run format:scss",
1921
"start-js": "rm -r coverage; BROWSER=none PORT=80 react-scripts-ts start",
2022
"win-start-js": "set PORT=80 & react-scripts-ts start",
2123
"start": "npm-run-all -p watch-css start-js",

scripts/test.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ main() {
77
echo " If you cancel this pre-push hook, use \`git stash pop\` to retrieve your"
88
echo " unstaged changes."
99

10-
prettier_ts="yarn prettier --list-different src/**/*.{ts,tsx}"
11-
prettier_scss="yarn prettier --list-different --parser scss src/**/*.scss"
12-
jest_ts="yarn test"
10+
prettier_ts="npm run format:tsx"
11+
prettier_scss="npm run format:scss"
12+
jest_ts="npm test"
1313

1414
run_cmd "${prettier_ts}"; prettier_ts_exit=$?
1515
run_cmd "${prettier_scss}"; prettier_scss_exit=$?

src/components/__tests__/__snapshots__/Login.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ exports[`Login renders correctly 1`] = `
2424
<Blueprint2.Button className=\\"pt-large\\" rightIcon=\\"log-in\\" onClick={[Function: handleLogin]}>
2525
Log in with IVLE
2626
</Blueprint2.Button>
27-
<NavLink to=\\"/playground\\" activeClassName=\\"active\\" ariaCurrent=\\"true\\">
27+
<NavLink to=\\"/playground\\" activeClassName=\\"active\\" aria-current=\\"page\\">
2828
<Blueprint2.Button className=\\"pt-large\\" rightIcon=\\"code\\">
2929
Try out the playground
3030
</Blueprint2.Button>

0 commit comments

Comments
 (0)