Build templates nupkgs directly from source without copying to staging location

Author: SteveSandersonMS

appveyor.yml

@@ -18,7 +18,7 @@ build_script:
  - npm run build
  - ps: Pop-Location
 artifacts:
- - path: templates\package-builder\dist\artifacts\*.nupkg
+ - path: templates\package-builder\artifacts\*.nupkg
 name: Microsoft.AspNetCore.SpaTemplates
 type: NuGetPackage
 # - ps: .\build.ps1

templates/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.nuspec

@@ -14,4 +14,10 @@
  <packageTypename="Template" />
  </packageTypes>
  </metadata>
+ <files>
+ <file
+src="**/*"
+exclude="*/node_modules/**;*/bin/**;*/obj/**;*/ClientApp/dist/**;*/wwwroot/dist/**"
+target="Content" />
+ </files>
 </package>

templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec

@@ -14,4 +14,10 @@
  <packageTypename="Template" />
  </packageTypes>
  </metadata>
+ <files>
+ <file
+src="**/*"
+exclude="*/node_modules/**;*/bin/**;*/obj/**;*/.vs/**;*/.vscode/**;*/ClientApp/dist/**;*/wwwroot/dist/**"
+target="Content" />
+ </files>
 </package>

templates/package-builder/.gitignore

@@ -1,3 +1,4 @@
 /node_modules/
 /built/
-/dist/
+/artifacts/
+/tmp/

templates/package-builder/src/build/build.ts

@@ -15,28 +15,6 @@ const dotNetPackages = [
 'Microsoft.AspNetCore.SpaTemplates'
 ];
 
-functionwriteFileEnsuringDirExists(root: string,filename: string,contents: string|Buffer){
-letfullPath=path.join(root,filename);
-mkdirp.sync(path.dirname(fullPath));
-fs.writeFileSync(fullPath,contents);
-}
-
-functionlistFilesExcludingGitignored(root: string): string[]{
-letgitIgnorePath=path.join(root,'.gitignore');
-letgitignoreEvaluator=fs.existsSync(gitIgnorePath)
- ? gitignore.compile(fs.readFileSync(gitIgnorePath,'utf8'))
- : {accepts: ()=>true};
-returnglob.sync('**/*',{cwd: root,dot: true,nodir: true})
-.filter(fn=>gitignoreEvaluator.accepts(fn));
-}
-
-functionwriteTemplate(sourceRoot: string,destRoot: string){
-listFilesExcludingGitignored(sourceRoot).forEach(fn=>{
-letsourceContent=fs.readFileSync(path.join(sourceRoot,fn));
-writeFileEnsuringDirExists(destRoot,fn,sourceContent);
-});
-}
-
 functiongetBuildNumber(): string{
 if(process.env.APPVEYOR_BUILD_NUMBER){
 returnprocess.env.APPVEYOR_BUILD_NUMBER;
@@ -52,35 +30,17 @@ function buildDotNetNewNuGetPackages(outputDir: string){
 constdotNetNewNupkgPath=buildDotNetNewNuGetPackage(packageId);
 
 // Move the .nupkg file to the output dir
+mkdirp.sync(outputDir);
 fs.renameSync(dotNetNewNupkgPath,path.join(outputDir,path.basename(dotNetNewNupkgPath)));
 });
 }
 
 functionbuildDotNetNewNuGetPackage(packageId: string){
-constoutputRoot='./dist/dotnetnew';
-rimraf.sync(outputRoot);
-
-// Copy template files
+// Invoke NuGet to create the final package
 constpackageSourceRootDir=path.join('../',packageId);
-consttemplatesInPackage=fs.readdirSync(path.join(packageSourceRootDir,'Content'));
-
-_.forEach(templatesInPackage,templateName=>{
-consttemplateSourceDir=path.join(packageSourceRootDir,'Content',templateName);
-consttemplateOutputDir=path.join(outputRoot,'Content',templateName);
-writeTemplate(templateSourceDir,templateOutputDir);
-});
-
-// Create the .nuspec file
 constnuspecFilename=`${packageId}.nuspec`;
-constnuspecContentTemplate=fs.readFileSync(path.join(packageSourceRootDir,nuspecFilename));
-writeFileEnsuringDirExists(outputRoot,
-nuspecFilename,
-nuspecContentTemplate
-);
-
-// Invoke NuGet to create the final package
 constnugetExe=path.join(process.cwd(),'./bin/NuGet.exe');
-constnugetStartInfo={cwd: outputRoot,stdio: 'inherit'};
+constnugetStartInfo={cwd: packageSourceRootDir,stdio: 'inherit'};
 constpackageVersion=`1.0.${getBuildNumber()}`;
 constnugetArgs=['pack',nuspecFilename,'-Version',packageVersion];
 if(isWindows){
@@ -92,15 +52,7 @@ function buildDotNetNewNuGetPackage(packageId: string){
 childProcess.spawnSync('mono',nugetArgs,nugetStartInfo);
 }
 
-// Clean up
-rimraf.sync('./tmp');
-
-returnglob.sync(path.join(outputRoot,'./*.nupkg'))[0];
+returnglob.sync(path.join(packageSourceRootDir,'./*.nupkg'))[0];
 }
 
-constdistDir='./dist';
-constartifactsDir=path.join(distDir,'artifacts');
-
-rimraf.sync(distDir);
-mkdirp.sync(artifactsDir);
-buildDotNetNewNuGetPackages(artifactsDir);
+buildDotNetNewNuGetPackages('./artifacts');