Skip to content

Commit c11b519

Browse files
committed
Fix dynamic requires
1 parent 32f1283 commit c11b519

File tree

1 file changed

+38
-18
lines changed

1 file changed

+38
-18
lines changed

lib/runtime.js

Lines changed: 38 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,45 @@
11
'use babel'
22
import { CompositeDisposable, Disposable } from 'atom';
33

4-
// TODO Fix all of these dynamic requires and circular dependencies
4+
// TODO use babel to export ... from ...
5+
import modules from './runtime/modules'
6+
import * as environments from './runtime/environments'
7+
import evaluation from './runtime/evaluation'
8+
import * as console from './runtime/console'
9+
import completions from './runtime/completions'
10+
import workspace from './runtime/workspace'
11+
import plots from './runtime/plots'
12+
import * as frontend from './runtime/frontend'
13+
import * as debug from './runtime/debugger'
14+
import * as profiler from './runtime/profiler'
15+
import * as outline from './runtime/outline'
16+
import * as linter from './runtime/linter'
17+
import * as packages from './runtime/packages'
18+
import debuginfo from './runtime/debuginfo'
19+
import * as formatter from './runtime/formatter'
20+
import goto from './runtime/goto'
21+
import handleURI from "./runtime/urihandler";
22+
523

624
export default {
7-
modules: require('./runtime/modules'),
8-
environments: require('./runtime/environments'),
9-
evaluation: require('./runtime/evaluation'),
10-
console: require('./runtime/console'),
11-
completions: require('./runtime/completions'),
12-
workspace: require('./runtime/workspace'),
13-
plots: require('./runtime/plots'),
14-
frontend: require('./runtime/frontend'),
15-
debugger: require('./runtime/debugger'),
16-
profiler: require('./runtime/profiler'),
17-
outline: require('./runtime/outline'),
18-
linter: require('./runtime/linter'),
19-
packages: require('./runtime/packages'),
20-
debuginfo: require('./runtime/debuginfo'),
21-
formatter: require('./runtime/formatter'),
22-
goto: require('./runtime/goto'),
25+
// TODO remove these from the export default and export them directly (prevents expensive copy)
26+
// TODO don't use this.message use message directly (prevents expensive copy)
27+
modules: modules,
28+
environments: environments,
29+
evaluation: evaluation,
30+
console: console,
31+
completions: completions,
32+
workspace: workspace,
33+
plots: plots,
34+
frontend: frontend,
35+
debugger: debug,
36+
profiler: profiler,
37+
outline: outline,
38+
linter: linter,
39+
packages: packages,
40+
debuginfo: debuginfo,
41+
formatter: formatter,
42+
goto: goto,
2343

2444
activate() {
2545
this.subs = new CompositeDisposable();
@@ -100,5 +120,5 @@ export default {
100120
return datatipDisposable;
101121
},
102122

103-
handleURI: require('./runtime/urihandler')
123+
handleURI: handleURI,
104124
};

0 commit comments

Comments
 (0)