Build and packaging cleanups (#296)

* build and packaging cleanups
* run mocha with source map support
* fix require paths
* fix correct sourceRoot for sourcemaps

.gitignore

@@ -1,8 +1,6 @@
-src
-node_modules
+build
 coverage
+node_modules
 npm-debug.log
 .DS_Store
 .vscode
-src
-definitions

bin/run-test.sh

@@ -30,7 +30,7 @@ function run {
     C="$(npm bin)/istanbul cover --dir ./coverage/${counter}"
     ((counter++))
   fi
-  ($C "$(npm bin)/_mocha" -- $* --timeout 4000 --R spec) || exit 1
+  ($C "$(npm bin)/_mocha" -- $* --require source-map-support/register --timeout 4000 --R spec) || exit 1
 }
 
 # Run test/coverage

gulpfile.js

@@ -31,8 +31,8 @@ const format = require('gulp-clang-format');
 
 const tsconfigPath = path.join(__dirname, 'tsconfig.json');
 const tslintPath = path.join(__dirname, 'tslint.json');
-const outDir = '.';
-const sources = ['src.ts/**/*.ts', 'src.ts/**/*.js'];
+const outDir = 'build';
+const sources = ['src.ts/**/*.ts'];
 
 let exitOnError = true;
 function onError() {
@@ -62,7 +62,7 @@ gulp.task('test.check-lint', () => {
 });
 
 gulp.task('clean', () => {
-  return del(['src']);
+  return del(['build']);
 });
 
 gulp.task('compile', () => {
@@ -71,10 +71,10 @@ gulp.task('compile', () => {
                        .pipe(ts.createProject(tsconfigPath)())
                        .on('error', onError);
   return merge([
-    tsResult.dts.pipe(gulp.dest(`${outDir}/definitions`)),
+    tsResult.dts.pipe(gulp.dest(`${outDir}/types`)),
     tsResult.js
         .pipe(sourcemaps.write(
-            '.', {includeContent: false, sourceRoot: '../../src'}))
+            '.', {includeContent: false, sourceRoot: '../../src.ts'}))
         .pipe(gulp.dest(`${outDir}/src`)),
     tsResult.js.pipe(gulp.dest(`${outDir}/src`))
   ]);

package.json

@@ -3,7 +3,7 @@
   "version": "2.1.1",
   "author": "Google Inc.",
   "description": "Stackdriver Debug Agent for Node.js",
-  "main": "./src/index.js",
+  "main": "./build/src/index.js",
   "repository": "googlecloudplatform/cloud-debug-nodejs",
   "keywords": [
     "google",
@@ -71,5 +71,11 @@
     "coverage": "gulp && ./bin/run-test.sh -c",
     "bump": "gulp && ./bin/run-bump.sh",
     "closure": "gulp && ./node_modules/.bin/closure-npc"
-  }
+  },
+  "files":[
+    "CHANGELOG.md",
+    "LICENSE",
+    "README.md",
+    "build/src"
+  ]
 }

src.ts/agent/debuglet.ts

@@ -41,7 +41,7 @@ import * as scanner from './scanner';
 import * as SourceMapper from './sourcemapper';
 import * as v8debugapi from './v8debugapi';
 
-const pjson = require('../../package.json');
+const pjson = require('../../../package.json');
 
 import * as assert from 'assert';
 

src.ts/debug.ts

@@ -53,7 +53,7 @@ export class Debug extends common.Service {
       projectIdRequired: false,
       baseUrl: 'https://clouddebugger.googleapis.com/v2',
       scopes: ['https://www.googleapis.com/auth/cloud_debugger'],
-      packageJson: require('../package.json')
+      packageJson: require('../../package.json')
     };
 
     // TODO: Update Service to provide types

src.ts/debuggee.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-const pjson = require('../package.json');
+const pjson = require('../../package.json');
 import * as _ from 'lodash';
 import {StatusMessage} from './status-message';
 

system-test/test-controller.js

@@ -26,9 +26,9 @@ assert.ok(
     'Need to have GOOGLE_APPLICATION_CREDENTIALS defined to be able to run ' +
     'this test');
 
-var Controller = require('../src/controller.js').Controller;
-var Debuggee = require('../src/debuggee.js').Debuggee;
-var debug = require('../src/debug.js').Debug();
+var Controller = require('../build/src/controller.js').Controller;
+var Debuggee = require('../build/src/debuggee.js').Debuggee;
+var debug = require('../build/src/debug.js').Debug();
 
 
 describe('Controller', function() {

system-test/test-e2e.js

@@ -21,7 +21,7 @@ var _ = require('lodash'); // for _.find. Can't use ES6 yet.
 var cp = require('child_process');
 var semver = require('semver');
 var promisifyAll = require('@google-cloud/common').util.promisifyAll;
-var Debug = require('../src/debug.js').Debug;
+var Debug = require('../build/src/debug.js').Debug;
 var Debugger = require('../test/debugger.js');
 
 var CLUSTER_WORKERS = 3;

test/misc/bench.js

@@ -21,8 +21,8 @@
  */
 
 
-var v8debugapi = require('../src/v8debugapi.js');
-var Logger = require('../src/logger.js');
+var v8debugapi = require('../build/src/v8debugapi.js');
+var Logger = require('../build/src/logger.js');
 var config = require('../config.js').default;
 var assert = require('assert');
 var pretty = require('pretty-hrtime');

test/misc/test-leak.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var v8debugapi = require('../src/v8debugapi.js');
-var Logger = require('../src/logger.js');
+var v8debugapi = require('../build/src/v8debugapi.js');
+var Logger = require('../build/src/logger.js');
 var config = require('../config.js').default;
 var assert = require('assert');
 var util = require('util');

test/test-controller.js

@@ -18,13 +18,13 @@
 var assert = require('assert');
 var nock   = require('nock');
 var request = require('./auth-request.js');
-var Debuggee = require('../src/debuggee.js').Debuggee;
+var Debuggee = require('../build/src/debuggee.js').Debuggee;
 
 // the tests in this file rely on the GCLOUD_PROJECT environment variable
 // not being set
 delete process.env.GCLOUD_PROJECT;
 
-var Controller = require('../src/controller.js').Controller;
+var Controller = require('../build/src/controller.js').Controller;
 var fakeDebug = {
   request: request
 };

test/test-debug-assert.js

@@ -18,7 +18,7 @@
 const realAssert = require('assert');
 
 describe('debug-assert', () => {
-  const debugAssert = require('../src/agent/debug-assert.js').debugAssert;
+  const debugAssert = require('../build/src/agent/debug-assert.js').debugAssert;
 
   it('should fire assertions when enabled', () => {
     realAssert.throws(() => {

test/test-debuggee.js

@@ -16,7 +16,7 @@
 'use strict';
 
 var assert = require('assert');
-var Debuggee = require('../src/debuggee.js').Debuggee;
+var Debuggee = require('../build/src/debuggee.js').Debuggee;
 
 describe('Debuggee', function() {