Don't leave behind an unused package.json.tmp file

SteveSandersonMS · SteveSandersonMS · commit 4580412f7364 · 2016-12-15T16:42:25.000Z
diff --git a/templates/package-builder/src/yeoman/app/index.ts b/templates/package-builder/src/yeoman/app/index.ts
@@ -137,6 +137,7 @@ class MyGenerator extends yeoman.Base {
             if (emitFile) {
                 let inputFullPath = path.join(templateRoot, fn);
                 let destinationFullPath = this.destinationPath(outputFn);
+                let deleteInputFileAfter = false;
                 if (path.basename(fn) === 'package.json') {
                     // Special handling for package.json, because we rewrite it dynamically
                     const tempPath = destinationFullPath + '.tmp';
@@ -147,6 +148,7 @@ class MyGenerator extends yeoman.Base {
                         /* space */ 2
                     );
                     inputFullPath = tempPath;
+                    deleteInputFileAfter = true;
                 }
 
                 const outputDirBasename = path.basename(path.dirname(destinationFullPath));
@@ -164,6 +166,10 @@ class MyGenerator extends yeoman.Base {
                         this._answers
                     );
                 }
+
+                if (deleteInputFileAfter) {
+                    this.fs.delete(inputFullPath);
+                }
             }
         });
     }

Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,7 @@ class MyGenerator extends yeoman.Base {`
`137`	`137`	`if (emitFile) {`
`138`	`138`	`let inputFullPath = path.join(templateRoot, fn);`
`139`	`139`	`let destinationFullPath = this.destinationPath(outputFn);`
	`140`	`+ let deleteInputFileAfter = false;`
`140`	`141`	`if (path.basename(fn) === 'package.json') {`
`141`	`142`	`// Special handling for package.json, because we rewrite it dynamically`
`142`	`143`	`const tempPath = destinationFullPath + '.tmp';`
`@@ -147,6 +148,7 @@ class MyGenerator extends yeoman.Base {`
`147`	`148`	`/* space */ 2`
`148`	`149`	`);`
`149`	`150`	`inputFullPath = tempPath;`
	`151`	`+ deleteInputFileAfter = true;`
`150`	`152`	`}`
`151`	`153`
`152`	`154`	`const outputDirBasename = path.basename(path.dirname(destinationFullPath));`
`@@ -164,6 +166,10 @@ class MyGenerator extends yeoman.Base {`
`164`	`166`	`this._answers`
`165`	`167`	`);`
`166`	`168`	`}`
	`169`	`+`
	`170`	`+ if (deleteInputFileAfter) {`
	`171`	`+ this.fs.delete(inputFullPath);`
	`172`	`+ }`
`167`	`173`	`}`
`168`	`174`	`});`
`169`	`175`	`}`