fixed load bundles

Author: ALEX-ANV

apps/codelab/src/app/codelabs/angular/forms/samples/basic/main.ts

@@ -5,8 +5,15 @@ import * as code from './code';
 
 class MyResourceLoader extends ResourceLoader {
   get(url: string): Promise<string> {
+    let searchString = url.replace(/[\/\.-]/gi, '_');
+
+    // TODO(sancheez): fix load templates with relative url (relative url in Component)
+    if (url.startsWith(".")) {
+      searchString = searchString.substring(2);
+    }
+
     const templateId = Object.keys(code).find((key) =>
-      key.includes(url.replace(/[\/\.-]/gi, '_'))
+      key.includes(searchString)
     );
     const template = code[templateId];
     if (!template) {

apps/codelab/src/app/codelabs/angular/material/samples/basic/main.ts

@@ -5,8 +5,15 @@ import * as code from './code';
 
 class MyResourceLoader extends ResourceLoader {
   get(url: string): Promise<string> {
+    let searchString = url.replace(/[\/\.-]/gi, '_');
+
+    // TODO(sancheez): fix load templates with relative url (relative url in Component)
+    if (url.startsWith(".")) {
+      searchString = searchString.substring(2);
+    }
+
     const templateId = Object.keys(code).find((key) =>
-      key.includes(url.replace(/[\/\.-]/gi, '_'))
+      key.includes(searchString)
     );
     const template = code[templateId];
     if (!template) {

apps/codelab/src/app/codelabs/angular/router/samples/simple-router/main.ts

@@ -5,9 +5,18 @@ import * as code from './code';
 
 class MyResourceLoader extends ResourceLoader {
   get(url: string): Promise<string> {
+
+    let searchString = url.replace(/[\/\.-]/gi, '_');
+
+    // TODO(sancheez): fix load templates with relative url (relative url in Component)
+    if (url.startsWith(".")) {
+      searchString = searchString.substring(2);
+    }
+
     const templateId = Object.keys(code).find((key) =>
-      key.includes(url.replace(/[\/\.-]/gi, '_'))
+      key.includes(searchString)
     );
+
     const template = code[templateId];
     if (!template) {
       console.log(template);

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

@@ -126,8 +126,9 @@ export class SimpleAngularTestRunnerComponent
         url: '/assets/runner',
       },
       ({ evalJs }) => {
+        evalJs(this.scriptLoaderService.getScript('chai'));
         // evalJs(this.scriptLoaderService.getScript('shim'));
-        // evalJs(this.scriptLoaderService.getScript('zone'));
+        evalJs(this.scriptLoaderService.getScript('zone'));
       }
     );
 
@@ -136,13 +137,8 @@ export class SimpleAngularTestRunnerComponent
         '<app-root></app-root><my-app></my-app><div class="error"></div>'
     );
 
-    sandbox.evalJs(this.scriptLoaderService.getScript('chai'));
     sandbox.evalJs(this.scriptLoaderService.getScript('mocha'));
     sandbox.evalJs(this.scriptLoaderService.getScript('test-bootstrap'));
-    // sandbox.evalJs(this.scriptLoaderService.getScript('shim'));
-    // sandbox.evalJs(this.scriptLoaderService.getScript('zone'));
-    // sandbox.evalJs(this.scriptLoaderService.getScript('system-config'));
-    // sandbox.evalJs(this.scriptLoaderService.getScript('ng-bundle'));
 
     this.subscription = this.changedFilesSubject.subscribe((files) => {
       addMetaInformation(sandbox, this.code);
@@ -152,7 +148,8 @@ export class SimpleAngularTestRunnerComponent
         .filter(([path]) => path.match(/\.js$/) && !path.startsWith('code'))
         .map(([path, code]) => {
           try {
-            sandbox.evalJs(`console.log('I remove modul')`);
+
+            sandbox.evalJs(`console.log('I remove module')`);
             sandbox.evalJs(code);
           } catch (e) {
             console.groupCollapsed(e.message);

apps/codelab/src/app/shared/angular-code/bootstrap.ts

@@ -5,8 +5,16 @@ import { AppModule } from './app.module';
 
 class MyResourceLoader extends ResourceLoader {
   get(url: string): Promise<string> {
+
+    let searchString = url.replace(/[\/\.-]/gi, '_');
+
+    // TODO(sancheez): fix load templates with relative url (relative url in Component)
+    if (url.startsWith(".")) {
+      searchString = searchString.substring(2);
+    }
+
     const templateId = Object.keys(code).find((key) =>
-      key.includes(url.replace(/[\/\.-]/gi, '_'))
+      key.includes(searchString)
     );
     const template = code[templateId];
     if (!template) {