Skip to content

Commit

Permalink
Update dev dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
remcohaszing committed Aug 19, 2023
1 parent eff1033 commit 67c8b10
Show file tree
Hide file tree
Showing 16 changed files with 4,100 additions and 1,674 deletions.
2 changes: 0 additions & 2 deletions .eslintrc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,3 @@ extends:
- remcohaszing/typechecking
rules:
import/no-extraneous-dependencies: off

n/no-unsupported-features/node-builtins: off
9 changes: 9 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,15 @@ jobs:
- run: npm ci
- run: npx prettier --check .

remark:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with: { node-version: 18 }
- run: npm ci
- run: npx remark --frail .

tsc:
runs-on: ubuntu-latest
steps:
Expand Down
1 change: 0 additions & 1 deletion .prettierignore

This file was deleted.

2 changes: 2 additions & 0 deletions .remarkrc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
plugins:
- remark-preset-remcohaszing
4 changes: 2 additions & 2 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
Copyright © 2021 Remco Haszing

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
associated documentation files (the "Software"), to deal in the Software without restriction,
associated documentation files (the Software), to deal in the Software without restriction,
including without limitation the rights to use, copy, modify, merge, publish, distribute,
sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial
portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ Configure monaco-unified.
- `monaco`: The `monaco-editor` module.
- `options`: An object with the following properties:
- `label`: The label to use for the worker. This is used to match a worker in in
`MonacoEnvironment` (`string`).
- `label`: The label to use for the worker. This is used to match a worker in `MonacoEnvironment`
(`string`).
- `languageSelector`: The language ID or IDs to which to apply `monaco-unified`. (`string` |
`string[]`)
- `configuration`: The configuration that will be sent to the worker. (optional)
Expand Down
7 changes: 3 additions & 4 deletions examples/demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
"@fortawesome/fontawesome-free": "^6.0.0",
"assert": "^2.0.0",
"css-loader": "^6.0.0",
"css-minimizer-webpack-plugin": "^4.0.0",
"css-minimizer-webpack-plugin": "^5.0.0",
"html-webpack-plugin": "^5.0.0",
"mini-css-extract-plugin": "^2.0.0",
"monaco-editor": "^0.33.0",
"monaco-editor": "^0.41.0",
"monaco-unified": "file:..",
"remark": "^14.0.0",
"remark-gfm": "^3.0.0",
Expand All @@ -36,10 +36,9 @@
"retext-quotes": "^5.0.0",
"retext-repeated-words": "^4.0.0",
"ts-loader": "^9.0.0",
"typescript": "^4.0.0",
"unified": "^10.0.0",
"webpack": "^5.0.0",
"webpack-cli": "^4.0.0",
"webpack-cli": "^5.0.0",
"webpack-dev-server": "^4.0.0"
}
}
9 changes: 0 additions & 9 deletions examples/demo/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,6 @@ import { configureMonacoUnified } from 'monaco-unified'

import './index.css'

declare global {
interface Window {
/**
* The monaco environment.
*/
MonacoEnvironment: monaco.Environment
}
}

window.MonacoEnvironment = {
getWorker(moduleId, label) {
switch (label) {
Expand Down
3 changes: 3 additions & 0 deletions examples/demo/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ export default {
},
resolve: {
extensions: ['.mjs', '.js', '.ts'],
extensionAlias: {
'.js': ['.js', '.ts'],
},
alias: {
'monaco-unified': fileURLToPath(monacoUnified),
'decode-named-character-reference': fileURLToPath(
Expand Down
6 changes: 3 additions & 3 deletions src/index.ts → index.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { IDisposable, languages } from 'monaco-editor/esm/vs/editor/editor.api.js'
import { type IDisposable, languages } from 'monaco-editor/esm/vs/editor/editor.api.js'
import { registerMarkerDataProvider } from 'monaco-marker-data-provider'
import { createWorkerManager, WorkerManagerOptions } from 'monaco-worker-manager'
import { createWorkerManager, type WorkerManagerOptions } from 'monaco-worker-manager'

import {
createCodeActionProvider,
createDocumentFormattingProvider,
createMarkerDataProvider,
} from './languageFeatures.js'
import { UnifiedWorker } from './worker.js'
import { type UnifiedWorker } from './worker.js'

export interface MonacoUnifiedOptions<Configuration>
extends Pick<WorkerManagerOptions<Configuration>, 'interval' | 'label' | 'stopWhenIdleFor'> {
Expand Down
12 changes: 6 additions & 6 deletions src/languageFeatures.ts → languageFeatures.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { editor, languages } from 'monaco-editor'
import { MarkerDataProvider } from 'monaco-marker-data-provider'
import { WorkerGetter } from 'monaco-worker-manager'
import { type editor, type languages } from 'monaco-editor'
import { type MarkerDataProvider } from 'monaco-marker-data-provider'
import { type WorkerGetter } from 'monaco-worker-manager'

import { SerializableMarkerData, UnifiedWorker } from './worker.js'
import { type SerializableMarkerData, type UnifiedWorker } from './worker.js'

type GetWorker = WorkerGetter<UnifiedWorker>

Expand Down Expand Up @@ -102,9 +102,9 @@ export function createCodeActionProvider(): languages.CodeActionProvider {
edit: {
edits: [
{
edit: { range: message, text: expected },
textEdit: { range: message, text: expected },
resource: model.uri,
modelVersionId: model.getVersionId(),
versionId: model.getVersionId(),
},
],
},
Expand Down
Loading

0 comments on commit 67c8b10

Please sign in to comment.