Skip to content

Commit 907a3bc

Browse files
committed
fix rebase
1 parent e3947c5 commit 907a3bc

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

libs/code-demos/src/lib/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { CodeDemoModule } from './code-demo.module';
2-
1+
export { CodeDemoModule } from './code-demo.module';
2+
export { addMetaInformation } from './shared/helpers';
33
export { EditorFromModelComponent } from './multitab-editor/editor-from-model/editor-from-model.component';
44
export { MultitabEditorComponent } from './multitab-editor/multitab-editor.component';
55
export { FilePathComponent } from './file-path/file-path.component';

libs/sandbox-runner/src/lib/script-loader/script-loader.service.ts

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,30 @@ import { assert } from '@codelab/utils';
33

44
declare const require;
55

6+
const scripts = {
7+
mocha: require('!!raw-loader!./assets/js/mocha').default,
8+
chai: require('!!raw-loader!chai/chai').default,
9+
'test-bootstrap':
10+
require('!!raw-loader!./assets/js/test-bootstrap').default,
11+
zone: require('!!raw-loader!./assets/js/zone.js').default,
12+
reflectMetadata: require('!!raw-loader!reflect-metadata/Reflect.js').default,
13+
'mock-console':
14+
require('!!raw-loader!./assets/js/mock-console').default,
15+
// TODO(kirjs): not sure we still need vue and react libs
16+
// vue: require('!!raw-loader!vue/dist/vue.js').default,
17+
// react: require('!!raw-loader!react/umd/react.development.js').default,
18+
// 'react-dom': require('!!raw-loader!react-dom/umd/react-dom.development.js').default
19+
};
20+
21+
type ScriptName = keyof typeof scripts;
22+
623
@Injectable({
724
providedIn: 'root',
825
})
926
export class ScriptLoaderService {
10-
private readonly scripts = {
11-
mocha: require('!!raw-loader!./assets/js/mocha').default,
12-
chai: require('!!raw-loader!chai/chai').default,
13-
'test-bootstrap':
14-
require('!!raw-loader!./assets/js/test-bootstrap').default,
15-
shim: require('!!raw-loader!core-js/client/shim.min.js').default,
16-
zone: require('!!raw-loader!zone.js/dist/zone.js').default,
17-
// 'system-config':
18-
// require('!!raw-loader!../../../assets/runner/js/system-config').default,
19-
'mock-console':
20-
require('!!raw-loader!./assets/js/mock-console').default,
21-
// TODO(kirjs): not sure we still need vue and react libs
22-
// vue: require('!!raw-loader!vue/dist/vue.js').default,
23-
// react: require('!!raw-loader!react/umd/react.development.js').default,
24-
// 'react-dom': require('!!raw-loader!react-dom/umd/react-dom.development.js').default
25-
};
2627

27-
getScript(url) {
28-
assert(this.scripts[url]);
29-
return this.scripts[url];
28+
getScript(url: ScriptName) {
29+
assert(scripts[url]);
30+
return scripts[url];
3031
}
3132
}

libs/sandbox-runner/src/lib/test-runner.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ export class TestRunner {
3535
private readonly code = {
3636
mocha: this.scriptLoaderService.getScript('mocha'),
3737
chai: this.scriptLoaderService.getScript('chai'),
38-
SystemJS: this.scriptLoaderService.getScript('SystemJS'),
3938
polyfill: `const window = globalThis;`,
4039
mochaSetup: `mocha.setup('bdd').reporter(function(a) {});`,
4140
mochaRun: mochaRun,

0 commit comments

Comments
 (0)