Skip to content
Merged
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
10 changes: 5 additions & 5 deletions .github/workflows/debugger-py.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@ jobs:
timeout-minutes: 15
steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0

- name: Login to GitHub Container Registry
uses: docker/login-action@v4
uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata
id: meta
uses: docker/metadata-action@v6
uses: docker/metadata-action@dc802804100637a589fabce1cb79ff13a1411302 # v6.2.0
with:
images: |
${{ env.REGISTRY }}/${{ env.REPO_NAME }}/${{ env.CONTAINER_NAME }}
Expand All @@ -44,7 +44,7 @@ jobs:

- name: Build & Push
id: push
uses: docker/build-push-action@v7
uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
with:
context: .
file: ${{ env.PATH_CONTEXT }}/Dockerfile
Expand All @@ -53,7 +53,7 @@ jobs:
labels: ${{ steps.meta.outputs.labels }}

- name: Attest
uses: actions/attest-build-provenance@v4
uses: actions/attest-build-provenance@0f67c3f4856b2e3261c31976d6725780e5e4c373 # v4.1.1
with:
subject-name: ${{ env.REGISTRY }}/${{ env.REPO_NAME }}/${{ env.CONTAINER_NAME }}
subject-digest: ${{ steps.push.outputs.digest }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ghp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0

- name: mise-en-place
uses: jdx/mise-action@v4
uses: jdx/mise-action@e6a8b3978addb5a52f2b4cd9d91eafa7f0ab959d # v4.2.0

- name: Install
shell: bash
Expand All @@ -43,10 +43,10 @@ jobs:

- name: Setup Pages
id: pages
uses: actions/configure-pages@v5
uses: actions/configure-pages@45bfe0192ca1faeb007ade9deae92b16b8254a0d # v6.0.0

- name: Upload artifact
uses: actions/upload-pages-artifact@v4
uses: actions/upload-pages-artifact@fc324d3547104276b827a68afc52ff2a11cc49c9 # v5.0.0
with:
path: ./packages/examples/production/

Expand All @@ -60,4 +60,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
uses: actions/deploy-pages@cd2ce8fcbc39b97be8ca5fce6e763baed58fa128 # v5.0.0
16 changes: 8 additions & 8 deletions .github/workflows/ls-clangd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@ jobs:
timeout-minutes: 150
steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0

- name: Login to GitHub Container Registry
uses: docker/login-action@v4
uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (configure)
id: meta_configure
uses: docker/metadata-action@v6
uses: docker/metadata-action@dc802804100637a589fabce1cb79ff13a1411302 # v6.2.0
with:
images: |
${{ env.REGISTRY }}/${{ env.REPO_NAME }}/${{ env.CONTAINER_NAME_CONFIGURE }}
Expand All @@ -45,7 +45,7 @@ jobs:

- name: Build & Push (configure)
id: push_configure
uses: docker/build-push-action@v7
uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
with:
context: ${{ env.PATH_CONTEXT }}
file: ${{ env.PATH_CONTEXT }}/configure.Dockerfile
Expand All @@ -54,15 +54,15 @@ jobs:
labels: ${{ steps.meta_configure.outputs.labels }}

- name: Attest (configure)
uses: actions/attest-build-provenance@v4
uses: actions/attest-build-provenance@0f67c3f4856b2e3261c31976d6725780e5e4c373 # v4.1.1
with:
subject-name: ${{ env.REGISTRY }}/${{ env.REPO_NAME }}/${{ env.CONTAINER_NAME_CONFIGURE }}
subject-digest: ${{ steps.push_configure.outputs.digest }}
push-to-registry: true

- name: Extract metadata (build)
id: meta_build
uses: docker/metadata-action@v6
uses: docker/metadata-action@dc802804100637a589fabce1cb79ff13a1411302 # v6.2.0
with:
images: |
${{ env.REGISTRY }}/${{ env.REPO_NAME }}/${{ env.CONTAINER_NAME_BUILD }}
Expand All @@ -72,7 +72,7 @@ jobs:

- name: Build & Push (build)
id: push_build
uses: docker/build-push-action@v7
uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
with:
context: ${{ env.PATH_CONTEXT }}
file: ${{ env.PATH_CONTEXT }}/build.Dockerfile
Expand All @@ -81,7 +81,7 @@ jobs:
labels: ${{ steps.meta_build.outputs.labels }}

- name: Attest (build)
uses: actions/attest-build-provenance@v4
uses: actions/attest-build-provenance@0f67c3f4856b2e3261c31976d6725780e5e4c373 # v4.1.1
with:
subject-name: ${{ env.REGISTRY }}/${{ env.REPO_NAME }}/${{ env.CONTAINER_NAME_BUILD }}
subject-digest: ${{ steps.push_build.outputs.digest }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ls-eclipsejdt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@ jobs:
timeout-minutes: 15
steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0

- name: Login to GitHub Container Registry
uses: docker/login-action@v4
uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata
id: meta
uses: docker/metadata-action@v6
uses: docker/metadata-action@dc802804100637a589fabce1cb79ff13a1411302 # v6.2.0
with:
images: |
${{ env.REGISTRY }}/${{ env.REPO_NAME }}/${{ env.CONTAINER_NAME }}
Expand All @@ -44,7 +44,7 @@ jobs:

- name: Build & Push
id: push
uses: docker/build-push-action@v7
uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
with:
context: .
file: ${{ env.PATH_CONTEXT }}/Dockerfile
Expand All @@ -53,7 +53,7 @@ jobs:
labels: ${{ steps.meta.outputs.labels }}

- name: Attest
uses: actions/attest-build-provenance@v4
uses: actions/attest-build-provenance@0f67c3f4856b2e3261c31976d6725780e5e4c373 # v4.1.1
with:
subject-name: ${{ env.REGISTRY }}/${{ env.REPO_NAME }}/${{ env.CONTAINER_NAME }}
subject-digest: ${{ steps.push.outputs.digest }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ls-groovy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@ jobs:
timeout-minutes: 15
steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0

- name: Login to GitHub Container Registry
uses: docker/login-action@v4
uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata
id: meta
uses: docker/metadata-action@v6
uses: docker/metadata-action@dc802804100637a589fabce1cb79ff13a1411302 # v6.2.0
with:
images: |
${{ env.REGISTRY }}/${{ env.REPO_NAME }}/${{ env.CONTAINER_NAME }}
Expand All @@ -44,7 +44,7 @@ jobs:

- name: Build & Push
id: push
uses: docker/build-push-action@v7
uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
with:
context: .
file: ${{ env.PATH_CONTEXT }}/Dockerfile
Expand All @@ -53,7 +53,7 @@ jobs:
labels: ${{ steps.meta.outputs.labels }}

- name: Attest
uses: actions/attest-build-provenance@v4
uses: actions/attest-build-provenance@0f67c3f4856b2e3261c31976d6725780e5e4c373 # v4.1.1
with:
subject-name: ${{ env.REGISTRY }}/${{ env.REPO_NAME }}/${{ env.CONTAINER_NAME }}
subject-digest: ${{ steps.push.outputs.digest }}
Expand Down
37 changes: 34 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,17 @@ on:
- main
- dev
workflow_dispatch:
inputs:
dryRun:
description: 'Perform a dry run without publishing to npm'
required: true
default: true
type: boolean
npmTag:
description: 'Enforce a specific tag for creating a pre-release. If not provided, the tag will be determined automatically based on the version in package.json'
required: false
default: ''
type: string

jobs:
build:
Expand All @@ -20,10 +31,10 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0

- name: mise-en-place
uses: jdx/mise-action@v4
uses: jdx/mise-action@e6a8b3978addb5a52f2b4cd9d91eafa7f0ab959d # v4.2.0

- name: Install
shell: bash
Expand All @@ -40,12 +51,32 @@ jobs:
run: |
npm run build

- name: Lint
- name: Lint & Format
shell: bash
run: |
npm run lint
npm run fmt

- name: Test
shell: bash
run: |
npm run test:ci:tags

- name: Setup
env:
NPM_DRY_RUN: ${{ github.event.inputs.dryRun }}
NPM_TAG: ${{ github.event.inputs.npmTag }}
# logs the ENV values and stores them back in GITHUB_ENV with proper defaults for the next step
run: |
./.github/workflows/scripts/checkStatus.sh

- name: Publish
# dry-run can only be set to false if executed manually
uses: TypeFox/gh-publish-npm@fd8799b805ddfb79d82fbdfed8efdc9a1fad8f25 # v0.3.2
with:
dry-run: ${{ env.NPM_DRY_RUN }}
npm-tag: ${{ env.NPM_TAG }}
npm-packages: |
packages/client
packages/vscode-ws-jsonrpc
packages/wrapper-react
12 changes: 12 additions & 0 deletions .github/workflows/scripts/checkStatus.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/bash

echo -e "\nReporting env variable values:"

npmDryRun=${NPM_DRY_RUN:-true}
npmTag=${NPM_TAG:-''}

echo "NPM_DRY_RUN: ${npmDryRun}"
echo "NPM_TAG: ${npmTag}"

echo "NPM_DRY_RUN=${npmDryRun}" >> $GITHUB_ENV
echo "NPM_TAG=${npmTag}" >> $GITHUB_ENV
4 changes: 2 additions & 2 deletions .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0

- name: mise-en-place
uses: jdx/mise-action@v4
uses: jdx/mise-action@e6a8b3978addb5a52f2b4cd9d91eafa7f0ab959d # v4.2.0

- name: Install
shell: bash
Expand Down
5 changes: 3 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"js/ts.tsdk.path": "node_modules/typescript/lib",
"editor.guides.bracketPairs": true,
"editor.defaultFormatter": "oxc.oxc-vscode",
"oxc.enable": true,
Expand All @@ -9,5 +8,7 @@
"workbench.editor.revealIfOpen": true,
"terminal.integrated.scrollback": 10000,
"editor.minimap.enabled": false,
"editor.foldingImportsByDefault": false
"editor.foldingImportsByDefault": false,
"js/ts.experimental.useTsgo": true,
"js/ts.tsdk.path": "./node_modules/typescript"
}
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ These are the current versions of packages from this repository and their alignm
- **monaco-languageclient**: `11.0.0-next.0` (release date: unreleased)
- **@typefox/monaco-editor-react**: `8.0.0-next.0` (release date: unreleased)
- Aligned with:
- **@codingame/monaco-vscode-[editor]-api**: `34.1.3`
- **@codingame/monaco-vscode-[editor]-api**: `35.0.0`
- **vscode**: `1.124.0`
- **monaco-editor**: `0.55.1`
- **vscode-ws-jsonrpc**: `4.0.0-next.0` (release date: unreleased)
Expand All @@ -98,6 +98,8 @@ mise upgrade
npm i
# Cleans-up, compiles and builds everything
npm run build
# downloads additional files needed for some examples
npm run init:examples
```

### Vite dev server
Expand Down
10 changes: 5 additions & 5 deletions docs/guides/troubleshooting.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Whenever you use `monaco-editor`/`@codingame/monaco-vscode-editor-api` `vscode`/
If you use pnpm or yarn, you have to add `vscode` / `@codingame/monaco-vscode-api` as direct dependency, otherwise the installation will fail:

```json
"vscode": "npm:@codingame/monaco-vscode-extension-api@^34.1.3"
"vscode": "npm:@codingame/monaco-vscode-extension-api@^35.0.0"
```

### Missing Overrides or Resolutions
Expand All @@ -23,7 +23,7 @@ To ensure all Monaco-related packages use a single, compatible version, you must
```json
{
"overrides": {
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@^34.1.3"
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@^35.0.0"
}
}
```
Expand All @@ -33,7 +33,7 @@ To ensure all Monaco-related packages use a single, compatible version, you must
```json
{
"resolutions": {
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@^34.1.3"
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@^35.0.0"
}
}
```
Expand All @@ -50,7 +50,7 @@ Additionally, if you see a message in the browser console starting with `Another

### @codingame/monaco-vscode-editor-api / monaco-editor usage

When you use the libraries from this project you are no longer required to proxy `monaco-editor` like `"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@^34.1.3"` in you `package.json`. You can directly use it like so:
When you use the libraries from this project you are no longer required to proxy `monaco-editor` like `"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@^35.0.0"` in you `package.json`. You can directly use it like so:

```js
import * as monaco from '@codingame/monaco-vscode-editor-api';
Expand All @@ -60,7 +60,7 @@ If your dependency stack already contains a reference `monaco-editor` you must e

```json
"overrides": {
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@^34.1.3"
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@^35.0.0"
}
```

Expand Down
Loading