External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 01:17:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix concat order to make things work

Browse Source
This commit is contained in:
Joe Fiorini
2015-01-28 17:15:21 -05:00
parent c81681cc1a
commit 42f6f4fbb6
1 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Brocfile.js
View File

@@ -4,10 +4,12 @@ var concatFiles = require('broccoli-sourcemap-concat');
var pickFiles = require('broccoli-static-compiler'); var pickFiles = require('broccoli-static-compiler');
var findBowerTrees = require('broccoli-bower'); var findBowerTrees = require('broccoli-bower');
var vendorMin = pickFiles('awx/ui/static/lib', { var vendorMin = concatFiles('awx/ui/static/lib', {
srcDir: '/', sourceMapConfig: {
destDir: 'out', enabled: false
files: [ },
outputFile: '/out/vendor-min.js',
inputFiles: [
'jquery/dist/jquery.min.js', 'jquery/dist/jquery.min.js',
'angular/angular.min.js', 'angular/angular.min.js',
'angular-route/angular-route.min.js', 'angular-route/angular-route.min.js',
@@ -37,14 +39,6 @@ var sourceMaps = pickFiles('awx/ui/static/lib', {
] ]
}); });
vendorMin = concatFiles(vendorMin, {
sourceMapConfig: {
enabled: false
},
outputFile: '/out/vendor-min.js',
inputFiles: ['out/**/*.js']
});
var vendorMaps = concatFiles(sourceMaps, { var vendorMaps = concatFiles(sourceMaps, {
sourceMapConfig: { sourceMapConfig: {
enabled: false enabled: false
@@ -55,17 +49,15 @@ var vendorMaps = concatFiles(sourceMaps, {
var vendorMinWithMaps = mergeTrees([vendorMin, vendorMaps]); var vendorMinWithMaps = mergeTrees([vendorMin, vendorMaps]);
var vendor = pickFiles('awx/ui/static/lib', { var vendorConcat = concatFiles('awx/ui/static/lib', {
srcDir: '/', outputFile: 'out/vendor-concat.js',
destDir: 'out', inputFiles: [
files: [
'angular-codemirror/lib/AngularCodeMirror.js', 'angular-codemirror/lib/AngularCodeMirror.js',
'timezone-js/src/date.js', 'timezone-js/src/date.js',
'underscore/underscore.js', 'underscore/underscore.js',
'rrule/lib/rrule.js', 'rrule/lib/rrule.js',
'rrule/lib/nlp.js', 'rrule/lib/nlp.js',
'angular-tz-extensions/lib/angular-tz-extensions.js', 'angular-tz-extensions/lib/angular-tz-extensions.js',
'underscore/underscore.js',
'angular-scheduler/lib/angular-scheduler.js', 'angular-scheduler/lib/angular-scheduler.js',
'angular-filters/dist/angular-filters.js', 'angular-filters/dist/angular-filters.js',
'bootstrap/dist/js/bootstrap.js', 'bootstrap/dist/js/bootstrap.js',
@@ -104,7 +96,7 @@ var src = pickFiles('awx/ui/static/js', {
destDir: 'out' destDir: 'out'
}); });
var filesToConcat = mergeTrees([vendor, ansibleLib, src]); var filesToConcat = mergeTrees([vendorConcat, ansibleLib, src]);
console.log('here1'); console.log('here1');
var concated = concatFiles(filesToConcat, { var concated = concatFiles(filesToConcat, {
@@ -115,7 +107,7 @@ var merged = mergeTrees([vendorMinWithMaps, concated], {
description: "TreeMerge (vendor and sourcemaps)", description: "TreeMerge (vendor and sourcemaps)",
}) })
var minified = uglifyFast(merged, { var minified = uglifyFast(merged, {
outSourceMap: 'tower-concat.min.map' outSourceMap: 'tower-concat.map'
}); });
var finalMap = pickFiles(minified, { var finalMap = pickFiles(minified, {
@@ -128,8 +120,8 @@ var finalized = concatFiles(minified, {
sourceMapConfig: { sourceMapConfig: {
enabled: false enabled: false
}, },
outputFile: '/tower-concat.min.js', outputFile: '/tower-concat.js',
inputFiles: ['out/*.js'] inputFiles: ['out/vendor-min.js', 'out/tower-concat.js']
}); });
module.exports = mergeTrees([finalMap, finalized]); module.exports = mergeTrees([finalMap, finalized]);