Merge branch 'master' into child-routes

Author: Blackbaud-PaulCrowder

lib/sky-pages-route-generator.js

@@ -115,9 +115,10 @@ function generateRoutes(skyAppConfig) {
   });
 
   if (skyAppConfig.runtime.handle404) {
+    const err = `<sky-error errorType="notfound"></sky-error>`;
     entities.push({
       componentName: 'NotFoundComponent',
-      componentDefinition: `@Component({ template: '404' }) export class NotFoundComponent { }`,
+      componentDefinition: `@Component({ template: '${err}' }) export class NotFoundComponent { }`,
       routePath: ['**'],
       routeParams: []
     });

test/sky-pages-module-generator.spec.js

@@ -23,7 +23,7 @@ describe('SKY UX Builder module generator', () => {
       runtime: runtimeUtils.getDefaultRuntime(),
       skyux: {}
     });
-    expect(source).toContain("template: '404'");
+    expect(source).toContain("template: '<sky-error errorType=\"notfound\"></sky-error>'");
   });
 
   it('should not add the NotFoundComponent if it exists', () => {
@@ -39,7 +39,7 @@ describe('SKY UX Builder module generator', () => {
       skyux: {}
     });
     expect(source).toContain('NotFoundComponent');
-    expect(source).not.toContain("template: '404'");
+    expect(source).not.toContain("template: '<sky-error errorType=\"notfound\"></sky-error>'");
   });
 
   it('should allow the SKY UX Builder out alias to be overridden', () => {