Simplify by removing diff feature. Now just writes each template as an independent copy.

SteveSandersonMS · SteveSandersonMS · commit fc705e8bf8fb · 2016-04-28T14:34:47.000+01:00
diff --git a/templates/yeoman/src/CreateGenerator.ts b/templates/yeoman/src/CreateGenerator.ts
@@ -1,10 +1,8 @@
-import * as yeoman from 'yeoman-generator';
 import * as glob from 'glob';
 import * as gitignore from 'gitignore-parser';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as _ from 'lodash';
-import * as diff from 'diff';
 import * as mkdirp from 'mkdirp';
 import * as rimraf from 'rimraf';
 
@@ -33,63 +31,18 @@ function listFilesExcludingGitignored(root: string): string[] {
         .filter(fn => gitignoreEvaluator.accepts(fn));
 }
 
-function writeCommonFiles(outDir: string) {
-    let filesByTemplate = _.mapValues(templates, listFilesExcludingGitignored);
-    let commonFiles = _.intersection.apply(_, _.values(filesByTemplate));
-    
-    commonFiles.forEach(fn => {
-        let templateRoots = _.values(templates);
-        let origContent = fs.readFileSync(path.join(templateRoots[0], fn));            
-
-        if (isTextFile(fn)) {
-            // For text files, we copy the portion that's common to all the templates
-            let commonText = origContent.toString('utf8');
-            templateRoots.slice(1).forEach(otherTemplateRoot => {
-                let otherTemplateContent = fs.readFileSync(path.join(otherTemplateRoot, fn), 'utf8');
-                commonText = diff.diffLines(commonText, otherTemplateContent)
-                    .filter(c => !(c.added || c.removed))
-                    .map(c => c.value)
-                    .join('');
-            });
-            
-            writeFileEnsuringDirExists(outDir, fn, commonText);
-        } else {
-            // For binary (or maybe-binary) files, we only consider them common if they are identical across all templates
-            let isIdenticalEverywhere = !templateRoots.slice(1).some(otherTemplateRoot => {
-                return !fs.readFileSync(path.join(otherTemplateRoot, fn)).equals(origContent);
-            });
-            if (isIdenticalEverywhere) {
-                writeFileEnsuringDirExists(outDir, fn, origContent);
-            }
-        }
-    });
-}
-
-function writeDiffsForTemplate(sourceRoot: string, destRoot: string, commonRoot: string) {
+function writeTemplate(sourceRoot: string, destRoot: string) {
     listFilesExcludingGitignored(sourceRoot).forEach(fn => {
-        const commonFn = path.join(commonRoot, fn);
-        const sourceContent = fs.readFileSync(path.join(sourceRoot, fn));
-        
-        if (!fs.existsSync(commonFn)) {
-            // This file is unique to this template - just copy as-is
-            writeFileEnsuringDirExists(destRoot, fn, sourceContent);
-        } else {
-            let commonText = fs.readFileSync(commonFn, 'utf8');
-            let sourceText = sourceContent.toString('utf8');
-            if (commonText !== sourceText) {            
-                // Write a diff vs the common version of this file
-                let fileDiff = diff.createPatch(fn, commonText, sourceText, null, null);
-                writeFileEnsuringDirExists(destRoot, fn + '.patch', fileDiff);
-            }
-        }
-    });
+        const sourceContent = fs.readFileSync(path.join(sourceRoot, fn));        
+        writeFileEnsuringDirExists(destRoot, fn, sourceContent);
+    });    
 }
 
 const outputRoot = './generator-aspnet-spa';
 const commonRoot = path.join(outputRoot, 'templates/common'); 
 rimraf.sync(outputRoot);
-writeCommonFiles(commonRoot);
 
 _.forEach(templates, (templateRootDir, templateName) => {
-    writeDiffsForTemplate(templateRootDir, path.join(outputRoot, 'templates', templateName), commonRoot);
+    const outputDir = path.join(outputRoot, 'templates', templateName);
+    writeTemplate(templateRootDir, outputDir);
 });
diff --git a/templates/yeoman/tsd.json b/templates/yeoman/tsd.json
@@ -20,9 +20,6 @@
     "lodash/lodash.d.ts": {
       "commit": "544a35a10866b32afda9c7f029c0764558563f4f"
     },
-    "diff/diff.d.ts": {
-      "commit": "544a35a10866b32afda9c7f029c0764558563f4f"
-    },
     "mkdirp/mkdirp.d.ts": {
       "commit": "544a35a10866b32afda9c7f029c0764558563f4f"
     },
diff --git a/templates/yeoman/typings/diff/diff.d.ts b/templates/yeoman/typings/diff/diff.d.ts
diff --git a/templates/yeoman/typings/tsd.d.ts b/templates/yeoman/typings/tsd.d.ts
@@ -3,6 +3,5 @@
 /// <reference path="glob/glob.d.ts" />
 /// <reference path="minimatch/minimatch.d.ts" />
 /// <reference path="lodash/lodash.d.ts" />
-/// <reference path="diff/diff.d.ts" />
 /// <reference path="mkdirp/mkdirp.d.ts" />
 /// <reference path="rimraf/rimraf.d.ts" />
