Skip to content

Commit 42b1214

Browse files
committed
Fix
1 parent 668297d commit 42b1214

File tree

5 files changed

+30
-27
lines changed

5 files changed

+30
-27
lines changed

packages/app/config/webpack.common.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -443,13 +443,13 @@ module.exports = {
443443
new CopyWebpackPlugin(
444444
[
445445
// Our own custom version of monaco
446-
{
447-
from: __DEV__
448-
? '../../standalone-packages/monaco-editor/release/dev/vs'
449-
: '../../standalone-packages/monaco-editor/release/min/vs',
450-
to: 'public/13/vs',
451-
force: true,
452-
},
446+
// {
447+
// from: __DEV__
448+
// ? '../../standalone-packages/monaco-editor/release/dev/vs'
449+
// : '../../standalone-packages/monaco-editor/release/min/vs',
450+
// to: 'public/13/vs',
451+
// force: true,
452+
// },
453453
{
454454
from: '../../standalone-packages/monaco-editor/release/min/vs',
455455
to: 'public/vscode/vs',

packages/app/scripts/build.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ recursive(paths.appBuild, (err, fileNames) => {
5959

6060
// Print a detailed summary of build files.
6161
function printFileSizes(stats, previousSizeMap) {
62-
console.log('make it stop');
63-
return;
6462
let assets = stats
6563
.toJson()
6664
.assets.filter(asset => /\.(js|css)$/.test(asset.name))

packages/app/src/app/components/CodeEditor/Monaco/MonacoReactComponent.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import React from 'react';
22
import FontFaceObserver from 'fontfaceobserver';
33

4-
import loaderBootstrap from 'app/vscode/dev-bootstrap';
5-
64
function noop() {}
75

86
class MonacoEditor extends React.PureComponent {
@@ -36,9 +34,12 @@ class MonacoEditor extends React.PureComponent {
3634
return;
3735
}
3836

39-
loaderBootstrap(['vs/editor/editor.main'])(() => {
40-
this.initMonaco();
41-
});
37+
// eslint-disable-next-line global-require
38+
require('app/vscode/dev-bootstrap').default(['vs/editor/editor.main'])(
39+
() => {
40+
this.initMonaco();
41+
}
42+
);
4243
};
4344

4445
initMonaco = () => {

packages/app/src/app/components/CodeEditor/VSCode/MonacoReactComponent.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import React from 'react';
22
import FontFaceObserver from 'fontfaceobserver';
33

44
import controller from 'app/controller';
5-
import loaderBootstrap from 'app/vscode/dev-bootstrap';
65
import './icon-theme.css';
76
import './workbench-theme.css';
87

@@ -40,7 +39,10 @@ class MonacoEditor extends React.PureComponent {
4039
};
4140

4241
afterViewInit = () => {
43-
loaderBootstrap(['vs/editor/codesandbox.editor.main'])(() => {
42+
// eslint-disable-next-line global-require
43+
require('app/vscode/dev-bootstrap').default([
44+
'vs/editor/codesandbox.editor.main',
45+
])(() => {
4446
this.initMonaco();
4547
});
4648
};

packages/app/src/app/index.js

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import requirePolyfills from 'common/load-dynamic-polyfills';
1414
import 'normalize.css';
1515
import 'common/global.css';
1616
import theme from 'common/theme';
17-
import loaderBootstrap from 'app/vscode/dev-bootstrap';
1817

1918
import controller from './controller';
2019
import App from './pages/index';
@@ -161,17 +160,20 @@ window.BrowserFS.configure(
161160
throw e;
162161
}
163162

164-
loaderBootstrap(['vs/editor/editor.main'])(() => {
165-
if (process.env.NODE_ENV === 'development') {
166-
console.log('Loaded Monaco'); // eslint-disable-line
167-
}
168-
if (localStorage.getItem('settings.experimentVSCode') === 'true') {
169-
window.require(['vs/editor/codesandbox.editor.main'], () => {
163+
// eslint-disable-next-line global-require
164+
require('app/vscode/dev-bootstrap').default(['vs/editor/editor.main'])(
165+
() => {
166+
if (process.env.NODE_ENV === 'development') {
167+
console.log('Loaded Monaco'); // eslint-disable-line
168+
}
169+
if (localStorage.getItem('settings.experimentVSCode') === 'true') {
170+
window.require(['vs/editor/codesandbox.editor.main'], () => {
171+
boot();
172+
});
173+
} else {
170174
boot();
171-
});
172-
} else {
173-
boot();
175+
}
174176
}
175-
});
177+
);
176178
}
177179
);

0 commit comments

Comments
 (0)