Embedfix (microsoft#7194)

pelikhan · web-flow · commit de2cd28f3561 · 2020-06-15T12:18:39.000-07:00
* added upgrade logging

* adding comments

* good old editor.main.css

* updated test plan

* updated docs

* updated logging
diff --git a/common-docs/release-tests.md b/common-docs/release-tests.md
@@ -6,10 +6,11 @@ This page list the set of test passes required for a new release.
 
 * [Internet Explorer](/release-tests/ie)
 * [Windows App](/release-tests/uwp)
+* Electron // TODO
 
 ## Features #features
 
 * [Tutorials](/release-tests/tutorials)
 * [Documentation](/release-tests/documentation)
-* [Sharing](/releases-tests/tutorials)
+* [Sharing](/release-tests/sharing)
 * [Extensions](/release-tests/extensions)
diff --git a/common-docs/release-tests/sharing.md b/common-docs/release-tests/sharing.md
@@ -17,7 +17,7 @@
 * Click the **X** icon
 * the dialog closes and no URL is generated
 
-## Embed #embed
+## Embed Code #embed
 
 * Open the Editor and drag a few blocks
 * Click on **Share**, then **Publish**
@@ -27,6 +27,26 @@
     3. Copy the text in the HTML section
     4. Click Run and verify that the blocks render
 
+## Embed Editor #editor
+
+* Open the Editor and drag a few blocks
+* Click on **Share**, then **Publish**
+* Click on **Embed**
+    1. Copy the content of the **Editor** tab
+    2. Open https://jsfiddle.net
+    3. Copy the text in the HTML section
+    4. Click Run and verify that the blocks render
+
+## Embed Simulator #simulator
+
+* Open the Editor and drag a few blocks
+* Click on **Share**, then **Publish**
+* Click on **Embed**
+    1. Copy the content of the **Simulator** tab
+    2. Open https://jsfiddle.net
+    3. Copy the text in the HTML section
+    4. Click Run and verify that the blocks render
+
 ## Additional Tests
 
 * [Test Plan](/testplan)
diff --git a/pxtlib/package.ts b/pxtlib/package.ts
@@ -318,24 +318,27 @@ namespace pxt {
             return regex.test(ts);
         }
 
-        private upgradePackagesAsync() {
+        private upgradePackagesAsync(): Promise<pxt.Map<string>> {
             if (!this.config)
                 this.loadConfig();
             return pxt.packagesConfigAsync()
                 .then(packagesConfig => {
                     let numfixes = 0
+                    let fixes: pxt.Map<string> = {};
                     U.iterMap(this.config.dependencies, (pkg, ver) => {
                         if (pxt.github.isGithubId(ver)) {
                             const upgraded = pxt.github.upgradedPackageReference(packagesConfig, ver)
                             if (upgraded && upgraded != ver) {
                                 pxt.log(`upgrading dep ${pkg}: ${ver} -> ${upgraded}`);
+                                fixes[ver] = upgraded;
                                 this.config.dependencies[pkg] = upgraded
                                 numfixes++
                             }
                         }
                     })
                     if (numfixes)
                         this.saveConfig()
+                    return numfixes && fixes;
                 })
         }
 
@@ -567,12 +570,32 @@ namespace pxt {
                 initPromise = initPromise.then(() => this.parseConfig(str))
             }
 
-            if (this.level == 0)
-                initPromise = initPromise.then(() => this.upgradePackagesAsync())
+            // if we are installing this script, we haven't yet downloaded the config
+            // do upgrade later
+            if (this.level == 0 && !isInstall) {
+                initPromise = initPromise.then(() => this.upgradePackagesAsync().then(() => { }))
+            }
 
             if (isInstall)
                 initPromise = initPromise.then(() => this.downloadAsync())
 
+            // we are installing the script, and we've download the original version and we haven't upgraded it yet
+            // do upgrade and reload as needed
+            if (this.level == 0 && isInstall) {
+                initPromise = initPromise.then(() => this.upgradePackagesAsync())
+                    .then(fixes => {
+                        if (fixes) {
+                            // worst case scenario with double load
+                            Object.keys(fixes).forEach(key => pxt.tickEvent("package.doubleload", { "extension": key }))
+                            pxt.log(`upgraded, downloading again`);
+                            pxt.debug(fixes);
+                            return this.downloadAsync();
+                        }
+                        // nothing to do here
+                        else return Promise.resolve();
+                    })
+            }
+
             if (appTarget.simulator && appTarget.simulator.dynamicBoardDefinition) {
                 if (this.level == 0)
                     initPromise = initPromise.then(() => this.patchCorePackage());
