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

add support for plugin-specific public path

Browse source 
Override the public path from which files generated by this plugin will be served. This wins out over Webpack's dynamic runtime path and can be useful to avoid attempting to load workers cross-origin when using a CDN for other static resources.
This commit is contained in:
James Diefenderfer 2019-11-15 12:46:16 -08:00
parent 1d1473de8e
commit c9c13e7b55
No known key found for this signature in database
GPG key ID: EDE86934D2A0665C
3 changed files with 29 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

26
index.js
View file

@ -53,22 +53,22 @@ class MonacoWebpackPlugin {
constructor(options = {}) {
const languages = options.languages || Object.keys(languagesById);
const features = getFeaturesIds(options.features || [], featuresById);
const output = options.output || '';
this.options = {
languages: languages.map((id) => languagesById[id]).filter(Boolean),
features: features.map(id => featuresById[id]).filter(Boolean),
output,
output: options.output || '',
publicPath: options.publicPath || ''
};
}
apply(compiler) {
const { languages, features, output } = this.options;
const publicPath = getPublicPath(compiler);
const { languages, features, output, publicPath } = this.options;
const compilationPublicPath = getCompilationPublicPath(compiler);
const modules = [EDITOR_MODULE].concat(languages).concat(features);
const workers = modules.map(
({ label, alias, worker }) => worker && (mixin({ label, alias }, worker))
).filter(Boolean);
const rules = createLoaderRules(languages, features, workers, output, publicPath);
const rules = createLoaderRules(languages, features, workers, output, publicPath, compilationPublicPath);
const plugins = createPlugins(workers, output);
addCompilerRules(compiler, rules);
addCompilerPlugins(compiler, plugins);
@ -85,11 +85,11 @@ function addCompilerPlugins(compiler, plugins) {
plugins.forEach((plugin) => plugin.apply(compiler));
}
function getPublicPath(compiler) {
function getCompilationPublicPath(compiler) {
return compiler.options.output && compiler.options.output.publicPath || '';
}
function createLoaderRules(languages, features, workers, outputPath, publicPath) {
function createLoaderRules(languages, features, workers, outputPath, pluginPublicPath, compilationPublicPath) {
if (!languages.length && !features.length) { return []; }
const languagePaths = flatArr(languages.map(({ entry }) => entry).filter(Boolean));
const featurePaths = flatArr(features.map(({ entry }) => entry).filter(Boolean));
@ -110,6 +110,16 @@ function createLoaderRules(languages, features, workers, outputPath, publicPath)
workerPaths['razor'] = workerPaths['html'];
}
// Determine the public path from which to load worker JS files. In order of precedence:
// 1. Plugin-specific public path.
// 2. Dynamic runtime public path.
// 3. Compilation public path.
const pathPrefix = Boolean(pluginPublicPath)
? JSON.stringify(pluginPublicPath)
: `typeof window.__webpack_public_path__ === 'string' ` +
`? window.__webpack_public_path__ ` +
`: ${JSON.stringify(compilationPublicPath)}`
const globals = {
'MonacoEnvironment': `(function (paths) {
function stripTrailingSlash(str) {
@ -117,7 +127,7 @@ function createLoaderRules(languages, features, workers, outputPath, publicPath)
}
return {
getWorkerUrl: function (moduleId, label) {
var pathPrefix = (typeof window.__webpack_public_path__ === 'string' ? window.__webpack_public_path__ : ${JSON.stringify(publicPath)});
var pathPrefix = ${pathPrefix};
return (pathPrefix ? stripTrailingSlash(pathPrefix) + '/' : '') + paths[label];
}
};