Updated dependencies

New Vue files and upgraded API project to .NET Core 2

build.fsx

@@ -22,7 +22,7 @@ Target "BuildApp" (fun _ ->
     ExecProcessAndReturnMessages (fun info ->
       info.UseShellExecute <- false
       info.FileName <- "build-vue.bat") (TimeSpan.FromMinutes 2.)
-  match result.ExitCode with 0 -> Log "AppBuild-Output: " result.Messages | _ -> failwith "Vue build failed"
+  match result.ExitCode with 0 -> Log "App: " result.Messages | _ -> failwith "Vue build failed"
 )
 
 Target "BuildApi" (fun _ ->
@@ -32,7 +32,7 @@ Target "BuildApi" (fun _ ->
       info.FileName <- "dotnet"
       info.Arguments <- "build"
       info.WorkingDirectory <- apiPath) (TimeSpan.FromMinutes 2.)
-  Log "AppBuild-Output: " result.Messages
+  Log "Api: " result.Messages
   match result.ExitCode with 0 -> () | _ -> failwith "API build failed"
 )
 

src/api/App.fs

@@ -164,7 +164,7 @@ module WebParts =
   /// WebPart to return an JSON error response
   let errorJSON code error =
     jsonMimeType
-    >=> Response.response code ((toJson >> UTF8.bytes) { error = error })
+    >=> Response.response code ((toJson >> Text.Encoding.UTF8.GetBytes) { error = error })
 
   /// Journal page
   let viewJournal =

src/api/MyPrayerJournal.fsproj

@@ -1,14 +1,11 @@
-<Project Sdk="FSharp.NET.Sdk;Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
-    <VersionPrefix>0.8.1</VersionPrefix>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
-    <AssemblyName>myPrayerJournal</AssemblyName>
     <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <AssemblyName>myPrayerJournal</AssemblyName>
     <PackageId>MyPrayerJournal</PackageId>
-    <RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
+    <VersionPrefix>0.8.1</VersionPrefix>
   </PropertyGroup>
-
   <ItemGroup>
     <Compile Include="Extensions.fs" />
     <Compile Include="Entities.fs" />
@@ -17,38 +14,21 @@
     <Compile Include="Migrations/20170104023341_InitialDb.fs" />
     <Compile Include="Migrations/DataContextModelSnapshot.fs" />
     <Compile Include="App.fs" />
-    <None Update="appsettings.json">
+    <Content Update="appsettings.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    </Content>
-    <None Update="wwwroot/**">
+    <Content Update="wwwroot/**">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
+    </Content>
-  </ItemGroup>
-  
-  <!-- Import Project="..\..\.paket\Paket.Restore.targets" / -->
-  <ItemGroup>
-    <PackageReference Include="FSharp.Core">
-      <Version>4.1.17</Version>
-    </PackageReference>
-    <PackageReference Include="FSharp.NET.Sdk">
-      <Version>1.0.5</Version>
-    </PackageReference>
-    <PackageReference Include="jose-jwt">
-      <Version>2.*</Version>
-    </PackageReference>
-    <PackageReference Include="Newtonsoft.Json">
-      <Version>10.*</Version>
-    </PackageReference>
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL">
-      <Version>1.*</Version>
-    </PackageReference>
-    <PackageReference Include="Suave">
-      <Version>2.*</Version>
-    </PackageReference>
-    
   </ItemGroup>
   <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="1.0.0" />
+    <PackageReference Include="FSharp.Core" Version="4.2.3" />
+    <PackageReference Include="jose-jwt" Version="2.*" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.*" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="1.*" />
+    <PackageReference Include="Suave" Version="2.*" />
   </ItemGroup>
-
+  <ItemGroup>
-</Project>
+    <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="1.*" />
+  </ItemGroup>
+</Project>

src/app/package.json

@@ -14,78 +14,78 @@
     "lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs"
   },
   "dependencies": {
-    "auth0-js": "^8.8.0",
+    "auth0-js": "^8.9.3",
     "axios": "^0.16.2",
-    "element-ui": "^1.4.1",
+    "element-ui": "^1.4.4",
-    "pug": "^2.0.0-rc.2",
+    "pug": "^2.0.0-rc.4",
     "vue": "^2.3.3",
     "vue-router": "^2.6.0",
-    "vuex": "^2.3.1"
+    "vuex": "^2.4.0"
   },
   "devDependencies": {
-    "autoprefixer": "^7.1.2",
+    "autoprefixer": "^7.1.4",
-    "babel-core": "^6.22.1",
+    "babel-core": "^6.26.0",
     "babel-eslint": "^7.1.1",
-    "babel-loader": "^7.1.1",
+    "babel-loader": "^7.1.2",
+    "babel-plugin-istanbul": "^4.1.1",
     "babel-plugin-transform-runtime": "^6.22.0",
     "babel-preset-env": "^1.3.2",
     "babel-preset-stage-2": "^6.22.0",
-    "babel-register": "^6.22.0",
+    "babel-register": "^6.26.0",
-    "chalk": "^2.0.1",
+    "chai": "^3.5.0",
+    "chalk": "^2.1.0",
+    "chromedriver": "^2.32.2",
     "connect-history-api-fallback": "^1.3.0",
     "copy-webpack-plugin": "^4.0.1",
-    "css-loader": "^0.28.0",
+    "cross-env": "^5.0.5",
+    "cross-spawn": "^5.0.1",
+    "css-loader": "^0.28.7",
     "cssnano": "^3.10.0",
     "eslint": "^3.19.0",
+    "eslint-config-standard": "^6.2.1",
     "eslint-friendly-formatter": "^3.0.0",
     "eslint-loader": "^1.7.1",
-    "eslint-plugin-html": "^3.0.0",
+    "eslint-plugin-html": "^3.2.1",
-    "eslint-config-standard": "^6.2.1",
     "eslint-plugin-promise": "^3.4.0",
     "eslint-plugin-standard": "^2.0.1",
     "eventsource-polyfill": "^0.9.6",
-    "express": "^4.14.1",
+    "express": "^4.15.4",
     "extract-text-webpack-plugin": "^2.0.0",
     "file-loader": "^0.11.1",
     "friendly-errors-webpack-plugin": "^1.1.3",
-    "html-webpack-plugin": "^2.28.0",
+    "html-webpack-plugin": "^2.30.1",
     "http-proxy-middleware": "^0.17.3",
-    "webpack-bundle-analyzer": "^2.2.1",
+    "inject-loader": "^3.0.1",
-    "cross-env": "^5.0.1",
+    "karma": "^1.7.1",
-    "karma": "^1.4.1",
     "karma-coverage": "^1.1.1",
     "karma-mocha": "^1.3.0",
     "karma-phantomjs-launcher": "^1.0.2",
     "karma-phantomjs-shim": "^1.4.0",
-    "karma-sinon-chai": "^1.3.1",
+    "karma-sinon-chai": "^1.3.2",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.31",
     "karma-webpack": "^2.0.2",
     "lolex": "^1.5.2",
-    "mocha": "^3.2.0",
+    "mocha": "^3.5.1",
-    "chai": "^3.5.0",
-    "sinon": "^2.1.0",
-    "sinon-chai": "^2.8.0",
-    "inject-loader": "^3.0.0",
-    "babel-plugin-istanbul": "^4.1.1",
-    "phantomjs-prebuilt": "^2.1.14",
-    "chromedriver": "^2.27.2",
-    "cross-spawn": "^5.0.1",
     "nightwatch": "^0.9.12",
-    "selenium-server": "^3.0.1",
-    "semver": "^5.3.0",
-    "shelljs": "^0.7.6",
     "opn": "^5.1.0",
     "optimize-css-assets-webpack-plugin": "^2.0.0",
     "ora": "^1.2.0",
+    "phantomjs-prebuilt": "^2.1.15",
     "rimraf": "^2.6.0",
+    "selenium-server": "^3.5.3",
+    "semver": "^5.4.1",
+    "shelljs": "^0.7.6",
+    "sinon": "^2.4.1",
+    "sinon-chai": "^2.13.0",
     "url-loader": "^0.5.8",
     "vue-loader": "^12.1.0",
     "vue-style-loader": "^3.0.1",
     "vue-template-compiler": "^2.3.3",
     "webpack": "^2.6.1",
-    "webpack-dev-middleware": "^1.10.0",
+    "webpack-bundle-analyzer": "^2.9.0",
-    "webpack-hot-middleware": "^2.18.0",
+    "webpack-dev-middleware": "^1.12.0",
+    "webpack-hot-middleware": "^2.19.1",
     "webpack-merge": "^4.1.0"
   },
   "engines": {