honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build(broccoli): replace stew.map with diffing replace 

This fixes issues with broken symlinks that occur due to some weird interaction between stew.mv,broccoli-funnel
and our diffing plugins.

Closes #2386
This commit is contained in:
Igor Minar 2015-06-08 19:01:22 -07:00
parent 44b31f326b
commit 1eefde7f0d
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/broccoli/angular_builder.ts
View File

@ -121,19 +121,13 @@ function writeBuildLog(result: BuildResult, name: string) {
function broccoliNodeToBuildNode(broccoliNode) { function broccoliNodeToBuildNode(broccoliNode) {
let tree = broccoliNode.tree.newStyleTree || broccoliNode.tree; let tree = broccoliNode.tree.newStyleTree || broccoliNode.tree;
return new BuildNode( return new BuildNode(tree.description || tree.constructor.name,
tree.description || tree.constructor.name, tree.inputPath ? [tree.inputPath] : tree.inputPaths, tree.cachePath,
tree.inputPath ? [tree.inputPath] : tree.inputPaths, tree.outputPath, broccoliNode.subtrees.map(broccoliNodeToBuildNode));
tree.cachePath,
tree.outputPath,
broccoliNode.subtrees.map(broccoliNodeToBuildNode)
);
} }
class BuildNode { class BuildNode {
constructor(public pluginName: string, public inputPaths: string[], public cachePath: string,
constructor(public pluginName:string, public inputPaths: string[], public cachePath: string, public outputPath: string, public inputNodes: BroccoliNode[]) {}
public outputPath: string, public inputNodes: BroccoliNode[]) {
}
} }

11
tools/broccoli/trees/dart_tree.ts
View File

@ -5,7 +5,6 @@
import {MultiCopy} from './../multi_copy'; import {MultiCopy} from './../multi_copy';
import destCopy from '../broccoli-dest-copy'; import destCopy from '../broccoli-dest-copy';
var Funnel = require('broccoli-funnel'); var Funnel = require('broccoli-funnel');
var glob = require('glob');
import mergeTrees from '../broccoli-merge-trees'; import mergeTrees from '../broccoli-merge-trees';
var path = require('path'); var path = require('path');
var renderLodashTemplate = require('broccoli-lodash'); var renderLodashTemplate = require('broccoli-lodash');
@ -25,7 +24,7 @@ function modulesFunnel(include: string[], exclude?: string[]) {
/** /**
* Replaces $SCRIPT$ in .html files with actual <script> tags. * Replaces $SCRIPT$ in .html files with actual <script> tags.
*/ */
function replaceScriptTagInHtml(content: string, relativePath: string): string { function replaceScriptTagInHtml(placeholder: string, relativePath: string): string {
var scriptTags = ''; var scriptTags = '';
if (relativePath.match(/^benchmarks/)) { if (relativePath.match(/^benchmarks/)) {
scriptTags += '<script src="url_params_to_form.js" type="text/javascript"></script>\n'; scriptTags += '<script src="url_params_to_form.js" type="text/javascript"></script>\n';
@ -33,7 +32,7 @@ function replaceScriptTagInHtml(content: string, relativePath: string): string {
var scriptName = relativePath.replace(/.*\/([^/]+)\.html$/, '$1.dart'); var scriptName = relativePath.replace(/.*\/([^/]+)\.html$/, '$1.dart');
scriptTags += '<script src="' + scriptName + '" type="application/dart"></script>\n' + scriptTags += '<script src="' + scriptName + '" type="application/dart"></script>\n' +
'<script src="packages/browser/dart.js" type="text/javascript"></script>'; '<script src="packages/browser/dart.js" type="text/javascript"></script>';
return content.replace('$SCRIPTS$', scriptTags); return scriptTags;
} }
function stripModulePrefix(relativePath: string): string { function stripModulePrefix(relativePath: string): string {
@ -81,7 +80,11 @@ function fixDartFolderLayout(sourceTree) {
function getHtmlSourcesTree() { function getHtmlSourcesTree() {
// Replace $SCRIPT$ markers in HTML files. // Replace $SCRIPT$ markers in HTML files.
var htmlSrcsTree = stew.map(modulesFunnel(['*/src/**/*.html']), replaceScriptTagInHtml); var htmlSrcsTree = modulesFunnel(['*/src/**/*.html']);
htmlSrcsTree = replace(
htmlSrcsTree,
{files: ['*/**'], patterns: [{match: '$SCRIPTS$', replacement: replaceScriptTagInHtml}]});
// Copy a url_params_to_form.js for each benchmark html file. // Copy a url_params_to_form.js for each benchmark html file.
var urlParamsToFormTree = new MultiCopy('', { var urlParamsToFormTree = new MultiCopy('', {
srcPath: 'tools/build/snippets/url_params_to_form.js', srcPath: 'tools/build/snippets/url_params_to_form.js',