Merged
Conversation
eanders-ms
reviewed
Sep 10, 2021
| if (simDir() != "sim") | ||
| lst = lst.concat(nodeutil.allFiles(path.join("sim", "public"), 5, true)) | ||
| pxt.debug(`target files (on disk): ${lst.join('\r\n ')}`) | ||
| lst = lst.filter(f => !f.includes("icons.css")) // We want to pull icons.css from pxt-core, not the target |
Contributor
There was a problem hiding this comment.
Cloud icon still there?
Contributor
Author
There was a problem hiding this comment.
Contributor
There was a problem hiding this comment.
Oh! Do we need to do anything special to bump pxt-arcade-sim?
Contributor
Author
There was a problem hiding this comment.
hmmmmmmm i think @riknoll knows? not sure what being an unpublished npm package means...
Member
There was a problem hiding this comment.
You need to manually do a bump (change the version in package.json and push a tag).
Then you update the version in pxt-arcade in three places: The package.json and in tow of the github actions builds. Here's an example PR: https://github.com/microsoft/pxt-arcade/pull/3034/files
Contributor
Author
There was a problem hiding this comment.
okie i put up a pr to bump...here microsoft/pxt-arcade#3936
i hope i did it right???? there WAS a stray commit in the sim that did happen for everybody else
eanders-ms
approved these changes
Sep 10, 2021
eanders-ms
added a commit
that referenced
this pull request
Sep 13, 2021
* [stable7.1] Cherry-pick fixes for skillmap, iframe (#8391) * Rest finishedActivityState when opening new activity (#8387) * Null check for header when saving, posting tutorial progress (#8389) * Don't unload/reload skillmap graph, reduces jittering (#8390) * Don't use telemetry item before it's declared (#8393) * 7.1.21 * Cherry pick fixes to stable7.1 (#8394) * Don't write the contents of nonexistent files (#8392) * Don't use telemetry item before it's declared (#8393) * 7.1.22 * Handle iframe reloading (#8398) * 7.1.23 * Only load project if skillmap editorview open (#8399) * 7.1.24 * Don't run sim in background when no project is loaded in the skillmap iframe (#8405) * Don't run sim in background when no project is loaded in the skillmap iframe * Don't reload header when exiting skillmp tutorial * Remove post progress * Retry request for skillmap markdown in safari (#8395) * 7.1.25 * Check for deleted flag when importing skillmap project (#8414) * Filter tiles out of image gallery in image editor (#8403) * Add user profile page (#8411) Co-authored-by: Eric Anderson <eanders@microsoft.com> * Fix hang in monaco by making regex more specific (#8427) * Fix hang in monaco by making regex more specific * cleanup * Only reset progress for currently open skillmap (#8415) * reenable auth in skillmap (#8428) * 7.1.26 * Check for placeholder type before guessing a new type (#8429) (#8435) * on signin, transfer local projects to cloud (#8431) (#8443) * on signin, transfer local projects to cloud * pr feedback and refinements * Add detection for chromium-based edge (#8432) * skillmap: reflect project cloud status on on info panel (#8440) * cloud status wip * reflect cloud status on info panel * removed unneeded property * show cloud status on skillmap view * pr feedback and refinements * Fix User Menu header sizing (#8437) * Prompt users to sign in after completing the first skillmap activity (#8433) * 7.1.27 * Load entire toolbox instead of exiting tutorial on toolbox error (#8449) * Make copies of local projects when importing skillmap progress to cloud (#8456) * Make copies of local projects when importing skillmap progress to cloud * cleanup * PR feedback * always request all header cloud status * 7.1.28 * Tick event for grey block in tutorial filters, add 24hr expiration (#8463) * 7.1.29 * allow specifying pkgs to compile hex files for in staticpkg (#8460) (#8466) * Handle user initials better in skillmap (#8458) * 7.1.30 * Never use the icons.css from pxt-arcade-sim (#8451) * Never use the icons.css from pxt-arcade-sim (#8451) * [stable7.1] Cherry Pick (#8477) * cleanup cloudSyncCheckAsync trigger (#8476) * Cleanup console output (#8479) * [stable7.1] Expand inline blocks regex to allow arrays (#8471) (#8474) * Expand inline blocks regex to allow arrays (#8471) * Thow warning instead of error for loop in skillmap graph (#8424) * Allow skill map end action without link (#8478) * 7.1.31 * Align sign in button icon (#8481) * skillmap: export cloud projects to local on profile delete (#8482) * 7.1.32 * Merge branch 'stable7.1' * Copy skillmap headers over for cloud users (#8483) * Copy skillmap headers over nicely for new users * Remove trailing spaces * Put ready promise back * Don't block things forever * Move things from ready to appstate * Add comment * Use 'some' instead of filter * 7.1.33 * Use arcade-sim icons.css :) (#8485) * 7.1.34 * Copy over user tags. (#8488) * 7.1.35 Co-authored-by: shakao <34112083+shakao@users.noreply.github.com> Co-authored-by: Richard Knoll <riknoll@users.noreply.github.com> Co-authored-by: Abhijith Chatra <abchatra@microsoft.com> Co-authored-by: Vivian Li <vivl@microsoft.com> Co-authored-by: Joey Wunderlich <jwunderl@users.noreply.github.com> Co-authored-by: Joey Wunderlich <joey.wunderlich@gmail.com> Co-authored-by: livcheerful <li.v.cheerful@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
fixes microsoft/pxt-arcade#3925
the icons.css in the sim also has....semantic icons at the end. I can't figure out how to append that in our build, so I'm just gonna update icons.css in arcade-sim.