Skip to content

Commit 60b97b2

Browse files
committed
fix(build): ensure that asset files are copied over to example directories
1 parent 355ab5b commit 60b97b2

File tree

3 files changed

+8
-15
lines changed

3 files changed

+8
-15
lines changed

gulpfile.js

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,6 @@ gulp.task('serve.js.dev', ['build.js.dev'], function(neverDone) {
247247
})();
248248
});
249249

250-
251250
gulp.task('serve.js.prod', jsserve(gulp, gulpPlugins, {
252251
path: CONFIG.dest.js.prod.es5,
253252
port: 8001
@@ -852,16 +851,6 @@ gulp.task('!build/change_detect.dart', function(done) {
852851
proc.stdout.pipe(dartStream);
853852
});
854853

855-
// ------------
856-
// additional tasks for building examples
857-
gulp.task('build.http.example', function() {
858-
//Copy over people.json used in http example
859-
return gulp.src('modules/examples/src/http/people.json')
860-
.pipe(gulp.dest(CONFIG.dest.js.prod.es5 + '/examples/src/http/'))
861-
.pipe(gulp.dest(CONFIG.dest.js.dev.es5 + '/examples/src/http/'))
862-
.pipe(gulp.dest(CONFIG.dest.js.dart2js + '/examples/src/http/'));
863-
});
864-
865854
// ------------
866855
// angular material testing rules
867856
gulp.task('build.css.material', function() {

scripts/ci/test_e2e_js.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ function killServer () {
1616
serverPid=$!
1717

1818
./node_modules/.bin/gulp build.css.material&
19-
./node_modules/.bin/gulp build.http.example&
2019

2120
trap killServer EXIT
2221

tools/broccoli/trees/browser_tree.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,13 @@ module.exports = function makeBrowserTree(options, destinationPath) {
178178
]
179179
});
180180

181+
var assetsTree = new Funnel(modulesTree,{
182+
include: ['**/*'],
183+
exclude: ['**/*.{html,ts,dart}'],
184+
destDir: '/'
185+
});
186+
181187
var scripts = mergeTrees(servingTrees);
182-
var css = new Funnel(modulesTree, {include: ["**/*.css"]});
183188
var polymerFiles = new Funnel('.', {
184189
files: [
185190
'bower_components/polymer/lib/polymer.html',
@@ -191,9 +196,9 @@ module.exports = function makeBrowserTree(options, destinationPath) {
191196
var reactFiles = new Funnel('.', {files: ['node_modules/react/dist/react.min.js']});
192197
var react = stew.mv(flatten(reactFiles), 'benchmarks_external/src/tree/react');
193198

194-
htmlTree = mergeTrees([htmlTree, scripts, polymer, css, react]);
199+
htmlTree = mergeTrees([htmlTree, scripts, polymer, react]);
195200

196-
es5Tree = mergeTrees([es5Tree, htmlTree]);
201+
es5Tree = mergeTrees([es5Tree, htmlTree, assetsTree]);
197202

198203
var mergedTree = mergeTrees([stew.mv(es6Tree, '/es6'), stew.mv(es5Tree, '/es5')]);
199204

0 commit comments

Comments
 (0)