Fixed InkingManager ES compatibility issues, SharedMap v2 clear() bug in LiveCanvas, and upgraded Fluid version (#775)

Author: ryanbliss

ensure-packages-built.js

@@ -9,27 +9,33 @@ const fs = require("fs");
 ensurePackagesBuilt();
 /**
  * if packages are not built or if they are old builds then:
- * 
+ *
  * 1. run npm install from "packages/live-share-react".
  *    live-share-react uses all other live-share packages as dependencies, hence will install all packages needed to build live-share packages.
  * 2. run npm run build:packages from root
  */
 async function ensurePackagesBuilt() {
     const rootFolderPath = await getRootFolder();
-    const currentGitHash = await getGitHash()
+    const currentGitHash = await getGitHash();
 
-    const packagesNotBuilt = !fs.existsSync(`${rootFolderPath}/node_modules/@microsoft/live-share-react/bin`);
+    const packagesNotBuilt = !fs.existsSync(
+        `${rootFolderPath}/node_modules/@microsoft/live-share-react/bin`
+    );
     const isOldBuild = currentGitHash !== getBuildData()?.lastGitHashBuilt;
     if (packagesNotBuilt || isOldBuild) {
         await npmInstallFromLiveShareReact();
         build();
     }
 
     async function getGitHash() {
-        const currentGitHash = childProcess.spawn("git", ["rev-parse", "HEAD"], {
-            shell: true,
-            cwd: process.cwd(),
-        });
+        const currentGitHash = childProcess.spawn(
+            "git",
+            ["rev-parse", "HEAD"],
+            {
+                shell: true,
+                cwd: process.cwd(),
+            }
+        );
         return new Promise((resolve, reject) => {
             currentGitHash.stdout.on("data", (data) => {
                 const hash = data.toString().slice(0, -1);
@@ -40,15 +46,19 @@ async function ensurePackagesBuilt() {
                     reject(code);
                 }
             });
-        })
+        });
     }
 
     async function getRootFolder() {
-        const rootDir = childProcess.spawn("git", ["rev-parse", " --show-toplevel"], {
-            shell: true,
-            cwd: process.cwd(),
-        });
-        
+        const rootDir = childProcess.spawn(
+            "git",
+            ["rev-parse", " --show-toplevel"],
+            {
+                shell: true,
+                cwd: process.cwd(),
+            }
+        );
+
         return new Promise((resolve, reject) => {
             rootDir.stdout.on("data", (data) => {
                 const path = data.toString().slice(0, -1);
@@ -59,7 +69,7 @@ async function ensurePackagesBuilt() {
                     reject(code);
                 }
             });
-        })
+        });
     }
 
     // live-share-react uses all other live-share packages as dependencies
@@ -70,24 +80,28 @@ async function ensurePackagesBuilt() {
                 cwd: `${rootFolderPath}/packages/live-share-react`,
                 stdio: "inherit",
             });
-        
+
             installProcess.on("close", (code) => {
                 if (code == 0) {
                     resolve();
                 } else {
                     reject(code);
                 }
             });
-        })
+        });
     }
 
     function build() {
-        const buildProcess = childProcess.spawn("npm", ["run", "build:packages"], {
-            shell: true,
-            cwd: rootFolderPath,
-            stdio: "inherit",
-        });
-        
+        const buildProcess = childProcess.spawn(
+            "npm",
+            ["run", "build:packages"],
+            {
+                shell: true,
+                cwd: rootFolderPath,
+                stdio: "inherit",
+            }
+        );
+
         buildProcess.on("close", (code) => {
             if (code === 0) {
                 fs.writeFileSync(
@@ -109,4 +123,4 @@ async function ensurePackagesBuilt() {
             return undefined;
         }
     }
-}
+}

internal/test-utils/package.json

@@ -24,28 +24,28 @@
         "tsc": "tsc"
     },
     "dependencies": {
-        "@fluid-experimental/attributor": "^2.0.0-rc.1",
-        "@fluid-experimental/sequence-deprecated": "^2.0.0-rc.1",
-        "@fluidframework/agent-scheduler": "^2.0.0-rc.1",
+        "@fluid-experimental/attributor": "^2.0.0-rc.2.0.0",
+        "@fluid-experimental/sequence-deprecated": "^2.0.0-rc.2.0.0",
+        "@fluidframework/agent-scheduler": "^2.0.0-rc.2.0.0",
         "@fluidframework/aqueduct": "^2.0.0-rc.1.0.3",
-        "@fluidframework/cell": "^2.0.0-rc.1",
+        "@fluidframework/cell": "^2.0.0-rc.2.0.0",
         "@fluidframework/container-loader": "^2.0.0-rc.1.0.3",
         "@fluidframework/container-runtime": "^2.0.0-rc.1.0.4",
-        "@fluidframework/core-interfaces": "^2.0.0-rc.1",
-        "@fluidframework/core-utils": "^2.0.0-rc.1",
-        "@fluidframework/counter": "^2.0.0-rc.1",
+        "@fluidframework/core-interfaces": "^2.0.0-rc.2.0.0",
+        "@fluidframework/core-utils": "^2.0.0-rc.2.0.0",
+        "@fluidframework/counter": "^2.0.0-rc.2.0.0",
         "@fluidframework/datastore-definitions": "^2.0.0-rc.1.0.4",
-        "@fluidframework/driver-definitions": "^2.0.0-rc.1",
-        "@fluidframework/local-driver": "^2.0.0-rc.1",
+        "@fluidframework/driver-definitions": "^2.0.0-rc.2.0.0",
+        "@fluidframework/local-driver": "^2.0.0-rc.2.0.0",
         "@fluidframework/map": "^2.0.0-rc.1.0.4",
-        "@fluidframework/matrix": "^2.0.0-rc.1",
-        "@fluidframework/ordered-collection": "^2.0.0-rc.1",
+        "@fluidframework/matrix": "^2.0.0-rc.2.0.0",
+        "@fluidframework/ordered-collection": "^2.0.0-rc.2.0.0",
         "@fluidframework/register-collection": "^2.0.0-rc.1.0.4",
         "@fluidframework/runtime-definitions": "^2.0.0-rc.1.0.4",
         "@fluidframework/sequence": "^2.0.0-rc.1.0.4",
         "@fluidframework/server-local-server": "^3.1.0-237980",
         "@fluidframework/telemetry-utils": "^2.0.0-rc.1.0.4",
-        "@fluidframework/test-driver-definitions": "^2.0.0-rc.1",
+        "@fluidframework/test-driver-definitions": "^2.0.0-rc.2.0.0",
         "@fluidframework/test-utils": "^2.0.0-rc.1.0.3"
     },
     "devDependencies": {

internal/test-utils/src/describeCompat.ts

@@ -33,8 +33,9 @@ function createCompatSuite(
 
             before(async function () {
                 try {
-                    provider =
-                        await getVersionedTestObjectProviderFromApis(apis);
+                    provider = await getVersionedTestObjectProviderFromApis(
+                        apis
+                    );
                 } catch (error) {
                     const logger = createChildLogger({
                         logger: getTestLogger?.(),