socialnetworknews-web

commit a2c801bd352b1d10729960b799762e1fe3a62bbe
parent e8cb9750b9b7073be3db8cca3ce1aba29fa703b6
Author: MTRNord <mtrnord1@gmail.com>
Date:   Sat, 19 May 2018 16:58:25 +0200

Fix build and test script

Diffstat:
M
angular.json
 | 
2
+-
M
karma.conf.js
 | 
5
++++-
M
package.json
 | 
7
++++---
M
server.ts
 | 
2
+-
M
yarn.lock
 | 
4
++++

5 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/angular.json b/angular.json
@@ -104,7 +104,7 @@
           "options": {
             "outputPath": "dist/server",
             "main": "src/main.server.ts",
-            "tsConfig": "tsconfig.server.json"
+            "tsConfig": "src/tsconfig.server.json"
           }
         }
       }
diff --git a/karma.conf.js b/karma.conf.js
@@ -27,7 +27,10 @@ module.exports = function (config) {
     colors: true,
     logLevel: config.LOG_INFO,
     autoWatch: false,
-    browsers: ['Chrome'],
+    browsers: [
+      'Chrome',
+      //'ChromeHeadless'
+    ],
     customLaunchers: {
       'ChromeHeadless': {
         base: 'Chrome',
diff --git a/package.json b/package.json
@@ -6,9 +6,9 @@
     "ng": "ng",
     "build:ssr": "yarn run build:client-and-server-bundles && yarn run webpack:server",
     "serve:ssr": "node dist/server.js",
-    "build:client-and-server-bundles": "ng build --prod",
+    "build:client-and-server-bundles": "ng build --prod --source-map && ng run social-networks-news-web:server --source-map",
     "webpack:server": "webpack --config webpack.server.config.js --progress --colors",
-    "test": "ng test",
+    "test": "ng test --browsers ChromeHeadless",
     "lint": "ng lint",
     "e2e": "ng e2e"
   },
@@ -39,12 +39,13 @@
     "ngx-toastr": "^8.7.3",
     "raven-js": "^3.22.3",
     "rxjs": "^6.1.0",
+    "rxjs-compat": "^6.1.0",
     "ts-loader": "^4.0.0",
     "web-animations-js": "^2.3.1",
     "zone.js": "^0.8.24"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.6.0",
+    "@angular-devkit/build-angular": "~0.6.3",
     "@angular-devkit/core": "^0.6.0",
     "@angular/cli": "^6.0.3",
     "@angular/compiler-cli": "^6.0.2",
diff --git a/server.ts b/server.ts
@@ -22,7 +22,7 @@ const DIST_FOLDER = join(process.cwd(), 'dist');
 const template = readFileSync(join(DIST_FOLDER, 'browser', 'index.html')).toString();
 
 // * NOTE :: leave this as require() since this file is built Dynamically from webpack
-const { AppServerModuleNgFactory, LAZY_MODULE_MAP } = require('./dist/server/main.bundle');
+const { AppServerModuleNgFactory, LAZY_MODULE_MAP } = require('./dist/server/main');
 
 const { provideModuleMap } = require('@nguniversal/module-map-ngfactory-loader');
 
diff --git a/yarn.lock b/yarn.lock
@@ -7041,6 +7041,10 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
+rxjs-compat@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.1.0.tgz#935059623ee4c167728c9dd03ee6e4468cc5b583"
+
 rxjs@^5.4.2, rxjs@^5.5.2:
   version "5.5.10"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.10.tgz#fde02d7a614f6c8683d0d1957827f492e09db045"