Merge pull request #419 from bacongobbler/clientapp

Move client to an (internal) ClientApp package
deislabs · Feb 1, 2022 · 2a99020 · 2a99020
2 parents 506574b + 952bbc2
commit 2a99020
Show file tree

Hide file tree

Showing 30 changed files with 4,365 additions and 10,398 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,5 +1,5 @@
 version: 2
-updates: 
+updates:
   - package-ecosystem: "nuget"
     directory: "/src/Application"
     schedule:
@@ -55,7 +55,7 @@ updates:
       - dependency-name: "*"
         update-types: ["version-update:semver-major"]
   - package-ecosystem: "npm"
-    directory: "/src/Web"
+    directory: "/src/Web/ClientApp"
     schedule:
       interval: "weekly"
       day: "monday"

diff --git a/.github/workflows/manual-build-container.yml b/.github/workflows/manual-build-container.yml
@@ -2,7 +2,7 @@ name: Manually build and push runtime container
 on:
   workflow_dispatch:
 
-jobs:  
+jobs:
   push_to_registry:
     name: Push image to GitHub Package Registry
     runs-on: ubuntu-latest
@@ -13,7 +13,7 @@ jobs:
       - name: Check out the repo
         uses: actions/checkout@v2
         with:
-          fetch-depth: 0 
+          fetch-depth: 0
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
@@ -27,13 +27,6 @@ jobs:
           echo IMAGE_VERSION_TAG=$(git describe --tags --abbrev=0 ${TAG_COMMIT})  >> $GITHUB_ENV
         shell: bash
 
-      - name: Npm build
-        shell: bash
-        run: |
-          cd src/Web
-          npm run cibuild
-          cd ..
-
       - name: dotnet publish
         run: dotnet publish src/Web/Web.csproj -c Release --self-contained -r linux-x64
 
@@ -62,7 +55,7 @@ jobs:
             type=sha,priority=4
           flavor: |
             latest=true
-      
+
       - name: Build and push Docker image
         uses: docker/build-push-action@v2
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -2,7 +2,7 @@ name: Create a Release
 
 on:
   push:
-    tags: 
+    tags:
     - 'v[0-9]+.[0-9]+.[0-9]+'
     - 'v[0-9]+.[0-9]+.[0-9]+-preview'
 
@@ -61,18 +61,11 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: 6.0.x
-      
+
       - name: Set MINVERBUILDMETADATA
         run: echo MINVERBUILDMETADATA=$(git rev-parse --short ${GITHUB_SHA})  >> $GITHUB_ENV
         shell: bash
 
-      - name: Npm build
-        shell: bash
-        run: |
-          cd src/Web
-          npm run cibuild
-          cd ..
-
       - name: dotnet publish
         run: dotnet publish src/Web/Web.csproj --runtime "${{ matrix.target }}" -c Release -o ${{ matrix.target }}
 
@@ -90,7 +83,7 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           files: "hippo-server-*"
-      
+
   push_to_registry:
     needs: release
     name: Push Docker image to GitHub Package Registry
@@ -113,13 +106,6 @@ jobs:
         run: echo MINVERBUILDMETADATA=$(git rev-parse --short ${GITHUB_SHA})  >> $GITHUB_ENV
         shell: bash
 
-      - name: Npm build
-        shell: bash
-        run: |
-          cd src/Web
-          npm run cibuild
-          cd ..
-
       - name: dotnet publish
         run: dotnet publish src/Web/Web.csproj -c Release --self-contained -r linux-x64
 
@@ -148,7 +134,7 @@ jobs:
             type=sha,priority=4
           flavor: |
             latest=true
-      
+
       - name: Build and push Docker image
         uses: docker/build-push-action@v2
         with: