fix rebase

Author: ALEX-ANV

apps/codelab/src/app/components/angular-test-runner/angular-test-runner.component.ts

@@ -12,13 +12,12 @@ import {
   SimpleChanges,
   ViewChild,
 } from '@angular/core';
-import { createSystemJsSandbox } from '@codelab/code-demos/src/lib/shared/sandbox';
-import { ScriptLoaderService } from '@codelab/code-demos/src/lib/shared/script-loader.service';
-import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
-import { Subscription } from 'rxjs/internal/Subscription';
-import { TestRunResult } from '@codelab/utils/src/lib/test-results/common';
+import { BehaviorSubject, Subscription } from 'rxjs';
 import { handleTestMessage } from './tests';
-import { addMetaInformation } from "@codelab/code-demos/src/lib/shared/helpers";
+import { ScriptLoaderService } from '@codelab/sandbox-runner';
+import { createSystemJsSandbox } from '@codelab/code-demos';
+import { TestRunResult } from '@codelab/utils';
+import { addMetaInformation } from '@codelab/code-demos';
 
 @Component({
   selector: 'codelab-simple-angular-test-runner',

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

@@ -1,5 +1,5 @@
-import { CodeDemoModule } from './code-demo.module';
-
+export { CodeDemoModule } from './code-demo.module';
+export { addMetaInformation } from './shared/helpers';
 export { EditorFromModelComponent } from './multitab-editor/editor-from-model/editor-from-model.component';
 export { MultitabEditorComponent } from './multitab-editor/multitab-editor.component';
 export { FilePathComponent } from './file-path/file-path.component';

libs/code-demos/assets/runner/ng2/build-umd-bundles/bundles/zone.js renamed to libs/sandbox-runner/src/lib/script-loader/assets/js/zone.js

@@ -3,29 +3,30 @@ import { assert } from '@codelab/utils';
 
 declare const require;
 
+const scripts = {
+  mocha: require('!!raw-loader!./assets/js/mocha').default,
+  chai: require('!!raw-loader!chai/chai').default,
+  'test-bootstrap':
+  require('!!raw-loader!./assets/js/test-bootstrap').default,
+  zone:  require('!!raw-loader!./assets/js/zone.js').default,
+  reflectMetadata: require('!!raw-loader!reflect-metadata/Reflect.js').default,
+  'mock-console':
+  require('!!raw-loader!./assets/js/mock-console').default,
+  // TODO(kirjs): not sure we still need vue and react libs
+  // vue: require('!!raw-loader!vue/dist/vue.js').default,
+  // react: require('!!raw-loader!react/umd/react.development.js').default,
+  // 'react-dom': require('!!raw-loader!react-dom/umd/react-dom.development.js').default
+};
+
+type ScriptName = keyof  typeof scripts;
+
 @Injectable({
   providedIn: 'root',
 })
 export class ScriptLoaderService {
-  private readonly scripts = {
-    mocha: require('!!raw-loader!./assets/js/mocha').default,
-    chai: require('!!raw-loader!chai/chai').default,
-    'test-bootstrap':
-      require('!!raw-loader!./assets/js/test-bootstrap').default,
-    shim: require('!!raw-loader!core-js/client/shim.min.js').default,
-    zone: require('!!raw-loader!zone.js/dist/zone.js').default,
-    // 'system-config':
-    //   require('!!raw-loader!../../../assets/runner/js/system-config').default,
-    'mock-console':
-      require('!!raw-loader!./assets/js/mock-console').default,
-    // TODO(kirjs): not sure we still need vue and react libs
-    // vue: require('!!raw-loader!vue/dist/vue.js').default,
-    // react: require('!!raw-loader!react/umd/react.development.js').default,
-    // 'react-dom': require('!!raw-loader!react-dom/umd/react-dom.development.js').default
-  };
 
-  getScript(url) {
-    assert(this.scripts[url]);
-    return this.scripts[url];
+  getScript(url: ScriptName) {
+    assert(scripts[url]);
+    return scripts[url];
   }
 }

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

@@ -35,7 +35,6 @@ export class TestRunner {
   private readonly code = {
     mocha: this.scriptLoaderService.getScript('mocha'),
     chai: this.scriptLoaderService.getScript('chai'),
-    SystemJS: this.scriptLoaderService.getScript('SystemJS'),
     polyfill: `const window = globalThis;`,
     mochaSetup: `mocha.setup('bdd').reporter(function(a) {});`,
     mochaRun: mochaRun,