Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Beginnings of debugger support #169

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 6 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
8 changes: 4 additions & 4 deletions .azure/templates/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ steps:
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 ci && npm run package-web
echo "Compiled Production Webpack"
displayName: Compile

Expand All @@ -33,6 +33,6 @@ steps:
- script: npx @vscode/vsce package -o $(Build.ArtifactStagingDirectory)/$(SetExtensionName.VSIX)
displayName: Package extension VSIX

- publish: $(Build.ArtifactStagingDirectory)/$(SetExtensionName.VSIX)
artifact: $(SetExtensionName.VSIX)
- publish: $(Build.ArtifactStagingDirectory)/$(SetExtensionName.VSIX)
artifact: $(SetExtensionName.VSIX)
displayName: Publish VSIX artifact
15 changes: 6 additions & 9 deletions .github/workflows/build-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,17 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: '16.x'
- name: yarn install
uses: bahmutov/npm-install@v1
with:
install-command: yarn install
- run: npm ci
- 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
11 changes: 4 additions & 7 deletions .github/workflows/build-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,10 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: '16.x'
- name: yarn install
uses: bahmutov/npm-install@v1
with:
install-command: yarn 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
3 changes: 2 additions & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"request": "launch",
"args": [
"--extensionDevelopmentPath=${workspaceFolder}",
"--extensionDevelopmentKind=web"
"--extensionDevelopmentKind=web",
"C:\\Users\\riknoll\\OneDrive - Microsoft\\Documents\\vscode-test10"
],
"outFiles": [
"${workspaceFolder}/dist/web/**/*.js"
Expand Down
1 change: 0 additions & 1 deletion .yarnrc

This file was deleted.

16 changes: 7 additions & 9 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 @@ -45,12 +43,12 @@ If you want to develop using your local clone of [pxt-mkc](https://github.com/mi

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

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

Loading
Loading