SystemSh0cker/monaco-editor
1
0
Fork 0
mirror of https://github.com/microsoft/monaco-editor.git synced 2025-12-22 05:50:11 +01:00
Code Issues Projects Releases Packages Activity

Adopt loader-utils breaking changes

Browse source
This commit is contained in:
Alex Dima 2021-11-16 09:41:37 +01:00
parent ed1ee25b7b
commit 009bc9b864
No known key found for this signature in database
GPG key ID: 39563C1504FDD0C9
2 changed files with 26 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
webpack-plugin/src/index.ts
View file

@ -6,6 +6,7 @@ import { AddWorkerEntryPointPlugin } from './plugins/AddWorkerEntryPointPlugin';
import { languagesArr, EditorLanguage } from './languages';
import { featuresArr, EditorFeature, NegatedEditorFeature } from './features';
import { IFeatureDefinition } from './types';
import { ILoaderOptions } from './loaders/include';
const INCLUDE_LOADER_PATH = require.resolve('./loaders/include');
@ -282,17 +283,18 @@ function createLoaderRules(
};
})(${JSON.stringify(workerPaths, null, 2)})`
};
const options: ILoaderOptions = {
globals,
pre: featurePaths.map((importPath) => resolveMonacoPath(importPath, monacoEditorPath)),
post: languagePaths.map((importPath) => resolveMonacoPath(importPath, monacoEditorPath))
};
return [
{
test: /esm[/\\]vs[/\\]editor[/\\]editor.(api|main).js/,
use: [
{
loader: INCLUDE_LOADER_PATH,
options: {
globals,
pre: featurePaths.map((importPath) => resolveMonacoPath(importPath, monacoEditorPath)),
post: languagePaths.map((importPath) => resolveMonacoPath(importPath, monacoEditorPath))
}
options
}
]
}

26
webpack-plugin/src/loaders/include.ts
View file

@ -1,7 +1,15 @@
const loaderUtils = require('loader-utils');
import type { PitchLoaderDefinitionFunction } from 'webpack';
export function pitch(this: any, remainingRequest: any) {
const { globals = undefined, pre = [], post = [] } = loaderUtils.getOptions(this) || {};
export interface ILoaderOptions {
globals?: { [key: string]: string };
pre?: string[];
post?: string[];
}
export const pitch: PitchLoaderDefinitionFunction<ILoaderOptions> = function pitch(
remainingRequest
) {
const { globals = undefined, pre = [], post = [] } = this.getOptions() || {};
// HACK: NamedModulesPlugin overwrites existing modules when requesting the same module via
// different loaders, so we need to circumvent this by appending a suffix to make the name unique
@ -10,12 +18,16 @@ export function pitch(this: any, remainingRequest: any) {
this._module.userRequest = `include-loader!${this._module.userRequest}`;
}
const stringifyRequest = (request: string) => {
return JSON.stringify(this.utils.contextify(this.context || this.rootContext, request));
};
return [
...(globals
? Object.keys(globals).map((key) => `self[${JSON.stringify(key)}] = ${globals[key]};`)
: []),
...pre.map((include: any) => `require(${loaderUtils.stringifyRequest(this, include)});`),
`module.exports = require(${loaderUtils.stringifyRequest(this, `!!${remainingRequest}`)});`,
...post.map((include: any) => `require(${loaderUtils.stringifyRequest(this, include)});`)
...pre.map((include: any) => `require(${stringifyRequest(include)});`),
`module.exports = require(${stringifyRequest(`!!${remainingRequest}`)});`,
...post.map((include: any) => `require(${stringifyRequest(include)});`)
].join('\n');
}
};