try mock server-browser

Gorniv · Gorniv · commit 4acb47fae68f · 2017-11-16T15:59:40.000+03:00
diff --git a/.angular-cli.json b/.angular-cli.json
@@ -33,8 +33,8 @@
             ],
             "environmentSource": "environments/environment.ts",
             "environments": {
-                "dev": "environments/environment.ts",
-                "prod": "environments/environment.prod.ts"
+                "dev": "environments/browser/environment.ts",
+                "prod": "environments/browser/environment.prod.ts"
             }
         },
         {
@@ -67,8 +67,8 @@
             ],
             "environmentSource": "environments/environment.ts",
             "environments": {
-                "dev": "environments/environment.ts",
-                "prod": "environments/environment.prod.ts"
+                "dev": "environments/server/environment.ts",
+                "prod": "environments/server/environment.prod.ts"
             }
         }
     ],
diff --git a/package.json b/package.json
@@ -48,7 +48,8 @@
         "rxjs": "5.5.2",
         "uglify-es": "3.1.9",
         "xmlhttprequest": "^1.8.0",
-        "zone.js": "0.8.18"
+        "zone.js": "0.8.18",
+        "@types/node": "8.0.51"
     },
     "devDependencies": {
         "@angular/cli": "1.6.0-beta.0",
@@ -57,7 +58,6 @@
         "@angular/platform-server": "5.0.1",
         "@types/jasmine": "2.8.0",
         "@types/jasminewd2": "2.0.3",
-        "@types/node": "8.0.51",
         "codelyzer": "4.0.1",
         "jasmine-core": "2.8.0",
         "jasmine-spec-reporter": "4.2.1",
diff --git a/src/app/app.component.html b/src/app/app.component.html
@@ -3,6 +3,7 @@
         <li><a [routerLink]="['']" [routerLinkActive]="['router-link-active']">home</a></li>
         <li><a [routerLink]="['/material']" [routerLinkActive]="['router-link-active']">material</a></li>
         <li><a [routerLink]="['/primeng/report']" [routerLinkActive]="['router-link-active']">primeng</a></li>
+        <li><a [routerLink]="['/mock']" [routerLinkActive]="['router-link-active']">mock</a></li>
     </ul>
 </nav>
 <router-outlet></router-outlet>
diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts
@@ -3,7 +3,8 @@ import { Routes, RouterModule } from '@angular/router';
 const routes: Routes = [
   { path: '', loadChildren: './home/home.module#HomeModule', pathMatch: 'full' },
   { path: 'material', loadChildren: './materialPage/materialPage.module#MaterialPageModule' },
-  { path: 'primeng', loadChildren: './primengPage/primengPage.module#PrimengPageModule' },
+  // { path: 'primeng', loadChildren: './primengPage/primengPage.module#PrimengPageModule' },
+  { path: 'mock', loadChildren: './mock-server-browser/mock-server-browser.module#MockServerBrowserModule' },
 ];
 
 export const AppRoutes = RouterModule.forRoot(routes);
diff --git a/src/app/mock-server-browser/mock-browser/mock-browser.component.html b/src/app/mock-server-browser/mock-browser/mock-browser.component.html
@@ -0,0 +1,3 @@
+<p>
+  mock-browser works!
+</p>
diff --git a/src/app/mock-server-browser/mock-browser/mock-browser.component.scss b/src/app/mock-server-browser/mock-browser/mock-browser.component.scss
diff --git a/src/app/mock-server-browser/mock-browser/mock-browser.component.ts b/src/app/mock-server-browser/mock-browser/mock-browser.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-mock',
+  templateUrl: './mock-browser.component.html',
+  styleUrls: ['./mock-browser.component.scss']
+})
+export class MockBrowserComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/src/app/mock-server-browser/mock-browser/mock-browser.module.ts b/src/app/mock-server-browser/mock-browser/mock-browser.module.ts
@@ -0,0 +1,16 @@
+import { NgModule, ModuleWithProviders } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { MockBrowserComponent } from './mock-browser.component';
+import { MockBrowserRoutes } from './mock-browser.routing';
+import { environment } from '../../../environments/environment';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    MockBrowserRoutes
+  ],
+  declarations: [MockBrowserComponent],
+  exports: [MockBrowserComponent]
+})
+export class MockBrowserModule {
+}
diff --git a/src/app/mock-server-browser/mock-browser/mock-browser.routing.ts b/src/app/mock-server-browser/mock-browser/mock-browser.routing.ts
@@ -0,0 +1,8 @@
+import { Routes, RouterModule } from '@angular/router';
+import { MockBrowserComponent } from './mock-browser.component';
+
+const routes: Routes = [
+  { path: 'mock-browser', component: MockBrowserComponent },
+];
+
+export const MockBrowserRoutes = RouterModule.forChild(routes);
diff --git a/src/app/mock-server-browser/mock-server-browser.component.html b/src/app/mock-server-browser/mock-server-browser.component.html
@@ -0,0 +1,4 @@
+<p>
+  mock-server-browser works!
+</p>
+<app-mock></app-mock>
diff --git a/src/app/mock-server-browser/mock-server-browser.component.scss b/src/app/mock-server-browser/mock-server-browser.component.scss
diff --git a/src/app/mock-server-browser/mock-server-browser.component.ts b/src/app/mock-server-browser/mock-server-browser.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-mock-server-browser',
+  templateUrl: './mock-server-browser.component.html',
+  styleUrls: ['./mock-server-browser.component.scss']
+})
+export class MockServerBrowserComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/src/app/mock-server-browser/mock-server-browser.module.ts b/src/app/mock-server-browser/mock-server-browser.module.ts
@@ -0,0 +1,17 @@
+import { MockBrowserComponent } from './mock-browser/mock-browser.component';
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { MockServerBrowserComponent } from './mock-server-browser.component';
+import { MockServerBrowserRoutes } from './mock-server-browser.routing';
+import { MockBrowserModule } from './mock-browser/mock-browser.module';
+import { MockServerModule } from './mock-server/mock-server.module';
+import { environment } from '../../environments/environment';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    environment.isServer ? [MockBrowserModule] : [MockServerModule]
+  ],
+  declarations: [MockServerBrowserComponent]
+})
+export class MockServerBrowserModule { }
diff --git a/src/app/mock-server-browser/mock-server-browser.routing.ts b/src/app/mock-server-browser/mock-server-browser.routing.ts
@@ -0,0 +1,8 @@
+import { Routes, RouterModule } from '@angular/router';
+import { MockServerBrowserComponent } from './mock-server-browser.component';
+
+const routes: Routes = [
+  { path: '', component: MockServerBrowserComponent },
+];
+
+export const MockServerBrowserRoutes = RouterModule.forChild(routes);
diff --git a/src/app/mock-server-browser/mock-server/mock-server.component.html b/src/app/mock-server-browser/mock-server/mock-server.component.html
@@ -0,0 +1,3 @@
+<p>
+  mock-server works!
+</p>
diff --git a/src/app/mock-server-browser/mock-server/mock-server.component.scss b/src/app/mock-server-browser/mock-server/mock-server.component.scss
diff --git a/src/app/mock-server-browser/mock-server/mock-server.component.ts b/src/app/mock-server-browser/mock-server/mock-server.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-mock',
+  templateUrl: './mock-server.component.html',
+  styleUrls: ['./mock-server.component.scss']
+})
+export class MockServerComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/src/app/mock-server-browser/mock-server/mock-server.module.ts b/src/app/mock-server-browser/mock-server/mock-server.module.ts
@@ -0,0 +1,18 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { MockServerComponent } from './mock-server.component';
+import { MockServerRoutes } from './mock-server.routing';
+import { ModuleWithProviders } from '@angular/compiler/src/core';
+import { environment } from '../../../environments/environment';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    MockServerRoutes
+  ],
+  declarations: [MockServerComponent],
+  exports: [MockServerComponent]
+})
+export class MockServerModule {
+
+}
diff --git a/src/app/mock-server-browser/mock-server/mock-server.routing.ts b/src/app/mock-server-browser/mock-server/mock-server.routing.ts
@@ -0,0 +1,8 @@
+import { MockServerBrowserComponent } from './../mock-server-browser.component';
+import { Routes, RouterModule } from '@angular/router';
+
+const routes: Routes = [
+  { path: 'mock-server', component: MockServerBrowserComponent },
+];
+
+export const MockServerRoutes = RouterModule.forChild(routes);
diff --git a/src/app/primengPage/primengPage.module.ts b/src/app/primengPage/primengPage.module.ts
@@ -23,6 +23,5 @@ import { HttpClientModule } from '@angular/common/http';
     { provide: LocationStrategy, useClass: HashLocationStrategy },
     CarService, CountryService, EventService, NodeService
   ],
-  exports: [PrimengPageComponent]
 })
 export class PrimengPageModule { }
diff --git a/src/environments/browser/environment.prod.ts b/src/environments/browser/environment.prod.ts
@@ -0,0 +1,4 @@
+export const environment = {
+  production: true,
+  isServer: false
+};
diff --git a/src/environments/browser/environment.ts b/src/environments/browser/environment.ts
@@ -0,0 +1,9 @@
+// The file contents for the current environment will overwrite these during build.
+// The build system defaults to the dev environment which uses `environment.ts`, but if you do
+// `ng build --env=prod` then `environment.prod.ts` will be used instead.
+// The list of which env maps to which file can be found in `.angular-cli.json`.
+
+export const environment = {
+  production: false,
+  isServer: false
+};
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
@@ -4,5 +4,6 @@
 // The list of which env maps to which file can be found in `.angular-cli.json`.
 
 export const environment = {
-  production: false
+  production: false,
+  isServer: false
 };
diff --git a/src/environments/server/environment.prod.ts b/src/environments/server/environment.prod.ts
@@ -0,0 +1,4 @@
+export const environment = {
+  production: true,
+  isServer: true
+};
diff --git a/src/environments/server/environment.ts b/src/environments/server/environment.ts
@@ -0,0 +1,9 @@
+// The file contents for the current environment will overwrite these during build.
+// The build system defaults to the dev environment which uses `environment.ts`, but if you do
+// `ng build --env=prod` then `environment.prod.ts` will be used instead.
+// The list of which env maps to which file can be found in `.angular-cli.json`.
+
+export const environment = {
+  production: false,
+  isServer: true
+};
diff --git a/yarn-error.log b/yarn-error.log
@@ -0,0 +1,105 @@
+Arguments: 
+  C:\Program Files\nodejs\node.exe C:\Program Files (x86)\Yarn\bin\yarn.js
+
+PATH: 
+  C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;P:\bin;C:\Program Files\Docker\Docker\Resources\bin;C:\ProgramData\Oracle\Java\javapath;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0;C:\Program Files\Microsoft SQL Server\130\Tools\Binn;C:\Program Files\TortoiseGit\bin;C:\WINDOWS\system32\config\systemprofile\.dnx\bin;C:\Program Files\Microsoft DNX\Dnvm;C:\Program Files\Microsoft SQL Server\120\Tools\Binn;C:\Program Files\dotnet;C:\Program Files\Microsoft\Web Platform Installer;C:\Program Files\Git\cmd;C:\Users\iak28\AppData\Roaming\nvm;C:\Program Files\nodejs;C:\Program Files (x86)\Git\cmd;C:\Program Files\Microsoft SQL Server\110\Tools\Binn;C:\Program Files (x86)\Yarn\bin;C:\Go\bin;C:\Users\iak28\AppData\Local\Microsoft\WindowsApps;C:\Program Files (x86)\Microsoft VS Code\bin;C:\Users\iak28\AppData\Roaming\curl;C:\PuTTY;C:\Program Files (x86)\pgAdmin 4\v1\runtime;C:\Users\iak28\AppData\Roaming\npm;C:\Users\iak28\AppData\Roaming\nvm;C:\Program Files\nodejs;C:\Users\iak28\AppData\Local\Yarn\bin;C:\Program Files\Java\jre-9.0.1\bin;C:\Go
+
+Yarn version: 
+  1.2.1
+
+Node version: 
+  6.9.5
+
+Platform: 
+  win32 x64
+
+npm manifest: 
+  {
+      "name": "universal-demo",
+      "version": "0.0.0",
+      "license": "MIT",
+      "scripts": {
+          "ng": "ng",
+          "start": "ng serve",
+          "ssr": "npm run build:universal && npm run server",
+          "ssr:debug": "ng build --dev --aot=true --output-hashing=all --named-chunks=false --build-optimizer=true  && ng build --dev --aot=true --output-hashing=all --named-chunks=false --build-optimizer=true --app 1 && webpack && node server.js",
+          "build": "ng build",
+          "build:prod": "ng build --prod",
+          "build:universal": "ng build --prod && ng build --prod --app 1 && webpack",
+          "server": "node server.js",
+          "test": "ng test",
+          "lint": "ng lint",
+          "e2e": "ng e2e",
+          "universal": "ng build --prod && ng build --prod --app 1 && ts-node server"
+      },
+      "private": true,
+      "dependencies": {
+          "@angular/animations": "5.0.1",
+          "@angular/cdk": "5.0.0-rc0",
+          "@angular/common": "5.0.1",
+          "@angular/compiler": "5.0.1",
+          "@angular/core": "5.0.1",
+          "@angular/forms": "5.0.1",
+          "@angular/http": "5.0.1",
+          "@angular/material": "5.0.0-rc0",
+          "@angular/platform-browser": "5.0.1",
+          "@angular/platform-browser-dynamic": "5.0.1",
+          "@angular/router": "5.0.1",
+          "@ngtools/webpack": "1.9.0-beta.0",
+          "@nguniversal/common": "5.0.0-beta.5",
+          "@nguniversal/express-engine": "5.0.0-beta.5",
+          "@nguniversal/module-map-ngfactory-loader": "5.0.0-beta.5",
+          "chart.js": "2.7.1",
+          "cookie-parser": "1.4.3",
+          "core-js": "2.5.1",
+          "font-awesome": "4.7.0",
+          "fullcalendar": "3.7.0",
+          "hammerjs": "2.0.8",
+          "jquery": "3.2.1",
+          "moment": "2.19.2",
+          "ngx-cookie-service": "1.0.9",
+          "primeng": "5.0.0-rc.0",
+          "prismjs": "1.8.4",
+          "quill": "1.3.4",
+          "rxjs": "5.5.2",
+          "uglify-es": "3.1.9",
+          "xmlhttprequest": "^1.8.0",
+          "zone.js": "0.8.18",
+          "@types/node": "8.0.51",
+      },
+      "devDependencies": {
+          "@angular/cli": "1.6.0-beta.0",
+          "@angular/compiler-cli": "5.0.1",
+          "@angular/language-service": "5.0.1",
+          "@angular/platform-server": "5.0.1",
+          "@types/jasmine": "2.8.0",
+          "@types/jasminewd2": "2.0.3",
+          "codelyzer": "4.0.1",
+          "jasmine-core": "2.8.0",
+          "jasmine-spec-reporter": "4.2.1",
+          "karma": "1.7.1",
+          "karma-chrome-launcher": "2.2.0",
+          "karma-cli": "1.0.1",
+          "karma-coverage-istanbul-reporter": "1.3.0",
+          "karma-jasmine": "1.1.0",
+          "karma-jasmine-html-reporter": "0.2.2",
+          "protractor": "5.2.0",
+          "ts-node": "3.3.0",
+          "tslint": "5.8.0",
+          "typescript": "2.4.2"
+      }
+  }
+
+yarn manifest: 
+  No manifest
+
+Lockfile: 
+  No lockfile
+
+Trace: 
+  SyntaxError: C:\GitHub\angular-universal-starter\package.json: Unexpected token } in JSON at position 2024
+      at Object.parse (native)
+      at C:\Program Files (x86)\Yarn\lib\cli.js:770:59
+      at next (native)
+      at step (C:\Program Files (x86)\Yarn\lib\cli.js:92:30)
+      at C:\Program Files (x86)\Yarn\lib\cli.js:103:13

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,8 @@`
`33`	`33`	`],`
`34`	`34`	`"environmentSource": "environments/environment.ts",`
`35`	`35`	`"environments": {`
`36`		`- "dev": "environments/environment.ts",`
`37`		`- "prod": "environments/environment.prod.ts"`
	`36`	`+ "dev": "environments/browser/environment.ts",`
	`37`	`+ "prod": "environments/browser/environment.prod.ts"`
`38`	`38`	`}`
`39`	`39`	`},`
`40`	`40`	`{`
`@@ -67,8 +67,8 @@`
`67`	`67`	`],`
`68`	`68`	`"environmentSource": "environments/environment.ts",`
`69`	`69`	`"environments": {`
`70`		`- "dev": "environments/environment.ts",`
`71`		`- "prod": "environments/environment.prod.ts"`
	`70`	`+ "dev": "environments/server/environment.ts",`
	`71`	`+ "prod": "environments/server/environment.prod.ts"`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`	`],`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<p>`
	`2`	`+ mock-browser works!`
	`3`	`+</p>`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +<p>
 +  mock-server-browser works!
 +</p>
 +<app-mock></app-mock>