diff --git a/gulpfile.js b/gulpfile.js index 2241e89594..90701ea9b1 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -247,7 +247,6 @@ gulp.task('serve.js.dev', ['build.js.dev'], function(neverDone) { })(); }); - gulp.task('serve.js.prod', jsserve(gulp, gulpPlugins, { path: CONFIG.dest.js.prod.es5, port: 8001 @@ -852,16 +851,6 @@ gulp.task('!build/change_detect.dart', function(done) { proc.stdout.pipe(dartStream); }); -// ------------ -// additional tasks for building examples -gulp.task('build.http.example', function() { - //Copy over people.json used in http example - return gulp.src('modules/examples/src/http/people.json') - .pipe(gulp.dest(CONFIG.dest.js.prod.es5 + '/examples/src/http/')) - .pipe(gulp.dest(CONFIG.dest.js.dev.es5 + '/examples/src/http/')) - .pipe(gulp.dest(CONFIG.dest.js.dart2js + '/examples/src/http/')); -}); - // ------------ // angular material testing rules gulp.task('build.css.material', function() { diff --git a/scripts/ci/test_e2e_js.sh b/scripts/ci/test_e2e_js.sh index 46a16e04fb..ba0f3b8a70 100755 --- a/scripts/ci/test_e2e_js.sh +++ b/scripts/ci/test_e2e_js.sh @@ -16,7 +16,6 @@ function killServer () { serverPid=$! ./node_modules/.bin/gulp build.css.material& -./node_modules/.bin/gulp build.http.example& trap killServer EXIT diff --git a/tools/broccoli/trees/browser_tree.ts b/tools/broccoli/trees/browser_tree.ts index 692bcd81ba..faf4a181df 100644 --- a/tools/broccoli/trees/browser_tree.ts +++ b/tools/broccoli/trees/browser_tree.ts @@ -178,8 +178,13 @@ module.exports = function makeBrowserTree(options, destinationPath) { ] }); + var assetsTree = new Funnel(modulesTree,{ + include: ['**/*'], + exclude: ['**/*.{html,ts,dart}'], + destDir: '/' + }); + var scripts = mergeTrees(servingTrees); - var css = new Funnel(modulesTree, {include: ["**/*.css"]}); var polymerFiles = new Funnel('.', { files: [ 'bower_components/polymer/lib/polymer.html', @@ -191,9 +196,9 @@ module.exports = function makeBrowserTree(options, destinationPath) { var reactFiles = new Funnel('.', {files: ['node_modules/react/dist/react.min.js']}); var react = stew.mv(flatten(reactFiles), 'benchmarks_external/src/tree/react'); - htmlTree = mergeTrees([htmlTree, scripts, polymer, css, react]); + htmlTree = mergeTrees([htmlTree, scripts, polymer, react]); - es5Tree = mergeTrees([es5Tree, htmlTree]); + es5Tree = mergeTrees([es5Tree, htmlTree, assetsTree]); var mergedTree = mergeTrees([stew.mv(es6Tree, '/es6'), stew.mv(es5Tree, '/es5')]);