mirror of
https://github.com/danbulant/monaco-yaml
synced 2026-05-24 12:21:53 +00:00
Use extensions for directly importing files
For better ESM compatibility, this adds a file extension for nested package files. This also removes the nested special handling of `vscode-languageserver-types` and `vscode-languageserver-document` imports. This is unnecessary, because they use the `"module"` field in `package.json`.
This commit is contained in:
parent
545e6a6bc4
commit
ccfbbbe9d8
9 changed files with 14 additions and 25 deletions
|
|
@ -8,6 +8,7 @@ rules:
|
||||||
'@typescript-eslint/no-shadow': off
|
'@typescript-eslint/no-shadow': off
|
||||||
'@typescript-eslint/no-unnecessary-condition': off
|
'@typescript-eslint/no-unnecessary-condition': off
|
||||||
|
|
||||||
|
import/extensions: off
|
||||||
import/no-extraneous-dependencies: off
|
import/no-extraneous-dependencies: off
|
||||||
import/no-unresolved: off
|
import/no-unresolved: off
|
||||||
|
|
||||||
|
|
|
||||||
20
build.js
20
build.js
|
|
@ -22,20 +22,8 @@ fs.rm(join(__dirname, 'lib'), { force: true, recursive: true })
|
||||||
setup({ onResolve }) {
|
setup({ onResolve }) {
|
||||||
// The yaml language service only imports re-exports of vscode-languageserver-types from
|
// The yaml language service only imports re-exports of vscode-languageserver-types from
|
||||||
// vscode-languageserver.
|
// vscode-languageserver.
|
||||||
onResolve({ filter: /^vscode-languageserver-textdocument$/ }, () => ({
|
onResolve({ filter: /^vscode-languageserver(\/node|-protocol)?$/ }, () => ({
|
||||||
path: 'vscode-languageserver-textdocument/lib/esm/main.js',
|
path: 'vscode-languageserver-types',
|
||||||
external: true,
|
|
||||||
}));
|
|
||||||
// The yaml language service only imports re-exports of vscode-languageserver-types from
|
|
||||||
// vscode-languageserver.
|
|
||||||
onResolve({ filter: /^vscode-languageserver(\/node)?$/ }, () => ({
|
|
||||||
path: 'vscode-languageserver-types/lib/esm/main.js',
|
|
||||||
external: true,
|
|
||||||
}));
|
|
||||||
// The yaml language service only imports re-exports of vscode-languageserver-types from
|
|
||||||
// vscode-languageserver.
|
|
||||||
onResolve({ filter: /^vscode-languageserver-(protocol|types)$/ }, () => ({
|
|
||||||
path: 'vscode-languageserver-types/lib/esm/main.js',
|
|
||||||
external: true,
|
external: true,
|
||||||
}));
|
}));
|
||||||
// The yaml language service uses path. We can stub it using path-browserify.
|
// The yaml language service uses path. We can stub it using path-browserify.
|
||||||
|
|
@ -45,8 +33,8 @@ fs.rm(join(__dirname, 'lib'), { force: true, recursive: true })
|
||||||
}));
|
}));
|
||||||
// The main prettier entry point contains all of Prettier.
|
// The main prettier entry point contains all of Prettier.
|
||||||
// The standalone bundle is smaller and works fine for us.
|
// The standalone bundle is smaller and works fine for us.
|
||||||
onResolve({ filter: /^prettier$/ }, () => ({
|
onResolve({ filter: /^prettier/ }, ({ path }) => ({
|
||||||
path: 'prettier/standalone',
|
path: path === 'prettier' ? 'prettier/standalone.js' : `${path}.js`,
|
||||||
external: true,
|
external: true,
|
||||||
}));
|
}));
|
||||||
// This tiny filler implementation serves all our needs.
|
// This tiny filler implementation serves all our needs.
|
||||||
|
|
|
||||||
2
examples/demo/src/types.d.ts
vendored
2
examples/demo/src/types.d.ts
vendored
|
|
@ -15,7 +15,7 @@ declare module 'monaco-editor/esm/vs/editor/contrib/documentSymbols/documentSymb
|
||||||
): Promise<languages.DocumentSymbol[]>;
|
): Promise<languages.DocumentSymbol[]>;
|
||||||
}
|
}
|
||||||
|
|
||||||
declare module 'monaco-editor/esm/vs/editor/editor.worker' {
|
declare module 'monaco-editor/esm/vs/editor/editor.worker.js' {
|
||||||
import { worker } from 'monaco-editor/esm/vs/editor/editor.api';
|
import { worker } from 'monaco-editor/esm/vs/editor/editor.api';
|
||||||
|
|
||||||
export function initialize(
|
export function initialize(
|
||||||
|
|
|
||||||
|
|
@ -6,9 +6,9 @@ import {
|
||||||
Position,
|
Position,
|
||||||
Range,
|
Range,
|
||||||
Uri,
|
Uri,
|
||||||
} from 'monaco-editor/esm/vs/editor/editor.api';
|
} from 'monaco-editor/esm/vs/editor/editor.api.js';
|
||||||
import * as ls from 'vscode-languageserver-types';
|
import * as ls from 'vscode-languageserver-types';
|
||||||
import { CustomFormatterOptions } from 'yaml-language-server/lib/esm/languageservice/yamlLanguageService';
|
import { CustomFormatterOptions } from 'yaml-language-server/lib/esm/languageservice/yamlLanguageService.js';
|
||||||
|
|
||||||
import { languageId } from './constants';
|
import { languageId } from './constants';
|
||||||
import { YAMLWorker } from './yamlWorker';
|
import { YAMLWorker } from './yamlWorker';
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
import { Emitter, languages } from 'monaco-editor/esm/vs/editor/editor.api';
|
import { Emitter, languages } from 'monaco-editor/esm/vs/editor/editor.api.js';
|
||||||
|
|
||||||
import { languageId } from './constants';
|
import { languageId } from './constants';
|
||||||
import { setupMode } from './yamlMode';
|
import { setupMode } from './yamlMode';
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
import { editor, languages } from 'monaco-editor/esm/vs/editor/editor.api';
|
import { editor, languages } from 'monaco-editor/esm/vs/editor/editor.api.js';
|
||||||
|
|
||||||
import { WorkerAccessor } from './languageFeatures';
|
import { WorkerAccessor } from './languageFeatures';
|
||||||
import { YAMLWorker } from './yamlWorker';
|
import { YAMLWorker } from './yamlWorker';
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
import { initialize } from 'monaco-editor/esm/vs/editor/editor.worker';
|
import { initialize } from 'monaco-editor/esm/vs/editor/editor.worker.js';
|
||||||
|
|
||||||
import { createYAMLWorker, ICreateData } from './yamlWorker';
|
import { createYAMLWorker, ICreateData } from './yamlWorker';
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
import { languages } from 'monaco-editor/esm/vs/editor/editor.api';
|
import { languages } from 'monaco-editor/esm/vs/editor/editor.api.js';
|
||||||
|
|
||||||
import { languageId } from './constants';
|
import { languageId } from './constants';
|
||||||
import {
|
import {
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
import { worker } from 'monaco-editor/esm/vs/editor/editor.api';
|
import { worker } from 'monaco-editor/esm/vs/editor/editor.api.js';
|
||||||
import { Promisable } from 'type-fest';
|
import { Promisable } from 'type-fest';
|
||||||
import { TextDocument } from 'vscode-languageserver-textdocument';
|
import { TextDocument } from 'vscode-languageserver-textdocument';
|
||||||
import * as ls from 'vscode-languageserver-types';
|
import * as ls from 'vscode-languageserver-types';
|
||||||
|
|
@ -6,7 +6,7 @@ import {
|
||||||
CustomFormatterOptions,
|
CustomFormatterOptions,
|
||||||
getLanguageService,
|
getLanguageService,
|
||||||
LanguageSettings,
|
LanguageSettings,
|
||||||
} from 'yaml-language-server/lib/esm/languageservice/yamlLanguageService';
|
} from 'yaml-language-server/lib/esm/languageservice/yamlLanguageService.js';
|
||||||
|
|
||||||
import { languageId } from './constants';
|
import { languageId } from './constants';
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue