Merge pull request #31 from rasmusjp/feature/ui-build

Added UI build

Author: rasmusjp

appveyor.yml

@@ -1,9 +1,12 @@
 version: '{build}'
 os: Visual Studio 2017
+shallow_clone: true
 init:
+  - set PATH=C:\Ruby25\bin;%PATH%
   - git config --global core.autocrlf input
   - git config --global core.longpaths true
-shallow_clone: true
+install:
+  - gem install sass
 build_script:
   build.cmd package
 test: off

src/Our.Umbraco.GraphQL/Our.Umbraco.GraphQL.csproj

@@ -15,9 +15,22 @@
         <TargetFramework>net452</TargetFramework>
         <AssemblyName>Our.Umbraco.GraphQL</AssemblyName>
         <RootNamespace>Our.Umbraco.GraphQL</RootNamespace>
+        <UIRoot>Web\UI\</UIRoot>
+        <DefaultItemExcludes>$(DefaultItemExcludes);$(UIRoot)node_modules\**;$(UIRoot).sass-cache\**</DefaultItemExcludes>
     </PropertyGroup>
 
     <ItemGroup>
+        <None Include="$(FrontendRoot)**" Exclude="$(UIRoot)node_modules\**;$(UIRoot).sass-cache\**" Pack="false" />
+    </ItemGroup>
+
+    <Target Name="RunUIBuild" BeforeTargets="Compile" Condition=" '$(Configuration)' == 'Release' ">
+        <Exec WorkingDirectory="$(UIRoot)" Command="npm install" />
+        <Exec WorkingDirectory="$(UIRoot)" Command="npm run build" />
+    </Target>
+
+    <ItemGroup>
+        <None Include="tools\**" Pack="True" PackagePath="tools\" />
+        <None Include="$(UIRoot)dist\**" Pack="True" PackagePath="content\" />
         <None Include="content\**" Pack="True" PackagePath="content\" />
     </ItemGroup>
 

src/Our.Umbraco.GraphQL/Web/UI/package.json

@@ -21,6 +21,10 @@
     "type": "git",
     "url": "https://github.com/rasmusjp/umbraco-graphql"
   },
+  "scripts": {
+    "clean": "grunt clean",
+    "build": "npm run clean && grunt"
+  },
   "devDependencies": {
     "grunt-msbuild": "^0.4.4",
     "grunt-string-replace": "^1.3.1",

src/Our.Umbraco.GraphQL/content/config/Dashboard.config.transform

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dashBoard>
+    <section alias="GraphQLForUmbraco">
+        <areas>
+            <area>developer</area>
+        </areas>
+        <tab caption="GraphQL">
+            <control>
+                /App_Plugins/GraphQLForUmbraco/views/dashboard.html
+            </control>
+        </tab>
+    </section>
+</dashBoard>

tools/build.fsx

@@ -27,16 +27,25 @@ Target.create "Clean" (fun _ ->
 )
 
 Target.create "Build" (fun _ ->
+  let setMSBuildParams (defaults:MSBuild.CliArguments) =
+        { defaults with
+            Properties =
+                [
+                    "Version_Suffix", if buildVersion.IsSome then buildVersion.Value else ""
+                ]
+         }
+
   DotNet.build (fun c ->
     { c with
         Configuration = DotNet.BuildConfiguration.Release
-        OutputPath = Some artifactsDir
+        MSBuildParams = setMSBuildParams c.MSBuildParams
     }) solutionFile
 )
 
 Target.create "Package" (fun _ ->
   DotNet.pack (fun c ->
     { c with
+        NoBuild = true
         Configuration = DotNet.BuildConfiguration.Release
         OutputPath = Some artifactsDir
         VersionSuffix = buildVersion
@@ -52,6 +61,7 @@ open Fake.Core.TargetOperators
   ==> "Default"
 
 "Clean"
+  ==> "Build"
   ==> "Package"
 
 // start build