fix(jest): exclude jest test files from compilation of demo app

tinesoft · Apr 27, 2018 · c64f34e · c64f34e
1 parent 637b4ec
commit c64f34e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/app/files.js b/app/files.js
@@ -87,7 +87,7 @@ module.exports = [
   {name: 'demo/src/styles.scss', path: 'demo/src/styles.scss', isTpl: false},
   {name: 'demo/src/test.ts', path: 'demo/src/test.ts', isTpl: false},
   {name: 'demo/src/_tsconfig.app.json', path: 'demo/src/tsconfig.app.json', isTpl: true},
-  {name: 'demo/src/tsconfig.server.json', path: 'demo/src/tsconfig.server.json', isTpl: false},
+  {name: 'demo/src/_tsconfig.server.json', path: 'demo/src/tsconfig.server.json', isTpl: true},
   {name: 'demo/src/tsconfig.spec.json', path: 'demo/src/tsconfig.spec.json', isTpl: false},
   {name: 'demo/src/typings.d.ts', path: 'demo/src/typings.d.ts', isTpl: false},
   {name: 'demo/_angular-cli.json', path: 'demo/.angular-cli.json', isTpl: true},

diff --git a/app/templates/demo/src/_tsconfig.app.json b/app/templates/demo/src/_tsconfig.app.json
@@ -12,7 +12,9 @@
   },
   "exclude": [
     "testing/*",
-    "test.ts",
+    "test.ts",<% if(testingFramework === 'jest'){%>
+    "setupJest.ts",
+    "jestGlobalMocks.ts",<% } %>
     "**/*.spec.ts"
   ]
 }
diff --git a/app/templates/demo/src/tsconfig.server.json → app/templates/demo/src/_tsconfig.server.json b/app/templates/demo/src/tsconfig.server.json → app/templates/demo/src/_tsconfig.server.json
@@ -8,7 +8,9 @@
   },
   "exclude": [
     "testing/*",
-    "test.ts",
+    "test.ts",<% if(testingFramework === 'jest'){%>
+    "setupJest.ts",
+    "jestGlobalMocks.ts",<% } %>
     "**/*.spec.ts"
   ],
   "angularCompilerOptions": {