Skip to content

Commit fa48339

Browse files
committed
monaco-editor-core no longer ships any built-in languages
1 parent 09b4121 commit fa48339

3 files changed

Lines changed: 13 additions & 13 deletions

File tree

build/gulpfile.editor.js

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
var gulp = require('gulp');
77
var path = require('path');
88
var _ = require('underscore');
9-
var buildfile = require('../src/buildfile');
109
var util = require('./lib/util');
1110
var common = require('./gulpfile.common');
1211
var es = require('event-stream');
@@ -19,20 +18,25 @@ var headerVersion = semver + '(' + sha1 + ')';
1918

2019
// Build
2120

22-
var editorEntryPoints = _.flatten([
23-
buildfile.entrypoint('vs/editor/editor.main'),
24-
buildfile.base,
25-
buildfile.editor,
26-
buildfile.languages
27-
]);
21+
var editorEntryPoints = [
22+
{
23+
name: 'vs/editor/editor.main',
24+
include: [],
25+
exclude: [ 'vs/css', 'vs/nls' ]
26+
},
27+
{
28+
name: 'vs/base/common/worker/simpleWorker',
29+
include: [ 'vs/editor/common/services/editorSimpleWorker' ],
30+
exclude: [ 'vs/css', 'vs/nls' ]
31+
},
32+
]
2833

2934
var editorResources = [
3035
'out-build/vs/{base,editor}/**/*.{svg,png}',
3136
'!out-build/vs/base/browser/ui/splitview/**/*',
3237
'!out-build/vs/base/browser/ui/toolbar/**/*',
3338
'!out-build/vs/base/browser/ui/octiconLabel/**/*',
3439
'!out-build/vs/editor/contrib/defineKeybinding/**/*',
35-
'out-build/vs/base/worker/workerMainCompatibility.html',
3640
'out-build/vs/base/worker/workerMain.{js,js.map}',
3741
'!out-build/vs/workbench/**',
3842
'!**/test/**'

build/monaco/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "monaco-editor-core",
33
"private": true,
4-
"version": "0.7.0-next.4",
4+
"version": "0.7.0-next.5",
55
"description": "A browser based code editor",
66
"author": "Microsoft Corporation",
77
"license": "MIT",

src/vs/editor/browser/standalone/standaloneServices.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ import {
4141
import {ContextKeyService} from 'vs/platform/contextkey/browser/contextKeyService';
4242
import {IMenuService} from 'vs/platform/actions/common/actions';
4343
import {MenuService} from 'vs/platform/actions/common/menuService';
44-
import {ICompatWorkerService} from 'vs/editor/common/services/compatWorkerService';
45-
import {MainThreadCompatWorkerService} from 'vs/editor/common/services/compatWorkerServiceMain';
4644

4745
export interface IEditorContextViewService extends IContextViewService {
4846
dispose(): void;
@@ -137,8 +135,6 @@ export module StaticServices {
137135

138136
export const modelService = define(IModelService, (o) => new ModelServiceImpl(markerService.get(o), configurationService.get(o), messageService.get(o)));
139137

140-
export const compatWorkerService = define(ICompatWorkerService, (o) => new MainThreadCompatWorkerService(modelService.get(o)));
141-
142138
export const editorWorkerService = define(IEditorWorkerService, (o) => new EditorWorkerServiceImpl(modelService.get(o)));
143139

144140
export const codeEditorService = define(ICodeEditorService, () => new CodeEditorServiceImpl());

0 commit comments

Comments
 (0)