From 8ef2fd8876ff78129ef40a50a925c386e7301e85 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Thu, 3 Nov 2022 15:07:51 +0100
Subject: [PATCH] Engineering - React to template changes (#53)

* Engineering - React to template changes

* update pipeline

* update comment

Co-authored-by: Martin Aeschlimann <martinae@microsoft.com>
---
 build/pipeline.yml | 23 ++++++++++++++---------
 package.json       |  2 +-
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/build/pipeline.yml b/build/pipeline.yml
index 89ec3d9..b1709c8 100644
--- a/build/pipeline.yml
+++ b/build/pipeline.yml
@@ -26,7 +26,16 @@ extends:
     npmPackages:
       - name: test-web
 
-        buildPlatforms:
+        buildSteps:
+          - script: yarn --frozen-lockfile
+            displayName: Install dependencies
+
+          - script: yarn --cwd=fs-provider --frozen-lockfile
+            displayName: Install dependencies (fs-provider)
+
+          # the rest of the build steps are part of the 'prepack' script, automatically run when the pipeline invokes 'yarn pack'
+
+        testPlatforms:
           - name: Linux
             nodeVersions:
               - 14.x
@@ -40,28 +49,24 @@ extends:
               - 14.x
               - 16.x
 
-        buildSteps:
+        testSteps:
           - script: yarn --frozen-lockfile
             displayName: Install dependencies
 
           - script: yarn --cwd=fs-provider --frozen-lockfile
             displayName: Install dependencies (fs-provider)
 
-          - script: yarn compile
-            displayName: Compile npm package
+          - script: yarn --cwd=sample --frozen-lockfile
+            displayName: Install dependencies (sample)
 
-        testSteps:
           - bash: |
               /usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
               echo ">>> Started xvfb"
             displayName: Start xvfb
             condition: eq(variables['Agent.OS'], 'Linux')
 
-          - script: yarn --cwd=sample --frozen-lockfile
-            displayName: Install dependencies (sample)
-
           - script: yarn sample-tests
-            displayName: Test npm package
+            displayName: Compile & test npm package
             env:
               DISPLAY: ':99.0'
 
diff --git a/package.json b/package.json
index 93cb5cf..9ecaa62 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
     "install-extensions": "yarn --cwd=fs-provider && yarn --cwd=sample",
     "compile": "tsc -p ./ && yarn compile-fs-provider",
     "watch": "tsc -w -p ./",
-    "prepublishOnly": "yarn compile",
+    "prepack": "yarn compile",
     "test": "eslint src --ext ts && tsc --noEmit",
     "preversion": "npm test",
     "postversion": "git push && git push --tags",