Skip to content

Commit c7162b9

Browse files
committed
Merge remote-tracking branch 'upstream/master' into authentication-provider
2 parents 8c7315c + 71dfd3e commit c7162b9

File tree

11 files changed

+1656
-4066
lines changed

11 files changed

+1656
-4066
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- name: Use Node.js
5151
uses: actions/setup-node@v1
5252
with:
53-
node-version: 12.x
53+
node-version: 14.x
5454
- run: npm install
5555
- name: lint
5656
if: runner.os == 'Linux'
@@ -135,7 +135,7 @@ jobs:
135135
- name: Use Node.js
136136
uses: actions/setup-node@v1
137137
with:
138-
node-version: 12.x
138+
node-version: 14.x
139139
- name: Prepare build
140140
id: set-version
141141
run: |
@@ -149,8 +149,8 @@ jobs:
149149
git add package.json
150150
git commit -m 'auto bump version with release'
151151
jq --arg version "$VERSION" '.version = $version' package.json > "$tmp" && mv "$tmp" package.json
152-
jq '.enableProposedApi = false' package.json > "$tmp" && mv "$tmp" package.json
153152
npm install
153+
jq 'del(.enableProposedApi,.enabledApiProposals)' package.json > "$tmp" && mv "$tmp" package.json
154154
git push
155155
- name: Build package
156156
run: |

.vscode/launch.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,18 @@
4848
"${workspaceFolder}/out/test/**/*.js"
4949
],
5050
"preLaunchTask": "npm: test-compile"
51+
},
52+
{
53+
"name": "Run Web Extension in VS Code",
54+
"type": "pwa-extensionHost",
55+
"debugWebWorkerHost": true,
56+
"request": "launch",
57+
"args": [
58+
"--extensionDevelopmentPath=${workspaceFolder}",
59+
"--extensionDevelopmentKind=web"
60+
],
61+
"outFiles": ["${workspaceFolder}/dist/**/*.js"],
62+
"preLaunchTask": "npm: webpack"
5163
}
5264
]
5365
}

CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,22 @@
11
# Change Log
22

3+
## [1.2.2] 07-Dec-2021
4+
- Fixes
5+
- Exporting not working with new version 1.2.1 (#799)
6+
7+
## [1.2.0] 02-Dec-2021
8+
- Enhancements
9+
- Overhaul `WorkspaceSymbolProvider` (#772)
10+
- Add `Open Shell in Docker` option to Server Actions menu (#778)
11+
- Preliminary web extension support (#782)
12+
- Check all local folders in multi-root workspace for local copy of file (#785)
13+
- Fixes
14+
- Fix `FileSystemProvider` mtime caching (#770)
15+
- Comply with new VS Code policy for scoping access to VS Code proposed API (#771)
16+
- Append .pkg to package name when passed to source control / server command extensions (#776)
17+
- Improve error messaging for Studio Actions (#784)
18+
- Upgrade vulnerable dependencies (#787)
19+
320
## [1.1.1] 09-Nov-2021
421
- Fixes
522
- Debugger: Breakpoint with no hitCondition cannot be set (#766)

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ To unlock these features (optional):
6262

6363
1. Download and install a beta version from GitHub. This is necessary because Marketplace does not allow publication of extensions that use proposed APIs.
6464
- Go to https://github.com/intersystems-community/vscode-objectscript/releases
65-
- Locate the beta immediately above the release you installed from Marketplace. For instance, if you installed `1.1.1`, look for `1.1.2-beta.1`. This will be functionally identical to the Marketplace version apart from being able to use proposed APIs.
66-
- Download the VSIX file (for example `vscode-objectscript-1.1.2-beta.1.vsix`) and install it. One way to install a VSIX is to drag it from your download folder and drop it onto the list of extensions in the Extensions view of VS Code.
65+
- Locate the beta immediately above the release you installed from Marketplace. For instance, if you installed `1.2.2`, look for `1.2.3-beta.1`. This will be functionally identical to the Marketplace version apart from being able to use proposed APIs.
66+
- Download the VSIX file (for example `vscode-objectscript-1.2.3-beta.1.vsix`) and install it. One way to install a VSIX is to drag it from your download folder and drop it onto the list of extensions in the Extensions view of VS Code.
6767

6868
2. From [Command Palette](https://code.visualstudio.com/docs/getstarted/tips-and-tricks#_command-palette) choose `Preferences: Configure Runtime Arguments`.
69-
3. In the argv.json file that opens, add this line:
69+
3. In the argv.json file that opens, add this line (required for both Stable and Insiders versions of VS Code):
7070
```json
7171
"enable-proposed-api": ["intersystems-community.vscode-objectscript"]
7272
```

0 commit comments

Comments
 (0)