From 54dcfd8164c3da7d8b4e23f6e611e60f8a76eb5b Mon Sep 17 00:00:00 2001 From: Ryan <30853424+totally-not-frito-lays@users.noreply.github.com> Date: Mon, 2 Jun 2025 11:42:31 -0700 Subject: [PATCH 1/3] added generated label tags and updated package.json --- cli/cli.ts | 6 ++++-- package.json | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cli/cli.ts b/cli/cli.ts index 80b24c2a4..cdefdf29f 100644 --- a/cli/cli.ts +++ b/cli/cli.ts @@ -1930,7 +1930,8 @@ function saveThemeJson(cfg: pxt.TargetBundle, localDir?: boolean, packaged?: boo const docsRoot = nodeutil.targetDir; let gcards: pxt.CodeCard[] = []; let tocmd: string = - `# Projects + ` +# Projects `; Object.keys(targetConfig.galleries).forEach(k => { @@ -1965,7 +1966,8 @@ function saveThemeJson(cfg: pxt.TargetBundle, localDir?: boolean, packaged?: boo nodeutil.writeFileSync(path.join(docsRoot, "docs/projects/SUMMARY.md"), tocmd, { encoding: "utf8" }); nodeutil.writeFileSync(path.join(docsRoot, "docs/projects.md"), - `# Projects + ` +# Projects \`\`\`codecard ${JSON.stringify(gcards, null, 4)} diff --git a/package.json b/package.json index ac48f6dc1..64639f356 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pxt-core", - "version": "11.4.7", + "version": "11.4.8", "description": "Microsoft MakeCode provides Blocks / JavaScript / Python tools and editors", "keywords": [ "TypeScript", From e9bdc842247ba4b6a9d6ef8313c4623f9c1cb322 Mon Sep 17 00:00:00 2001 From: Ryan <30853424+totally-not-frito-lays@users.noreply.github.com> Date: Mon, 2 Jun 2025 11:59:28 -0700 Subject: [PATCH 2/3] reformatted file declaration to be easier to read --- cli/cli.ts | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/cli/cli.ts b/cli/cli.ts index cdefdf29f..d4e11e742 100644 --- a/cli/cli.ts +++ b/cli/cli.ts @@ -1841,6 +1841,8 @@ function replaceStaticImagesInJsonBlob(cfg: any, staticAssetHandler: (fileLocati return pxt.replaceStringsInJsonBlob(cfg, /^\.?\/static\/.+\.(png|gif|jpeg|jpg|svg|mp4|ico)$/i, staticAssetHandler); } +const GENERATED_FILE_DECLARATION = `\n\n`; + function saveThemeJson(cfg: pxt.TargetBundle, localDir?: boolean, packaged?: boolean) { cfg.appTheme.id = cfg.id cfg.appTheme.title = cfg.title @@ -1929,11 +1931,7 @@ function saveThemeJson(cfg: pxt.TargetBundle, localDir?: boolean, packaged?: boo if (targetConfig?.galleries) { const docsRoot = nodeutil.targetDir; let gcards: pxt.CodeCard[] = []; - let tocmd: string = - ` -# Projects - -`; + let tocmd: string = GENERATED_FILE_DECLARATION + `# Projects\n`; Object.keys(targetConfig.galleries).forEach(k => { targetStrings[k] = k; const galleryUrl = getGalleryUrl(targetConfig.galleries[k]) @@ -1941,8 +1939,7 @@ function saveThemeJson(cfg: pxt.TargetBundle, localDir?: boolean, packaged?: boo const gallery = pxt.gallery.parseGalleryMardown(gallerymd); const gurl = `/${galleryUrl.replace(/^\//, '')}`; tocmd += - `* [${k}](${gurl}) -`; + `* [${k}](${gurl})\n`; const gcard: pxt.CodeCard = { name: k, url: gurl @@ -1965,19 +1962,21 @@ function saveThemeJson(cfg: pxt.TargetBundle, localDir?: boolean, packaged?: boo }); nodeutil.writeFileSync(path.join(docsRoot, "docs/projects/SUMMARY.md"), tocmd, { encoding: "utf8" }); - nodeutil.writeFileSync(path.join(docsRoot, "docs/projects.md"), - ` -# Projects - -\`\`\`codecard -${JSON.stringify(gcards, null, 4)} -\`\`\` - -## See Also - -${gcards.map(gcard => `[${gcard.name}](${gcard.url})`).join(',\n')} - -`, { encoding: "utf8" }); + const PROJECTS_MD_CONTENT = [ + GENERATED_FILE_DECLARATION, + '', + '# Projects', + '', + '```codecard', + JSON.stringify(gcards, null, 4), + '```', + '', + '## See Also', + '', + gcards.map(gcard => `[${gcard.name}](${gcard.url})`).join(',\n') + ].join('\n'); + + nodeutil.writeFileSync(path.join(docsRoot, "docs/projects.md"), PROJECTS_MD_CONTENT, { encoding: "utf8" }); } const multiplayerGames = targetConfig?.multiplayer?.games; for (const game of (multiplayerGames ?? [])) { From 6deb5acac5c7c6368b84692b341487415ec4a5cf Mon Sep 17 00:00:00 2001 From: Ryan <30853424+totally-not-frito-lays@users.noreply.github.com> Date: Fri, 13 Jun 2025 11:54:52 -0700 Subject: [PATCH 3/3] updated declaration to pxtarget.json instead of targetconfig.json --- cli/cli.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/cli.ts b/cli/cli.ts index d4e11e742..af180388d 100644 --- a/cli/cli.ts +++ b/cli/cli.ts @@ -1841,7 +1841,7 @@ function replaceStaticImagesInJsonBlob(cfg: any, staticAssetHandler: (fileLocati return pxt.replaceStringsInJsonBlob(cfg, /^\.?\/static\/.+\.(png|gif|jpeg|jpg|svg|mp4|ico)$/i, staticAssetHandler); } -const GENERATED_FILE_DECLARATION = `\n\n`; +const GENERATED_FILE_DECLARATION = `\n\n`; function saveThemeJson(cfg: pxt.TargetBundle, localDir?: boolean, packaged?: boolean) { cfg.appTheme.id = cfg.id