Skip to content

Commit 1db49c6

Browse files
committed
chore(): remove the concatenating of vendor files.
1 parent e2e4f56 commit 1db49c6

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

addon/ng2/blueprints/ng2/files/src/index.html

+10-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,16 @@
2222
<body>
2323
<<%= htmlComponentName %>-app>Loading...</<%= htmlComponentName %>-app>
2424

25-
<script src="thirdparty/vendor.js"></script>
25+
<script src="vendor/es6-shim/es6-shim.js"></script>
26+
<script src="vendor/systemjs/dist/system-polyfills.js"></script>
27+
<script src="vendor/angular2/bundles/angular2-polyfills.js"></script>
28+
<script src="vendor/systemjs/dist/system.src.js"></script>
29+
<script src="vendor/rxjs/bundles/Rx.js"></script>
30+
31+
<script src="vendor/angular2/bundles/angular2.dev.js"></script>
32+
<script src="vendor/angular2/bundles/http.dev.js"></script>
33+
<script src="vendor/angular2/bundles/router.dev.js"></script>
34+
2635
<script src="thirdparty/libs.js"></script>
2736
<script>
2837
System.config({

lib/broccoli/angular2-app.js

+1-10
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,6 @@ Angular2App.prototype.toTree = function() {
6363
destDir: 'vendor'
6464
});
6565

66-
var vendorNpmInputFiles = vendorNpmFiles.map(function(file) {
67-
return '**/' + file.substr(file.lastIndexOf('/') + 1);
68-
});
69-
70-
var vendorNpmJs = new Concat(vendorNpmTree, {
71-
inputFiles: vendorNpmInputFiles,
72-
outputFile: '/thirdparty/vendor.js'
73-
});
74-
7566
var thirdPartyJsTree = new Funnel('node_modules', {
7667
include: ['ng2*/bundles/*.js'],
7768
exclude: ['ng2*/bundles/*.min.js', 'ng2*/bundles/*.standalone.js'],
@@ -89,7 +80,7 @@ Angular2App.prototype.toTree = function() {
8980
tsTree,
9081
jsTree,
9182
this.index(),
92-
vendorNpmJs,
83+
vendorNpmTree,
9384
thirdPartyJs
9485
], { overwrite: true });
9586

0 commit comments

Comments
 (0)