[web] Restructure and fix builds.

web/apps/gulp-common.js

 /*
   Copyright 2016 The LUCI Authors. All rights reserved.
   Use of this source code is governed under the Apache License, Version 2.0
   that can be found in the LICENSE file.
 
   This document has been largely derived from the Polymer Starter Kit:
   https://github.com/PolymerElements/polymer-starter-kit
 */
 
 'use strict';
@@ skipping 91 matching lines @@
   });
 
   // Build production files, the default task
   gulp.task('lint', ['tslint']);
 
   // Build production files, the default task
   gulp.task('presubmit', ['lint', 'check-format', 'check-ts']);
 };
 
 // Project-specific tasks.
-exports.setup = function(gulp, config) {
-  var APP = path.basename(config.dir);
+exports.setup = function(gulp, appDir, config) {
+  var APP = path.basename(appDir);
   var DIST = path.join(exports.out, 'dist', APP);
 
+  console.log("APP:", APP)
   var layout = {
     app: APP,
+    dir: process.cwd(),
+    web: '../..',
+    inc: './inc',
     distPath: DIST,
 
     // NOTE: Takes vararg via "arguments".
     dist: function() {
       return extendPath(DIST).apply(null, arguments);
     },
   };
 
   var extendPath = function() {
     var base = [].slice.call(arguments);
@@ skipping 25 matching lines @@
       .pipe($.imagemin({
         progressive: true,
         interlaced: true
       }))
       .pipe(gulp.dest(dest))
       .pipe($.size({title: 'images'}));
   };
 
   var optimizeHtmlTask = function(src, dest) {
     var assets = $.useref.assets({
-      searchPath: ['.tmp', config.dir]
+      searchPath: ['.tmp', '.']
     });
 
     return gulp.src(src)
       .pipe(assets)
       // Concatenate and minify JavaScript
       .pipe($.if('*.js', $.uglify({
         preserveComments: 'some'
       })))
       // Concatenate and minify styles
       // In case you are still using useref build blocks
       .pipe($.if('*.css', cleanCSS()))
       .pipe(assets.restore())
       .pipe($.useref())
       // Minify any HTML
       .pipe($.if('*.html', htmlmin({
         remoteAttributeQuotes: false,
         remoteEmptyAttributes: false,
         remoteRedundantAttributes: false,
       })))
       // Output files
       .pipe(gulp.dest(dest))
       .pipe($.size({
         title: 'html'
       }));
   };
 
   // Transpiles "inc/*/*.ts" and deposits the result alongside their source
   // "ts" files.
   gulp.task('ts', function() {
-    // Transpile each TypeScript module independently into JavaScript.
-    var tsconfigPath = path.join(exports.incDir, 'tsconfig.json');
-
     // Compile the files in "scripts-ts/*.ts" into a single out file.
-    var scriptsTs = path.join(config.dir, 'scripts-ts');
-    var tsProj = ts.createProject(tsconfigPath, {
+    var appTsDir = path.join(layout.inc, 'apps', layout.app);
+    var tsProj = ts.createProject(path.join(layout.inc, 'tsconfig.json'), {
       typeRoots: [path.join(exports.base, 'node_modules', '@types')],
-      outFile: 'main.js',
+      outFile: path.join(appTsDir, 'main.js'),
     });
 
-    return gulp.src('*.ts', {cwd: scriptsTs, exclude: ['*_test.ts']})
+    return gulp.src(path.join(layout.inc, 'apps', layout.app, '*.ts'), {
+          exclude: ['*_test.ts'],
+        })
         .pipe(sourcemaps.init())
-            .pipe(tsProj())
-            .pipe(sourcemaps.write('.'))
-            .pipe(gulp.dest(scriptsTs));
+        .pipe(tsProj())
+        .pipe(sourcemaps.write('.'))
+        .pipe(gulp.dest(layout.inc))
   });
 
   // Compile and automatically prefix stylesheets
   gulp.task('styles', function() {
     return styleTask('styles', ['**/*.css']);
   });
 
   gulp.task('elements', function() {
     return styleTask('elements', ['**/*.css']);
   });
@@ skipping 69 matching lines @@
   // Clean output directory
   gulp.task('clean', function() {
     var dist = layout.dist();
     var remove = ['.tmp', path.join(dist, '*')];
     var keep = '!'+path.join(dist, '.keep');
     return del(remove.concat(keep), {force: true, dot:true});
   });
 
   // Watch files for changes & reload
   gulp.task('serve', ['default'], function() {
+    console.log("CURRENT WORKING DIRECTORY MAYBE CHANGE TO APP DIR:", process.cwd());

[Ryan Tseng, 2017/07/28 13:48:40]

???

[dnj, 2017/07/28 13:50:36]

oops.

+    //process.chdir(layout.dir);

[Ryan Tseng, 2017/07/28 13:48:40]

This supposed to be here?

[dnj, 2017/07/28 13:50:36]

nope, thanks for catching.

+
     browserSync({
       port: 5000,
       ui: {
         port: 5080,
       },
       notify: false,
       logPrefix: 'PSK',
       snippetOptions: {
         rule: {
           match: '<span id="browser-sync-binding"></span>',
@@ skipping 54 matching lines @@
   });
 
   // Install common targets.
   exports.setup_common(gulp);
 };
 
 // Load custom tasks from the `tasks` directory
 try {
   require('require-dir')('tasks');
 } catch (err) {}