Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .azure/stages/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ stages:
name: SetExtensionName
displayName: Set VSIX file name

# Yarn package script to build the vsix file
# npm package script to build the vsix file
- bash: |
echo "Compiling Production Webpack"
yarn && yarn package-web
npm install && npm run package-web
echo "Compiled Production Webpack"
displayName: Compile

Expand All @@ -46,7 +46,7 @@ stages:
path: $(Build.ArtifactStagingDirectory)/$(SetExtensionName.VSIX)
artifact: extension
sbomBuildDropPath: $(Build.ArtifactStagingDirectory)

- template: ../steps/sign.yml
parameters:
signType: ${{ parameters.signType }}
16 changes: 7 additions & 9 deletions .github/workflows/build-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,18 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: '16.x'
- name: yarn install
uses: bahmutov/npm-install@v1
with:
install-command: yarn install
- name: npm install
run: npm install
- name: Linting
run: yarn lint
run: npm run lint
- name: Compiling
run: yarn compile-web
run: npm run compile-web
- name: Testing
run: xvfb-run -a yarn test
run: xvfb-run -a npm run test
- name: Production webpack
run: yarn package-web
run: npm run package-web
- name: Build vsix
run: npx -p=vsce vsce package --yarn --out vscode-makecode-arcade.vsix
run: npx -p=vsce vsce package --out vscode-makecode-arcade.vsix
- name: Upload artifact
uses: actions/upload-artifact@v3
with:
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/build-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,11 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: '16.x'
- name: yarn install
uses: bahmutov/npm-install@v1
with:
install-command: yarn install
- name: npm install
run: npm install
- name: Linting
run: yarn lint
run: npm run lint
- name: Compiling
run: yarn compile-web
run: npm run compile-web
- name: Testing
run: xvfb-run -a yarn test
run: xvfb-run -a npm run test
1 change: 0 additions & 1 deletion .yarnrc

This file was deleted.

18 changes: 6 additions & 12 deletions development.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@

Prerequisites:
1. Install node
2. Install yarn:
`npm install -g yarn`

After you clone the repo, install the dependencies with yarn:
After you clone the repo, install the dependencies with npm:

```
yarn install
npm install
```

## Running the extension locally
Expand All @@ -22,7 +20,7 @@ To debug the webviews in the extension host, run ctrl+shift+i to open the dev to
To run the extension in the browser, run:

```
yarn run-in-browser
npm run run-in-browser
```

## Creating a vsix file
Expand All @@ -44,15 +42,11 @@ vsce package
If you want to develop using your local clone of [pxt-mkc](https://github.com/microsoft/pxt-mkc), you need to link the `makecode-core` and `makecode-browser` packages.

```
cd pxt-mkc/packages/makecode-core
yarn link
cd ../makecode-browser
yarn link
cd ../../vscode-makecode
yarn link makecode-core makecode-browser
npm link ../pxt-mkc/packages/makecode-core ../pxt-mkc/packages/makecode-browser
cd pxt-mkc/packa

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this a typo?

```

Make sure you run `yarn compile` inside of `makecode-core` and `makecode-browser` to build the packages!
Make sure you run `npm run build` inside of `makecode-core` and `makecode-browser` to build the packages!

## Publishing the Extension

Expand Down
Loading
Loading