Restore gulp build functionality to previous behavior

Broke up inject to between dev and build, both are initiated when optimize is run so as before, when dev updates, so does build Comment out ejs in index.ejs to prevent it from show up unexpectedly, does not impact dev build Update test specs.html
plateauandsp · Sep 28, 2016 · aa3c7a7 · aa3c7a7
1 parent c90d0fc
commit aa3c7a7
Show file tree

Hide file tree

Showing 4 changed files with 86 additions and 9 deletions.
diff --git a/client/index.ejs b/client/index.ejs
@@ -13,17 +13,17 @@
     [ng-cloak] {
       display: none;
     }
+
     [ng-cloak].splash {
       display: block !important;
     }
+
     .splash {
       display: none;
       background-color: #428bca;
     }
   </style>
 
-  <%- include styles.html %>
-
   <!-- build:css styles/lib.css -->
   <!-- bower:css -->
   <!-- endbower -->
@@ -33,6 +33,9 @@
   <!-- inject:css -->
   <!-- endinject -->
   <!-- endbuild -->
+
+  <!-- <%- include styles.html %> -->
+
 </head>
 <body ng-controller="AppController as vm"
       ng-keydown="vm.keyDown($event)"
@@ -45,7 +48,7 @@
 
 <ui-view></ui-view>
 
-<%- include javascripts.html %>
+<!-- <%- include javascripts.html %> -->
 
 <!-- build:js js/lib.js -->
 <!-- bower:js -->

diff --git a/gulp/config.js b/gulp/config.js
@@ -295,7 +295,7 @@ module.exports = (function() {
   };
 
   config.optimize = {
-    index: client + indexFile,
+    index: temp + indexFile,
     build: build,
     cssFilter: '**/*.css',
     appJsFilter: '**/app.js',
@@ -425,5 +425,68 @@ module.exports = (function() {
     root: './'
   };
 
+  // build configs
+  config.buildWiredep = {
+    index: client + indexFile,
+    build: temp,
+    options: wiredepOptions,
+    files: getClientJsFiles(true, false),
+    order: clientJsOrder
+  };
+
+  config.buildInject = {
+    index: temp + indexFile,
+    build: temp,
+    css: [
+      temp + 'styles/' + cssFile,
+      client + '/skin/**/*.css'
+    ]
+  };
+
+  config.buildSass = {
+    src: client + 'assets/sass/styles.sass',
+    build: temp + 'styles/',
+    output: cssFile,
+    options: {
+      // Only includes the styles if @imported
+      // Remember to then update exclude in wiredepOptions if using @import
+      loadPath: [
+        bower + 'bootstrap-sass-official/assets/stylesheets/',
+        bower + 'font-awesome/scss/',
+        bower + 'patternfly-sass/assets/stylesheets/',
+        // Hack so that font-awesome/variables can be found
+        client + 'assets/sass/'
+      ],
+      style: 'compact',
+      noCache: false,
+      compass: false,
+      bundleExec: true,
+      sourcemap: false,
+      precision: 8
+    },
+    autoprefixer: {
+      browsers: [
+        'last 2 versions',
+        '> 5%'
+      ],
+      cascade: true
+    }
+  };
+
+  config.buildTemplatecache = {
+    src: templateFiles,
+    build: temp,
+    output: 'templates.js',
+    minify: true, // Always minify the templates
+    minifyOptions: {
+      empty: true
+    },
+    templateOptions: {
+      module: 'app.core',
+      standalone: false,
+      root: 'app/'
+    }
+  };
+
   return config;
 })();
diff --git a/gulpfile.js b/gulpfile.js
@@ -35,6 +35,9 @@ gulp.task('clean-code', task('clean', {key: 'cleanCode'}));
 gulp.task('templatecache', task('templatecache'));
 gulp.task('sass', task('sass'));
 gulp.task('wiredep', task('wiredep'));
+gulp.task('buildTemplatecache', task('templatecache', {key: 'buildTemplatecache'}));
+gulp.task('buildSass', task('sass', {key: 'buildSass'}));
+gulp.task('buildWiredep', task('wiredep', {key: 'buildWiredep'}));
 gulp.task('fonts', task('fonts'));
 gulp.task('images', task('images'));
 gulp.task('skin-images', ['images'], task('images', {key: 'skinImages'}));
@@ -52,8 +55,9 @@ gulp.task('available-languages', task('available-languages'));
 /**
  * Build tasks
  */
-gulp.task('inject', ['wiredep', 'sass', 'templatecache'], task('inject'));
-gulp.task('optimize', ['inject'], task('optimize'));
+gulp.task('devInject', ['wiredep', 'sass', 'templatecache'], task('inject'));
+gulp.task('buildInject', ['buildWiredep', 'buildSass', 'buildTemplatecache'], task('inject',{key: 'buildInject'}));
+gulp.task('optimize', ['buildInject', 'devInject'], task('optimize'));
 gulp.task('build', ['optimize', 'images', 'imgs', 'skin-images', 'fonts', 'gettext-copy', 'console-copy', 'available-languages'], task('build'));
 gulp.task('build-specs', ['templatecache'], task('buildSpecs'));
 

diff --git a/tests/specs.html b/tests/specs.html
@@ -138,6 +138,7 @@ <h1><a href="specs.html">Spec Runner</a></h1>
   <script src="/client/app/components/ownership-service-modal/ownership-service-modal-service.factory.js"></script>
   <script src="/client/app/components/request-list/request-list.directive.js"></script>
   <script src="/client/app/components/retire-service-modal/retire-service-modal-service.factory.js"></script>
+  <script src="/client/app/components/rules/rules-list.directive.js"></script>
   <script src="/client/app/components/shopping-cart/shopping-cart.directive.js"></script>
   <script src="/client/app/components/ss-card/ss-card.directive.js"></script>
   <script src="/client/app/components/tagging/tagging.directive.js"></script>
@@ -150,6 +151,7 @@ <h1><a href="specs.html">Spec Runner</a></h1>
   <script src="/client/app/core/config.js"></script>
   <script src="/client/app/core/constants.js"></script>
   <script src="/client/app/filters/format-bytes.filter.js"></script>
+  <script src="/client/app/filters/substitute.js"></script>
   <script src="/client/app/resources/authentication-api.factory.js"></script>
   <script src="/client/app/resources/collections-api.factory.js"></script>
   <script src="/client/app/services/blueprints-state.service.js"></script>
@@ -168,11 +170,19 @@ <h1><a href="specs.html">Spec Runner</a></h1>
   <script src="/client/app/services/rbac.service.js"></script>
   <script src="/client/app/services/requests-state.service.js"></script>
   <script src="/client/app/services/rules-state.service.js"></script>
+  <script src="/client/app/services/server-info.service.js"></script>
   <script src="/client/app/services/services-state.service.js"></script>
   <script src="/client/app/services/session.service.js"></script>
   <script src="/client/app/services/shopping-cart.service.js"></script>
   <script src="/client/app/states/404/404.state.js"></script>
   <script src="/client/app/states/about-me/about-me.state.js"></script>
+  <script src="/client/app/states/administration/admin.state.js"></script>
+  <script src="/client/app/states/administration/profiles/details/details.state.js"></script>
+  <script src="/client/app/states/administration/profiles/editor/editor.state.js"></script>
+  <script src="/client/app/states/administration/profiles/editor/save-profile-modal-service.factory.js"></script>
+  <script src="/client/app/states/administration/profiles/profiles.state.js"></script>
+  <script src="/client/app/states/administration/rules/rules.state.js"></script>
+  <script src="/client/app/states/administration/rules/save-rule-modal-service.factory.js"></script>
   <script src="/client/app/states/dashboard/dashboard.state.js"></script>
   <script src="/client/app/states/designer/blueprints/blueprints.state.js"></script>
   <script src="/client/app/states/designer/blueprints/editor/canvasCtrl.js"></script>
@@ -182,9 +192,6 @@ <h1><a href="specs.html">Spec Runner</a></h1>
   <script src="/client/app/states/designer/blueprints/editor/save-blueprint-modal-service.factory.js"></script>
   <script src="/client/app/states/designer/blueprints/list/list.state.js"></script>
   <script src="/client/app/states/designer/designer.state.js"></script>
-  <script src="/client/app/states/designer/profiles/profiles.state.js"></script>
-  <script src="/client/app/states/designer/rules/rules.state.js"></script>
-  <script src="/client/app/states/designer/rules/save-rule-modal-service.factory.js"></script>
   <script src="/client/app/states/error/error.state.js"></script>
   <script src="/client/app/states/help/help.state.js"></script>
   <script src="/client/app/states/login/login.state.js"></script>