Review: Refactor mpk assertion

Author: alihcsumer

packages/command-tests/commands.js

@@ -218,42 +218,25 @@ async function main() {
 
         async function testBuild() {
             await execAsync("npm run build", workDir, logger);
-            if (
-                !existsSync(
-                    join(
-                        workDir,
-                        `/dist/${widgetPackageJson.version}/${widgetPackageJson.packagePath}.${widgetPackageJson.widgetName}.mpk`
-                    )
-                )
-            ) {
-                throw new Error("Expected mpk file to be generated, but it wasn't.");
-            }
             checkWidgetBundleFiles();
         }
 
         async function testRelease() {
             rm("-rf", join(workDir, "dist"));
             await execAsync("npm run release", workDir, logger);
-
-            if (
-                !existsSync(
-                    join(
-                        workDir,
-                        `/dist/${widgetPackageJson.version}/${widgetPackageJson.packagePath}.${widgetPackageJson.widgetName}.mpk`
-                    )
-                )
-            ) {
-                throw new Error("Expected mpk file to be generated, but it wasn't.");
-            }
             checkWidgetBundleFiles();
         }
 
         function checkWidgetBundleFiles() {
-            // XML files copied into the staging dir before zipping; missing here means a broken mpk.
             const stagingDir = join(workDir, "dist", "tmp", "widgets");
-            const missing = ["package.xml", `${widgetPackageJson.widgetName}.xml`].filter(
-                f => !existsSync(join(stagingDir, f))
+            const mpkFile = join(
+                workDir,
+                "dist",
+                widgetPackageJson.version,
+                `${widgetPackageJson.packagePath}.${widgetPackageJson.widgetName}.mpk`
             );
+            const requiredFiles = [mpkFile, join(stagingDir, "package.xml"), join(stagingDir, `${widgetPackageJson.widgetName}.xml`)];
+            const missing = requiredFiles.filter(f => !existsSync(f));
             if (missing.length) {
                 throw new Error(`Expected widget bundle files in mpk, but missing: ${missing.join(", ")}.`);
             }

packages/pluggable-widgets-tools/configs/rollup.config.mjs

@@ -320,7 +320,6 @@ export default async args => {
             clear({ targets: [outDir, mpkDir] }),
             command([
                 () => {
-                    // Re-target join(widgetRoot,...) after PR #182.
                     cp("src/**/*.xml", outDir);
                     if (existsSync(`src/${widgetName}.icon.png`) || existsSync(`src/${widgetName}.tile.png`)) {
                         cp(`src/${widgetName}.@(tile|icon)?(.dark).png`, outDir);

packages/pluggable-widgets-tools/configs/rollup.config.native.mjs

@@ -257,7 +257,6 @@ export default async args => {
             clear({ targets: [outDir, mpkDir] }),
             command([
                 () => {
-                    // Re-target join(widgetRoot,...) after PR #182.
                     cp("src/**/*.xml", outDir);
                     if (existsSync(`src/${widgetName}.icon.png`) || existsSync(`src/${widgetName}.tile.png`)) {
                         cp(`src/${widgetName}.@(tile|icon)?(.dark).png`, outDir);