Skip to content

Commit b80f636

Browse files
authored
Merge pull request #564 from fendor/polish/yarn-over-npm
Upgrade dependencies
2 parents f44d6bf + 81d60d6 commit b80f636

File tree

8 files changed

+2398
-11701
lines changed

8 files changed

+2398
-11701
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,21 @@ jobs:
1111
- uses: actions/setup-node@v1
1212
with:
1313
node-version: 14
14-
- run: npm ci
14+
- run: yarn install --immutable --immutable-cache --check-cache
1515
- name: Publish to Visual Studio Marketplace
1616
id: publishToVSMarketplace
1717
uses: HaaLeo/publish-vscode-extension@v0
1818
with:
1919
pat: ${{ secrets.VS_MARKETPLACE_TOKEN }}
2020
registryUrl: https://marketplace.visualstudio.com
21+
yarn: true
2122
- name: Publish to Open VSX Registry
2223
id: publishToOpenVSX
2324
continue-on-error: true
2425
uses: HaaLeo/publish-vscode-extension@v0
2526
with:
2627
pat: ${{ secrets.OPEN_VSX_TOKEN }}
28+
yarn: true
2729
- name: Upload extension vsix to workflow artifacts
2830
uses: actions/upload-artifact@v2
2931
with:

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ jobs:
5151
shell: bash
5252
5353
# Install test dependencies
54-
- run: npm ci
55-
- run: npm run webpack
54+
- run: yarn install --immutable --immutable-cache --check-cache
55+
- run: yarn run webpack
5656

5757
# Run the tests
58-
- run: xvfb-run -s '-screen 0 640x480x16' -a npm test
58+
- run: xvfb-run -s '-screen 0 640x480x16' -a yarn run test
5959
if: runner.os == 'Linux'
60-
- run: npm test
60+
- run: yarn run test
6161
if: runner.os != 'Linux'
6262

6363
# Upload test artefacts

Contributing.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
## Dependencies and Building
44

5-
Run `npm install` in the project root to install the development dependencies.
5+
Run `yarn install` in the project root to install the development dependencies.
66

77
You can also package up the extension with
88

9-
- `npm install -g vsce` to get the Extension Manager,
10-
- `npm install` to build the extension
9+
- `yarn global add vsce` to get the Extension Manager,
10+
- `yarn install` to build the extension
1111
- `vsce package` which creates an extension package at `haskell-<version>.vsix`.
1212

13-
_Note:_ that if you get errors running `vsce package`, it might help running `tsc -p ./` directly, since that gives the actual error output of the TypeScript compilation.
13+
_Note:_ that if you get errors running `vsce package`, it might help running `yarn run pretest` directly, since that gives the actual error output of the TypeScript compilation.
1414

1515
## Developing inside VS Code
1616

@@ -29,7 +29,7 @@ _Note_: you can also reload (`Ctrl+R` or `Cmd+R` on macOS) the VS Code window wi
2929

3030
#### Formatting
3131

32-
[prettier](https://prettier.io) is automatically run o neach commit via husky. If you are developing within VS Code, the settings are set to auto format on save.
32+
[prettier](https://prettier.io) is automatically run on each commit via husky. If you are developing within VS Code, the settings are set to auto format on save.
3333
The configurations for prettier are located in `.prettierrc`.
3434

3535
## Navigating the Files

0 commit comments

Comments
 (0)