Skip to content

Commit 674215b

Browse files
committed
chore(): remove the concatenating of vendor files.
1 parent a6fe737 commit 674215b

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
@@ -10,7 +10,16 @@
1010
<body>
1111
<<%= htmlComponentName %>-app>Loading...</<%= htmlComponentName %>-app>
1212

13-
<script src="thirdparty/vendor.js"></script>
13+
<script src="vendor/es6-shim/es6-shim.min.js"></script>
14+
<script src="vendor/systemjs/dist/system-polyfills.js"></script>
15+
<script src="vendor/angular2/bundles/angular2-polyfills.js"></script>
16+
<script src="vendor/systemjs/dist/system.src.js"></script>
17+
<script src="vendor/rxjs/bundles/Rx.js"></script>
18+
19+
<script src="vendor/angular2/bundles/angular2.dev.js"></script>
20+
<script src="vendor/angular2/bundles/http.dev.js"></script>
21+
<script src="vendor/angular2/bundles/router.dev.js"></script>
22+
1423
<script src="thirdparty/libs.js"></script>
1524
<script>
1625
System.config({

lib/broccoli/angular2-app.js

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

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

0 commit comments

Comments
 (0)