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

Merge remote-tracking branch 'origin/master' into pr/mikegreiling/23

Browse source
This commit is contained in:
Alex Dima 2018-07-03 12:42:51 +02:00
commit 146fedb9cf
2 changed files with 26 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

41
index.js
View file

@ -37,10 +37,10 @@ function resolveMonacoPath(filePath) {
const languagesById = fromPairs(
flatMap(toPairs(LANGUAGES), ([id, language]) =>
[id, ...(language.alias || [])].map((label) => [label, Object.assign({ label }, language )])
[id].concat(language.alias || []).map((label) => [label, mixin({ label }, language)])
)
);
const featuresById = mapValues(FEATURES, (feature, key) => Object.assign({ label: key }, feature ));
const featuresById = mapValues(FEATURES, (feature, key) => mixin({ label: key }, feature))
class MonacoWebpackPlugin {
constructor(options = {}) {
@ -57,9 +57,9 @@ class MonacoWebpackPlugin {
apply(compiler) {
const { languages, features, output } = this.options;
const publicPath = getPublicPath(compiler);
const modules = [EDITOR_MODULE, ...languages, ...features];
const modules = [EDITOR_MODULE].concat(languages).concat(features);
const workers = modules.map(
({ label, alias, worker }) => worker && Object.assign({ label, alias }, worker)
({ label, alias, worker }) => worker && (mixin({ label, alias }, worker))
).filter(Boolean);
const rules = createLoaderRules(languages, features, workers, output, publicPath);
const plugins = createPlugins(workers, output);
@ -71,8 +71,7 @@ class MonacoWebpackPlugin {
function addCompilerRules(compiler, rules) {
const compilerOptions = compiler.options;
const moduleOptions = compilerOptions.module || (compilerOptions.module = {});
const existingRules = moduleOptions.rules || (moduleOptions.rules = []);
existingRules.push(...rules);
moduleOptions.rules = (moduleOptions.rules || []).concat(rules);
}
function addCompilerPlugins(compiler, plugins) {
@ -124,11 +123,12 @@ function createPlugins(workers, outputPath) {
const workerFallbacks = workers.reduce((acc, { id, fallback }) => (fallback ? Object.assign(acc, {
[id]: resolveMonacoPath(fallback)
}) : acc), {});
return [
...Object.keys(IGNORED_IMPORTS).map((id) =>
return (
[]
.concat(Object.keys(IGNORED_IMPORTS).map((id) =>
createIgnoreImportsPlugin(id, IGNORED_IMPORTS[id])
),
...uniqBy(workers, ({ id }) => id).map(({ id, entry, output }) =>
))
.concat(uniqBy(workers, ({ id }) => id).map(({ id, entry, output }) =>
new AddWorkerEntryPointPlugin({
id,
entry: resolveMonacoPath(entry),
@ -138,14 +138,14 @@ function createPlugins(workers, outputPath) {
new webpack.optimize.LimitChunkCountPlugin({ maxChunks: 1 }),
],
})
),
...(workerFallbacks ? [createContextPlugin(WORKER_LOADER_PATH, workerFallbacks)] : []),
];
))
.concat(workerFallbacks ? [createContextPlugin(WORKER_LOADER_PATH, workerFallbacks)] : [])
);
}
function createContextPlugin(filePath, contextPaths) {
return new webpack.ContextReplacementPlugin(
new RegExp(`^${path.dirname(filePath)}$`),
new RegExp(`^${path.dirname(filePath).replace(/[\/\\]/g, '(/|\\\\)')}$`),
'',
contextPaths
);
@ -154,12 +154,12 @@ function createContextPlugin(filePath, contextPaths) {
function createIgnoreImportsPlugin(targetPath, ignoredModules) {
return new webpack.IgnorePlugin(
new RegExp(`^(${ignoredModules.map((id) => `(${id})`).join('|')})$`),
new RegExp(`^${path.dirname(targetPath)}$`)
new RegExp(`^${path.dirname(targetPath).replace(/[\/\\]/g, '(/|\\\\)')}$`)
);
}
function flatMap(items, iteratee) {
return items.map(iteratee).reduce((acc, item) => [...acc, ...item], []);
return items.map(iteratee).reduce((acc, item) => [].concat(acc).concat(item), []);
}
function toPairs(object) {
@ -188,4 +188,13 @@ function uniqBy(items, iteratee) {
}, []);
}
function mixin(dest, src) {
for (let prop in src) {
if (Object.hasOwnProperty.call(src, prop)) {
dest[prop] = src[prop];
}
}
return dest;
}
module.exports = MonacoWebpackPlugin;

2
test/package.json
View file

@ -4,6 +4,6 @@
"description": "",
"main": "index.js",
"scripts": {
"test": "../node_modules/.bin/webpack --config webpack.config.js"
"test": "node ../node_modules/webpack/bin/webpack.js --config webpack.config.js"
}
}