Merge branch 'vs2017' of https://github.com/dotnet/eShopOnContainers into vs2017

docker-compose.override.yml

@@ -39,16 +39,16 @@ services:
     ports:
       - "5102:5102"
 
-#  eshoponcontainers.webspa:
+  eshoponcontainers.webspa:
-#    environment:
+    environment:
-#      - ASPNETCORE_ENVIRONMENT=Development
+      - ASPNETCORE_ENVIRONMENT=Development
-#      - CatalogUrl=http://10.0.75.1:5101
+      - CatalogUrl=http://10.0.75.1:5101
-#      - OrderingUrl=http://10.0.75.1:5102
+      - OrderingUrl=http://10.0.75.1:5102
-#      #- IdentityUrl=http://13.88.8.119:5105             #Remote: VM Needs to have public access at 5105. 
+      #- IdentityUrl=http://13.88.8.119:5105             #Remote: VM Needs to have public access at 5105. 
-#      - IdentityUrl=http://10.0.75.1:5105              #Local: You need to open your local dev-machine firewall at range 5100-5105.  at range 5100-5105. 
+      - IdentityUrl=http://10.0.75.1:5105              #Local: You need to open your local dev-machine firewall at range 5100-5105.  at range 5100-5105. 
-#      - BasketUrl=http://10.0.75.1:5103                
+      - BasketUrl=http://10.0.75.1:5103                
-#    ports:
+    ports:
-#      - "5104:5104"
+      - "5104:5104"
 
   webmvc:
     environment:

docker-compose.vs.debug.yml

@@ -61,20 +61,20 @@ services:
     labels:
       - "com.microsoft.visualstudio.targetoperatingsystem=linux"
 
-#  eshoponcontainers.webspa:
+  eshoponcontainers.webspa:
-#    image: eshop/eshoponcontainers.webspa:dev
+    image: eshop/eshoponcontainers.webspa:dev
-#    build:
+    build:
-#      args:
+      args:
-#        source: ${DOCKER_BUILD_SOURCE}
+        source: ${DOCKER_BUILD_SOURCE}
-#    environment:
+    environment:
-#      - DOTNET_USE_POLLING_FILE_WATCHER=1
+      - DOTNET_USE_POLLING_FILE_WATCHER=1
-#    volumes:
+    volumes:
-#      - ./src/Web/WebSPA/eShopOnContainers.WebSPA:/app
+      - ./src/Web/WebSPA/eShopOnContainers.WebSPA:/app
-#      - ~/.nuget/packages:/root/.nuget/packages:ro
+      - ~/.nuget/packages:/root/.nuget/packages:ro
-#      - ~/clrdbg:/clrdbg:ro
+      - ~/clrdbg:/clrdbg:ro
-#    entrypoint: tail -f /dev/null
+    entrypoint: tail -f /dev/null
-#    labels:
+    labels:
-#      - "com.microsoft.visualstudio.targetoperatingsystem=linux"
+      - "com.microsoft.visualstudio.targetoperatingsystem=linux"
 
   webmvc:
     image: eshop/webmvc:dev

docker-compose.vs.release.yml

@@ -41,15 +41,15 @@ services:
     labels:
       - "com.microsoft.visualstudio.targetoperatingsystem=linux"
 
-#  eshoponcontainers.webspa:
+  eshoponcontainers.webspa:
-#    build:
+    build:
-#      args:
+      args:
-#        source: ${DOCKER_BUILD_SOURCE}
+        source: ${DOCKER_BUILD_SOURCE}
-#    volumes:
+    volumes:
-#      - ~/clrdbg:/clrdbg:ro
+      - ~/clrdbg:/clrdbg:ro
-#    entrypoint: tail -f /dev/null
+    entrypoint: tail -f /dev/null
-#    labels:
+    labels:
-#      - "com.microsoft.visualstudio.targetoperatingsystem=linux"
+      - "com.microsoft.visualstudio.targetoperatingsystem=linux"
 
   webmvc:
     build:

docker-compose.yml

@@ -34,14 +34,14 @@ services:
     depends_on:
       - sql.data
 
-#  eshoponcontainers.webspa:
+  eshoponcontainers.webspa:
-#    image: eshop/eshoponcontainers.webspa
+    image: eshop/eshoponcontainers.webspa
-#    build:
+    build:
-#      context: ./src/Web/WebSPA/eShopOnContainers.WebSPA
+      context: ./src/Web/WebSPA/eShopOnContainers.WebSPA
-#      dockerfile: Dockerfile
+      dockerfile: Dockerfile
-#    depends_on:
+    depends_on:
-#      - identity.api
+      - identity.api
-#      - basket.api
+      - basket.api
 
   webmvc:
     image: eshop/webmvc

src/Web/WebSPA/eShopOnContainers.WebSPA/Startup.cs

@@ -57,13 +57,6 @@ namespace eShopConContainers.WebSPA
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
-
-                app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions
-                {
-                    HotModuleReplacement = true,
-                    ConfigFile = "config/webpack.config.js"
-                });
-
             }
 
             // Configure XSRF middleware, This pattern is for SPA style applications where XSRF token is added on Index page 

src/Web/WebSPA/eShopOnContainers.WebSPA/eShopOnContainers.WebSPA.csproj

@@ -11,6 +11,8 @@
     <RuntimeFrameworkVersion>1.1.0</RuntimeFrameworkVersion>
     <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
     <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
+    <TypeScriptCompileOnSaveEnabled>false</TypeScriptCompileOnSaveEnabled>
+    <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
   </PropertyGroup>
 
   <ItemGroup>

src/Web/WebSPA/eShopOnContainers.WebSPA/package.json

@@ -51,7 +51,7 @@
     "aspnet-webpack": "1.0.24",
     "bootstrap": "4.0.0-alpha.5",
     "core-js": "2.4.1",
-    "file-loader": "^0.9.0",
+    "file-loader": "0.9.0",
     "font-awesome": "4.6.3",
     "isomorphic-fetch": "2.2.1",
     "normalize.css": "5.0.0",
@@ -74,29 +74,29 @@
     "angular2-template-loader": "0.6.0",
     "awesome-typescript-loader": "2.2.4",
     "codelyzer": "1.0.0-beta.3",
-    "copy-webpack-plugin": "^4.0.1",
+    "copy-webpack-plugin": "4.0.1",
     "css": "2.2.1",
     "css-loader": "0.25.0",
     "es6-promise": "3.2.1",
     "es6-promise-loader": "1.0.2",
-    "exports-loader": "^0.6.3",
+    "exports-loader": "0.6.3",
     "extendify": "1.0.0",
     "extract-text-webpack-plugin": "2.0.0-beta.4",
     "file-loader": "0.9.0",
     "html-loader": "0.4.4",
-    "html-webpack-plugin": "^2.24.1",
+    "html-webpack-plugin": "2.24.1",
     "json-loader": "0.5.4",
     "node-sass": "3.9.3",
     "parse5": "2.1.5",
     "rimraf": "2.5.4",
-    "sass-lint": "^1.10.2",
+    "sass-lint": "1.10.2",
     "sass-loader": "4.0.2",
     "ts-helpers": "1.1.1",
     "ts-node": "1.4.3",
-    "tslint": "^3.15.1",
+    "tslint": "3.15.1",
     "typedoc": "0.5.0",
     "typescript": "2.0.6",
-    "url-loader": "^0.5.7",
+    "url-loader": "0.5.7",
     "webpack": "2.1.0-beta.25",
     "webpack-externals-plugin": "1.0.0",
     "webpack-hot-middleware": "2.13.0",