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

Catch up monaco-vscode-api and monaco #89

Merged
merged 40 commits into from
Feb 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
33fcf31
cleanup: remove extension files
Apr 21, 2023
de95910
cleanup: remove extension update script
Oct 16, 2023
93703bf
cleanup: remove outdated README instructions
Oct 16, 2023
939e8d9
cleanup: remove legacy code
Oct 16, 2023
336364f
refactor: rename directory
Oct 16, 2023
4b63767
feat: add scripts to update and download extension vsix
Oct 16, 2023
c45f20b
cleanup: remove deprecated theme management
Oct 16, 2023
75fb6c4
fix: fix eslint error
Oct 16, 2023
1bb057f
lib: update/install/uninstall dependencies
Oct 16, 2023
cdc33f1
feat: update rollup config
Oct 16, 2023
493d98b
fix: update target
Oct 16, 2023
9ad9f4e
feat: import vscode extensions
Oct 16, 2023
aacd0c7
fix: update workers config
Oct 16, 2023
3b55035
fix: update service initialization/usage
Oct 16, 2023
8c1cd18
fix: update import paths
Oct 16, 2023
3e1cae3
feat: install default extensions
Oct 16, 2023
11d1288
feat: add some optional features
Oct 16, 2023
928046e
libs: use latest version of monaco-vscode-api
samuel-olivier Oct 30, 2023
ab73c24
fix: improve worker workaround for webpack
samuel-olivier Oct 30, 2023
0aea4eb
refactor: make createEditor sync
samuel-olivier Oct 30, 2023
e3c8e25
fix: avoid module not found error
samuel-olivier Oct 30, 2023
d64903c
feat: fix worker configuration
Jan 25, 2024
309aa76
lib: update dependencies
Jan 25, 2024
8512eb0
fix: adapt code to lib update
Jan 25, 2024
fd44960
feat: expose a method to use global picker
Jan 25, 2024
6d23bc5
fix: remove extension scripts
Jan 25, 2024
efe9c77
lib: update all dependencies
Jan 26, 2024
085c3a7
fix: do not hash assets
Jan 26, 2024
2d6cdb4
cleanup: remove outdated doc
Jan 26, 2024
7a86817
fix: fix ci
Jan 26, 2024
80d3232
feat!: update extensions
Jan 26, 2024
d2a6d4f
fix: update node/npm
Jan 26, 2024
a6b06a3
cleanup: remove useless imports
Jan 26, 2024
6606dab
lib: use final version
Jan 29, 2024
86a1458
fix: remove outdated README section
Jan 29, 2024
5ae607c
fix: properly create workspace
Jan 29, 2024
69de554
feat: always register local extension host
Jan 29, 2024
667f381
feat: add missing service overrides
Jan 30, 2024
2cf2103
feat: allow crossorigin workers
Jan 30, 2024
f0a8305
fix: fix cross origin workers
Jan 30, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/workflows/check_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-node@v3
- run: npm ci
- run: npx commitlint --from HEAD~${{ github.event.pull_request.commits }} --to HEAD
- run: npx commitlint --from ${{ github.event.pull_request.head.sha }}~${{ github.event.pull_request.commits }} --to ${{ github.event.pull_request.head.sha }} --verbose
check:
name: Check build
runs-on: ubuntu-latest
Expand All @@ -28,7 +28,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 20.10.0
- name: Install dependencies
run: npm ci
- name: Build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 18.x
node-version: 20.10.0
- name: Install dependencies
run: npm ci
- name: Build
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ dist/*
stats.html
.vscode
node_modules
extensions
26 changes: 0 additions & 26 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ Monaco editor wrapper that adds some features and improvements to it:
- It allows the opening of an overlay editor when navigating to an external file
- It adds some language aliases

### Requirements

Webpack is required and it should be able to import a .wasm file as a file, using either the `file-loader` or [Asset modules](https://webpack.js.org/guides/asset-modules/)

### Installation

```bash
Expand All @@ -31,21 +27,6 @@ npm install @codingame/monaco-editor-wrapper

### Usage

:warning: You should NEVER import `monaco-editor` directly in your code.
`monaco-editor/esm/vs/editor/editor.api` should be used instead or Monaco will load all languages/worker and break the loading.
There are 2 solutions:
- if webpack is used, a resolve alias can be used:
```javascript
{
resolve: {
alias: {
'monaco-editor$': require.resolve('monaco-editor/esm/vs/editor/editor.api')
}
}
}
```
- you can directly use the `monaco` object exported from this library

#### Simple usage

The monaco-editor api should be used except for the editor creation.
Expand All @@ -63,13 +44,6 @@ To enable them, import the following files:

#### Additional apis

##### Highlighting/theme

This library uses VS Code themes instead of Monaco theme.
To add your custom theme, use the `defineVSCodeTheme` method.

Default Monaco theme shouldn't be used.

##### User configuration

This library exposed some functions to manage the user global configuration:
Expand Down
11,859 changes: 7,760 additions & 4,099 deletions package-lock.json

Large diffs are not rendered by default.

210 changes: 136 additions & 74 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@
"build": "npm run lint && npm run compile && npm run generate-types",
"compile": "node --experimental-json-modules ./node_modules/.bin/rollup --config rollup.config.ts --configPlugin typescript",
"generate-types": "tsc --project tsconfig.types.json",
"update-extensions": "node --loader ts-node/esm update-extensions.ts",
"lint": "eslint --ext .ts src update-extensions.ts"
"update-extensions": "node --loader ts-node/esm scripts/update-extensions.ts",
"download-extensions": "./scripts/download-extensions.sh",
"lint": "eslint --ext .ts src scripts/update-extensions.ts",
"preprepare": "npm run download-extensions"
},
"repository": {
"type": "git",
Expand All @@ -21,43 +23,43 @@
".": {
"default": "./dist/main.js"
},
"./features/jsonContribution": {
"types": "./dist/features/jsonContribution.d.ts",
"default": "./dist/features/jsonContribution.js"
"./features/views": {
"types": "./dist/features/views.d.ts",
"default": "./dist/features/views.js"
},
"./features/cssContribution": {
"types": "./dist/features/cssContribution.d.ts",
"default": "./dist/features/cssContribution.js"
"./features/viewPanels": {
"types": "./dist/features/viewPanels.d.ts",
"default": "./dist/features/viewPanels.js"
},
"./features/htmlContribution": {
"types": "./dist/features/htmlContribution.d.ts",
"default": "./dist/features/htmlContribution.js"
"./features/debug": {
"types": "./dist/features/debug.d.ts",
"default": "./dist/features/debug.js"
},
"./features/typescriptContribution": {
"types": "./dist/features/typescriptContribution.d.ts",
"default": "./dist/features/typescriptContribution.js"
"./features/search": {
"types": "./dist/features/search.d.ts",
"default": "./dist/features/search.js"
},
"./features/extensionConfigurations": {
"types": "./dist/features/extensionConfigurations.d.ts",
"default": "./dist/features/extensionConfigurations.js"
"./features/extensionHostWorker": {
"types": "./dist/features/extensionHostWorker.d.ts",
"default": "./dist/features/extensionHostWorker.js"
}
},
"typesVersions": {
"*": {
"features/jsonContribution": [
"./dist/features/jsonContribution.d.ts"
"features/views": [
"./dist/features/views.d.ts"
],
"features/cssContribution": [
"./dist/features/cssContribution.d.ts"
"features/viewPanels": [
"./dist/features/viewPanels.d.ts"
],
"features/htmlContribution": [
"./dist/features/htmlContribution.d.ts"
"features/debug": [
"./dist/features/debug.d.ts"
],
"features/typescriptContribution": [
"./dist/features/typescriptContribution.d.ts"
"features/search": [
"./dist/features/search.d.ts"
],
"features/extensionConfigurations": [
"./dist/features/extensionConfigurations.d.ts"
"features/extensionHostWorker": [
"./dist/features/extensionHostWorker.d.ts"
]
}
},
Expand All @@ -66,62 +68,120 @@
"stats.html"
],
"dependencies": {
"monaco-editor": "^0.34.0",
"vscode": "npm:@codingame/monaco-vscode-api@~1.69.21",
"vscode-oniguruma": "^1.6.2",
"vscode-textmate": "^7.0.4"
"@codingame/monaco-vscode-accessibility-service-override": "~2.0.0",
"@codingame/monaco-vscode-audio-cue-service-override": "~2.0.0",
"@codingame/monaco-vscode-clojure-default-extension": "~2.0.0",
"@codingame/monaco-vscode-coffeescript-default-extension": "~2.0.0",
"@codingame/monaco-vscode-configuration-editing-default-extension": "~2.0.0",
"@codingame/monaco-vscode-configuration-service-override": "~2.0.0",
"@codingame/monaco-vscode-cpp-default-extension": "~2.0.0",
"@codingame/monaco-vscode-csharp-default-extension": "~2.0.0",
"@codingame/monaco-vscode-css-default-extension": "~2.0.0",
"@codingame/monaco-vscode-debug-service-override": "~2.0.0",
"@codingame/monaco-vscode-dialogs-service-override": "~2.0.0",
"@codingame/monaco-vscode-diff-default-extension": "~2.0.0",
"@codingame/monaco-vscode-editor-service-override": "~2.0.0",
"@codingame/monaco-vscode-extensions-service-override": "~2.0.0",
"@codingame/monaco-vscode-fsharp-default-extension": "~2.0.0",
"@codingame/monaco-vscode-go-default-extension": "~2.0.0",
"@codingame/monaco-vscode-groovy-default-extension": "~2.0.0",
"@codingame/monaco-vscode-html-default-extension": "~2.0.0",
"@codingame/monaco-vscode-java-default-extension": "~2.0.0",
"@codingame/monaco-vscode-javascript-default-extension": "~2.0.0",
"@codingame/monaco-vscode-json-default-extension": "~2.0.0",
"@codingame/monaco-vscode-julia-default-extension": "~2.0.0",
"@codingame/monaco-vscode-keybindings-service-override": "~2.0.0",
"@codingame/monaco-vscode-language-detection-worker-service-override": "~2.0.0",
"@codingame/monaco-vscode-languages-service-override": "~2.0.0",
"@codingame/monaco-vscode-lifecycle-service-override": "~2.0.0",
"@codingame/monaco-vscode-log-service-override": "^2.0.1",
"@codingame/monaco-vscode-lua-default-extension": "~2.0.0",
"@codingame/monaco-vscode-markdown-basics-default-extension": "~2.0.0",
"@codingame/monaco-vscode-markdown-language-features-default-extension": "~2.0.0",
"@codingame/monaco-vscode-markdown-math-default-extension": "~2.0.0",
"@codingame/monaco-vscode-markers-service-override": "~2.0.0",
"@codingame/monaco-vscode-media-preview-default-extension": "~2.0.0",
"@codingame/monaco-vscode-model-service-override": "~2.0.0",
"@codingame/monaco-vscode-npm-default-extension": "~2.0.0",
"@codingame/monaco-vscode-objective-c-default-extension": "~2.0.0",
"@codingame/monaco-vscode-output-service-override": "~2.0.0",
"@codingame/monaco-vscode-perl-default-extension": "~2.0.0",
"@codingame/monaco-vscode-php-default-extension": "~2.0.0",
"@codingame/monaco-vscode-powershell-default-extension": "~2.0.0",
"@codingame/monaco-vscode-preferences-service-override": "~2.0.0",
"@codingame/monaco-vscode-python-default-extension": "~2.0.0",
"@codingame/monaco-vscode-quickaccess-service-override": "~2.0.0",
"@codingame/monaco-vscode-r-default-extension": "~2.0.0",
"@codingame/monaco-vscode-references-view-default-extension": "~2.0.0",
"@codingame/monaco-vscode-ruby-default-extension": "~2.0.0",
"@codingame/monaco-vscode-rust-default-extension": "~2.0.0",
"@codingame/monaco-vscode-scss-default-extension": "~2.0.0",
"@codingame/monaco-vscode-search-result-default-extension": "~2.0.0",
"@codingame/monaco-vscode-search-service-override": "~2.0.0",
"@codingame/monaco-vscode-shellscript-default-extension": "~2.0.0",
"@codingame/monaco-vscode-snippets-service-override": "~2.0.0",
"@codingame/monaco-vscode-sql-default-extension": "~2.0.0",
"@codingame/monaco-vscode-storage-service-override": "~2.0.0",
"@codingame/monaco-vscode-swift-default-extension": "~2.0.0",
"@codingame/monaco-vscode-textmate-service-override": "~2.0.0",
"@codingame/monaco-vscode-theme-defaults-default-extension": "~2.0.0",
"@codingame/monaco-vscode-theme-service-override": "~2.0.0",
"@codingame/monaco-vscode-theme-seti-default-extension": "~2.0.0",
"@codingame/monaco-vscode-typescript-basics-default-extension": "~2.0.0",
"@codingame/monaco-vscode-vb-default-extension": "~2.0.0",
"@codingame/monaco-vscode-view-status-bar-service-override": "~2.0.0",
"@codingame/monaco-vscode-views-service-override": "~2.0.0",
"@codingame/monaco-vscode-working-copy-service-override": "^2.0.1",
"@codingame/monaco-vscode-xml-default-extension": "~2.0.0",
"@codingame/monaco-vscode-yaml-default-extension": "~2.0.0",
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~2.0.0",
"vscode": "npm:@codingame/monaco-vscode-api@~2.0.0"
},
"devDependencies": {
"@babel/core": "7.21.0",
"@babel/plugin-proposal-class-properties": "7.18.6",
"@babel/plugin-proposal-optional-chaining": "7.21.0",
"@babel/preset-env": "7.20.2",
"@babel/preset-typescript": "7.21.0",
"@babel/runtime": "7.21.0",
"@codingame/commitlint-config-codingame": "^1.0.5",
"@codingame/eslint-config": "^1.1.6",
"@codingame/semantic-release-config": "^1.2.0",
"@codingame/commitlint-config-codingame": "^1.0.7",
"@codingame/eslint-config": "^1.1.10",
"@codingame/monaco-vscode-rollup-vsix-plugin": "~2.0.0",
"@codingame/semantic-release-config": "^1.3.5",
"@codingame/tsconfig": "^1.1.1",
"@commitlint/cli": "^17.4.4",
"@rollup/plugin-alias": "4.0.3",
"@rollup/plugin-babel": "6.0.3",
"@rollup/plugin-commonjs": "24.0.1",
"@rollup/plugin-json": "6.0.0",
"@rollup/plugin-node-resolve": "15.0.1",
"@rollup/plugin-typescript": "^11.0.0",
"@types/ini": "1.3.31",
"@types/js-yaml": "^4.0.5",
"@types/node": "18.11.18",
"@types/rollup-plugin-node-builtins": "^2.1.2",
"@types/vscode": "~1.69.1",
"@typescript-eslint/eslint-plugin": "5.53.0",
"@typescript-eslint/parser": "5.53.0",
"conventional-changelog-conventionalcommits": "^5.0.0",
"@commitlint/cli": "^18.6.0",
"@rollup/plugin-alias": "5.1.0",
"@rollup/plugin-commonjs": "25.0.7",
"@rollup/plugin-json": "6.1.0",
"@rollup/plugin-node-resolve": "15.2.3",
"@rollup/plugin-typescript": "^11.1.6",
"@types/ini": "4.1.0",
"@types/js-yaml": "^4.0.9",
"@types/node": "20.11.10",
"@types/rollup-plugin-node-builtins": "^2.1.5",
"@types/vscode": "~1.85.0",
"@typescript-eslint/eslint-plugin": "6.19.1",
"@typescript-eslint/parser": "6.19.1",
"@vscode/vsce": "^2.23.0",
"azure-devops-node-api": "^12.3.0",
"conventional-changelog-conventionalcommits": "^7.0.2",
"cson-parser": "4.0.9",
"deep-equal": "2.2.0",
"eslint": "8.34.0",
"eslint-config-standard": "17.0.0",
"eslint-plugin-import": "2.27.5",
"deep-equal": "2.2.3",
"eslint": "8.56.0",
"eslint-config-standard": "17.1.0",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-promise": "6.1.1",
"eslint-plugin-unused-imports": "2.0.0",
"eslint-plugin-unused-imports": "3.0.0",
"fast-plist": "0.1.3",
"ini": "3.0.1",
"ini": "4.1.1",
"js-yaml": "^4.1.0",
"json5": "2.2.3",
"monaco-emacs": "^0.3.0",
"monaco-vim": "^0.3.5",
"postcss": "8.4.21",
"rollup": "3.17.2",
"rollup-plugin-json5": "1.0.0",
"monaco-vim": "^0.4.1",
"postcss": "8.4.33",
"rollup": "4.9.6",
"rollup-plugin-glob-import": "^0.5.0",
"rollup-plugin-node-builtins": "^2.1.2",
"rollup-plugin-string": "^3.0.0",
"rollup-plugin-terser": "^7.0.2",
"rollup-plugin-visualizer": "5.9.0",
"rollup-plugin-web-worker-loader": "1.6.1",
"ts-node": "10.9.1",
"tslib": "^2.5.0",
"typescript": "4.9.5"
"rollup-plugin-visualizer": "5.12.0",
"ts-node": "10.9.2",
"tslib": "^2.6.2",
"typescript": "5.3.3"
},
"browserslist": [
"defaults",
Expand All @@ -132,10 +192,12 @@
"not IE_Mob 11"
],
"volta": {
"node": "18.13.0",
"npm": "9.4.1"
"node": "20.10.0",
"npm": "10.4.0"
},
"overrides": {
"rollup": "3.17.2"
"monaco-editor": "$monaco-editor",
"rollup": "4.9.6",
"typescript": "5.3.3"
}
}
Loading
Loading