Merge branch 'master' into rename-config

Author: fendor

.github/workflows/build.yml

@@ -11,19 +11,21 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: 14
-      - run: npm ci
+      - run: yarn install --immutable --immutable-cache --check-cache
       - name: Publish to Visual Studio Marketplace
         id: publishToVSMarketplace
         uses: HaaLeo/publish-vscode-extension@v0
         with:
           pat: ${{ secrets.VS_MARKETPLACE_TOKEN }}
           registryUrl: https://marketplace.visualstudio.com
+          yarn: true
       - name: Publish to Open VSX Registry
         id: publishToOpenVSX
         continue-on-error: true
         uses: HaaLeo/publish-vscode-extension@v0
         with:
           pat: ${{ secrets.OPEN_VSX_TOKEN }}
+          yarn: true
       - name: Upload extension vsix to workflow artifacts
         uses: actions/upload-artifact@v2
         with:

.github/workflows/test.yml

@@ -29,7 +29,6 @@ jobs:
         uses: haskell/actions/setup@v1
         with:
           ghc-version: ${{ matrix.ghc }}
-          run: xvfb-run -s '-screen 0 640x480x16' -a npm test
       - name: "Install `tree` for MacOs"
         run: |
           brew update
@@ -52,13 +51,13 @@ jobs:
         shell: bash
 
       # Install test dependencies
-      - run: npm ci
-      - run: npm run webpack
+      - run: yarn install --immutable --immutable-cache --check-cache
+      - run: yarn run webpack
 
       # Run the tests
-      - run: xvfb-run -s '-screen 0 640x480x16' -a npm test
+      - run: xvfb-run -s '-screen 0 640x480x16' -a yarn run test
         if: runner.os == 'Linux'
-      - run: npm test
+      - run: yarn run test
         if: runner.os != 'Linux'
 
       # Upload test artefacts

Contributing.md

@@ -2,15 +2,15 @@
 
 ## Dependencies and Building
 
-Run `npm install` in the project root to install the development dependencies.
+Run `yarn install` in the project root to install the development dependencies.
 
 You can also package up the extension with
 
-- `npm install -g vsce` to get the Extension Manager,
-- `npm install` to build the extension
+- `yarn global add vsce` to get the Extension Manager,
+- `yarn install` to build the extension
 - `vsce package` which creates an extension package at `haskell-<version>.vsix`.
 
-_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.
+_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.
 
 ## Developing inside VS Code
 
@@ -29,7 +29,7 @@ _Note_: you can also reload (`Ctrl+R` or `Cmd+R` on macOS) the VS Code window wi
 
 #### Formatting
 
-[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.
+[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.
 The configurations for prettier are located in `.prettierrc`.
 
 ## Navigating the Files