Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Order injected angular files #20

Merged
merged 1 commit into from
Jul 16, 2015
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 56 additions & 57 deletions app/index.jade
Original file line number Diff line number Diff line change
@@ -58,79 +58,78 @@ html
script(src='../bower_components/angular/angular.js')
script(src='../bower_components/angular-ui-router/release/angular-ui-router.js')
script(src='../bower_components/angular-cookies/angular-cookies.js')
script(src='../bower_components/auth0-lock/build/auth0-lock.js')
script(src='../bower_components/auth0.js/build/auth0.js')
script(src='../bower_components/auth0-angular/build/auth0-angular.js')
script(src='../bower_components/a0-angular-storage/dist/angular-storage.js')
script(src='../bower_components/angular-jwt/dist/angular-jwt.js')
script(src='../bower_components/moment/moment.js')
script(src='../bower_components/bootstrap/dist/js/bootstrap.js')
script(src='../bower_components/lodash/lodash.js')
script(src='../bower_components/restangular/dist/restangular.js')
script(src='../bower_components/a0-angular-storage/dist/angular-storage.js')
script(src='../bower_components/auth0.js/build/auth0.js')
script(src='../bower_components/auth0-lock/build/auth0-lock.js')
script(src='../bower_components/auth0-angular/build/auth0-angular.js')
script(src='../bower_components/jstzdetect/jstz.min.js')
//- endbower
//- inject:nonBowerScripts
script(src="/scripts/auth0-1.6.4.js")
script(src="/scripts/jstz-1.0.4.js")
script(src="/scripts/moment-timezone-with-data-2010-2020.js")
//- endinject
// endbuild

// build:js js/app.js
//- inject:js
script(src="topcoder.module.js")
script(src="topcoder.constants.js")
script(src="topcoder.controller.js")
script(src="topcoder.interceptors.js")
script(src="topcoder.routes.js")
script(src="account/account.module.js")
script(src="layout/layout.module.js")
script(src="member-dashboard/member-dashboard.module.js")
script(src="peer-review/peer-review.module.js")
script(src="sample/sample.module.js")
script(src="blocks/exception/exception.module.js")
script(src="peer-review/review-status/review-status.filter.js")
script(src="peer-review/review-status/review-status.controller.js")
script(src="peer-review/readOnlyScorecard/readOnlyScorecard.controller.js")
script(src="peer-review/edit-review/edit-review.controller.js")
script(src="peer-review/completed-review/completed-review.controller.js")
script(src="member-dashboard/member-dashboard.module.js")
script(src="member-dashboard/upcoming-srms/upcoming-srms.controller.js")
script(src="member-dashboard/subscribe-updates/subscribe-updates.controller.js")
script(src="member-dashboard/my-challenges/my-challenges.controller.js")
script(src="member-dashboard/member-program/member-program.controller.js")
script(src="member-dashboard/member-profile/welcome-back.controller.js")
script(src="member-dashboard/marketing-message/marketing-message.controller.js")
script(src="member-dashboard/helpful-links/helpful-links.controller.js")
script(src="member-dashboard/blog-post/blog-post.controller.js")
script(src="layout/layout.module.js")
script(src="layout/header/header.controller.js")
script(src="blocks/logger/logger.module.js")
script(src="account/account.routes.js")
script(src="account/validateLogin.directive.js")
script(src="account/validateRegister.directive.js")
script(src="filters/local-time.filter.js")
script(src="member-dashboard/member-dashboard.controller.js")
script(src="member-dashboard/member-dashboard.routes.js")
script(src="peer-review/peer-review.routes.js")
script(src="peer-review/slideable.directive.js")
script(src="sample/sample.controller.js")
script(src="sample/sample.routes.js")
script(src="services/api.service.js")
script(src="services/authtoken.service.js")
script(src="services/blog.service.js")
script(src="services/challenge.service.js")
script(src="services/helpers.service.js")
script(src="services/memberCert.service.js")
script(src="services/profile.service.js")
script(src="services/review.service.js")
script(src="services/scorecard.service.js")
script(src="services/srm.service.js")
script(src="services/tcAuth.service.js")
script(src="services/user.service.js")
script(src="account/login/login.controller.js")
script(src="account/register/register.controller.js")
script(src="account/reset-password/reset-password.controller.js")
script(src="blocks/exception/exception-handler.provider.js")
script(src="blocks/exception/exception.js")
script(src="blocks/logger/logger.js")
script(src="layout/header/header.controller.js")
script(src="member-dashboard/blog-post/blog-post.controller.js")
script(src="member-dashboard/helpful-links/helpful-links.controller.js")
script(src="member-dashboard/marketing-message/marketing-message.controller.js")
script(src="member-dashboard/member-profile/welcome-back.controller.js")
script(src="member-dashboard/member-program/member-program.controller.js")
script(src="member-dashboard/my-challenges/my-challenges.controller.js")
script(src="member-dashboard/subscribe-updates/subscribe-updates.controller.js")
script(src="member-dashboard/upcoming-srms/upcoming-srms.controller.js")
script(src="peer-review/completed-review/completed-review.controller.js")
script(src="peer-review/edit-review/edit-review.controller.js")
script(src="peer-review/readOnlyScorecard/readOnlyScorecard.controller.js")
script(src="peer-review/review-status/review-status.controller.js")
script(src="peer-review/review-status/review-status.filter.js")
script(src="blocks/exception/exception.module.js")
script(src="blocks/exception/exception.js")
script(src="blocks/exception/exception-handler.provider.js")
script(src="account/account.module.js")
script(src="account/reset-password/reset-password.controller.js")
script(src="account/register/register.controller.js")
script(src="account/login/login.controller.js")
script(src="topcoder.module.js")
script(src="services/user.service.js")
script(src="services/tcAuth.service.js")
script(src="services/srm.service.js")
script(src="services/scorecard.service.js")
script(src="services/review.service.js")
script(src="services/profile.service.js")
script(src="services/memberCert.service.js")
script(src="services/helpers.service.js")
script(src="services/challenge.service.js")
script(src="services/blog.service.js")
script(src="services/authtoken.service.js")
script(src="services/api.service.js")
script(src="sample/sample.module.js")
script(src="sample/sample.routes.js")
script(src="sample/sample.controller.js")
script(src="peer-review/slideable.directive.js")
script(src="peer-review/peer-review.routes.js")
script(src="member-dashboard/member-dashboard.routes.js")
script(src="member-dashboard/member-dashboard.controller.js")
script(src="filters/local-time.filter.js")
script(src="account/validateRegister.directive.js")
script(src="account/validateLogin.directive.js")
script(src="account/account.routes.js")
script(src="topcoder.routes.js")
script(src="topcoder.interceptors.js")
script(src="topcoder.controller.js")
script(src="topcoder.constants.js")
//- endinject

// inject:templates.js
3 changes: 0 additions & 3 deletions gulp.config.js
Original file line number Diff line number Diff line change
@@ -31,9 +31,6 @@ module.exports = function() {
indexHtml: temp + 'index.html',
jade: app + '**/*.jade',
js: [
app + 'topcoder.module.js',
app + 'topcoder.*.js',
app + '**/*.module.js',
app + '**/*.js',
'!' + app + '**/*.spec.js'
],
5 changes: 4 additions & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
@@ -134,7 +134,10 @@ gulp.task('wiredep', ['jade'], function() {
return gulp
.src(config.index)
.pipe(wiredep(options))
.pipe($.inject(gulp.src(config.js, {read: false}), {relative: true}))
.pipe($.inject(
gulp.src(config.js)
.pipe($.angularFilesort()),
{relative: true}))
.pipe($.inject(gulp.src(config.nonBowerScripts, {read: false}), {
starttag: '//- inject:nonBowerScripts',
endtag: '//- endinject',
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@
"connect-history-api-fallback": "^1.1.0",
"del": "^1.2.0",
"gulp": "^3.9.0",
"gulp-angular-filesort": "^1.1.1",
"gulp-angular-templatecache": "^1.6.0",
"gulp-autoprefixer": "^2.3.1",
"gulp-awspublish": "^2.0.2",