diff --git a/.gitignore b/.gitignore index 3ac848d7..056dc49a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,6 @@ -src -node_modules +build coverage +node_modules npm-debug.log .DS_Store .vscode -src -definitions diff --git a/bin/run-test.sh b/bin/run-test.sh index 74e1ce9d..35d3eec6 100755 --- a/bin/run-test.sh +++ b/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 diff --git a/google-cloud-debug-agent-2.1.1.tgz b/google-cloud-debug-agent-2.1.1.tgz new file mode 100644 index 00000000..6662be24 Binary files /dev/null and b/google-cloud-debug-agent-2.1.1.tgz differ diff --git a/gulpfile.js b/gulpfile.js index 46cd05d3..95d05ad0 100644 --- a/gulpfile.js +++ b/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`)) ]); diff --git a/package.json b/package.json index be57205c..de407a55 100644 --- a/package.json +++ b/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" + ] } diff --git a/src.ts/agent/debuglet.ts b/src.ts/agent/debuglet.ts index 762b8281..d1e4778b 100644 --- a/src.ts/agent/debuglet.ts +++ b/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'; diff --git a/src.ts/debug.ts b/src.ts/debug.ts index f5b83888..1df57974 100644 --- a/src.ts/debug.ts +++ b/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 diff --git a/src.ts/debuggee.ts b/src.ts/debuggee.ts index 19a51a81..6925ee6e 100644 --- a/src.ts/debuggee.ts +++ b/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'; diff --git a/system-test/test-controller.js b/system-test/test-controller.js index 0ffd1cb7..ccd869d5 100644 --- a/system-test/test-controller.js +++ b/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() { diff --git a/system-test/test-e2e.js b/system-test/test-e2e.js index 81e353ee..4a333df8 100644 --- a/system-test/test-e2e.js +++ b/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; diff --git a/test/misc/bench.js b/test/misc/bench.js index 59f4bbda..ed8ffda4 100644 --- a/test/misc/bench.js +++ b/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'); diff --git a/test/misc/test-leak.js b/test/misc/test-leak.js index e596ad8b..7e4b8bba 100644 --- a/test/misc/test-leak.js +++ b/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'); diff --git a/test/test-controller.js b/test/test-controller.js index 59e7b8ff..6c485259 100644 --- a/test/test-controller.js +++ b/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 }; diff --git a/test/test-debug-assert.js b/test/test-debug-assert.js index 2438b8ba..d18cd588 100644 --- a/test/test-debug-assert.js +++ b/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(() => { diff --git a/test/test-debuggee.js b/test/test-debuggee.js index 46b3a861..6bac4d17 100644 --- a/test/test-debuggee.js +++ b/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() { diff --git a/test/test-debuglet.js b/test/test-debuglet.js index 8a4a8ef9..6c04d35f 100644 --- a/test/test-debuglet.js +++ b/test/test-debuglet.js @@ -22,9 +22,9 @@ proxyquire('gcp-metadata', { var _ = require('lodash'); var assert = require('assert'); -var DEFAULT_CONFIG = require('../src/agent/config.js').default; +var DEFAULT_CONFIG = require('../build/src/agent/config.js').default; DEFAULT_CONFIG.allowExpressions = true; -var Debuglet = require('../src/agent/debuglet.js').Debuglet; +var Debuglet = require('../build/src/agent/debuglet.js').Debuglet; var extend = require('extend'); var DEBUGGEE_ID = 'bar'; @@ -88,7 +88,7 @@ describe('Debuglet', function() { it('should not start when projectId is not available', function(done) { this.timeout(8000); - var debug = require('../src/debug.js').Debug(); + var debug = require('../build/src/debug.js').Debug(); var debuglet = new Debuglet(debug, defaultConfig); debuglet.once('initError', function(err) { @@ -102,7 +102,7 @@ describe('Debuglet', function() { it('should not crash without project num', function(done) { this.timeout(8000); - var debug = require('../src/debug.js').Debug(); + var debug = require('../build/src/debug.js').Debug(); var debuglet = new Debuglet(debug, defaultConfig); debuglet.once('started', function() { assert.fail(); }); @@ -114,7 +114,7 @@ describe('Debuglet', function() { it('should use config.projectId', function(done) { var projectId = '11020304f2934-a'; - var debug = require('../src/debug.js').Debug( + var debug = require('../build/src/debug.js').Debug( {projectId: projectId, credentials: fakeCredentials}); var debuglet = new Debuglet(debug, defaultConfig); @@ -141,7 +141,7 @@ describe('Debuglet', function() { it('should use GCLOUD_PROJECT in lieu of config.projectId', function( done) { process.env.GCLOUD_PROJECT = '11020304f2934-b'; - var debug = require('../src/debug.js').Debug({credentials: fakeCredentials}); + var debug = require('../build/src/debug.js').Debug({credentials: fakeCredentials}); var debuglet = new Debuglet(debug, defaultConfig); var scope = nock(API) @@ -162,7 +162,7 @@ describe('Debuglet', function() { it('should use options.projectId in preference to the environment variable', function(done) { process.env.GCLOUD_PROJECT = 'should-not-be-used'; - var debug = require('../src/debug.js').Debug({ + var debug = require('../build/src/debug.js').Debug({ projectId: 'project-via-options', credentials: fakeCredentials }); @@ -188,7 +188,7 @@ describe('Debuglet', function() { it('should respect GCLOUD_DEBUG_LOGLEVEL', function(done) { process.env.GCLOUD_PROJECT = '11020304f2934'; process.env.GCLOUD_DEBUG_LOGLEVEL = 3; - var debug = require('../src/debug.js').Debug({credentials: fakeCredentials}); + var debug = require('../build/src/debug.js').Debug({credentials: fakeCredentials}); var debuglet = new Debuglet(debug, defaultConfig); var scope = nock(API) @@ -222,7 +222,7 @@ describe('Debuglet', function() { it('should respect GAE_SERVICE and GAE_VERSION env. vars.', function() { process.env.GAE_SERVICE = 'fake-gae-service'; process.env.GAE_VERSION = 'fake-gae-version'; - var debug = require('../src/debug.js').Debug(); + var debug = require('../build/src/debug.js').Debug(); var debuglet = new Debuglet(debug, defaultConfig); assert.ok(debuglet.config_); assert.ok(debuglet.config_.serviceContext); @@ -236,7 +236,7 @@ describe('Debuglet', function() { function() { process.env.GAE_MODULE_NAME = 'fake-gae-service'; process.env.GAE_MODULE_VERSION = 'fake-gae-version'; - var debug = require('../src/debug.js').Debug(); + var debug = require('../build/src/debug.js').Debug(); var debuglet = new Debuglet(debug, defaultConfig); assert.ok(debuglet.config_); assert.ok(debuglet.config_.serviceContext); @@ -249,7 +249,7 @@ describe('Debuglet', function() { it('should respect FUNCTION_NAME env. var.', function() { process.env.FUNCTION_NAME = 'fake-fn-name'; - var debug = require('../src/debug.js').Debug(); + var debug = require('../build/src/debug.js').Debug(); var debuglet = new Debuglet(debug, defaultConfig); assert.ok(debuglet.config_); assert.ok(debuglet.config_.serviceContext); @@ -264,7 +264,7 @@ describe('Debuglet', function() { process.env.GAE_MODULE_VERSION = 'fake-gae-module-version'; process.env.GAE_SERVICE = 'fake-gae-service'; process.env.GAE_VERSION = 'fake-gae-version'; - var debug = require('../src/debug.js').Debug(); + var debug = require('../build/src/debug.js').Debug(); var debuglet = new Debuglet(debug, defaultConfig); assert.ok(debuglet.config_); assert.ok(debuglet.config_.serviceContext); @@ -277,7 +277,7 @@ describe('Debuglet', function() { it('should respect GAE_MINOR_VERSION env. var. when available', function() { process.env.GAE_MINOR_VERSION = 'some minor version'; - var debug = require('../src/debug.js').Debug(); + var debug = require('../build/src/debug.js').Debug(); var debuglet = new Debuglet(debug, defaultConfig); assert.ok(debuglet.config_); assert.ok(debuglet.config_.serviceContext); @@ -288,7 +288,7 @@ describe('Debuglet', function() { it('should conjure a fake minor version when running on flex', function() { process.env.GAE_SERVICE = 'fake-gae-service'; - var debug = require('../src/debug.js').Debug(); + var debug = require('../build/src/debug.js').Debug(); var debuglet = new Debuglet(debug, defaultConfig); assert.ok(debuglet.config_); assert.ok(debuglet.config_.serviceContext); @@ -297,7 +297,7 @@ describe('Debuglet', function() { it('should not have minorVersion unless enviroment provides it', function() { - var debug = require('../src/debug.js').Debug(); + var debug = require('../build/src/debug.js').Debug(); var debuglet = new Debuglet(debug, defaultConfig); assert.ok(debuglet.config_); assert.ok(debuglet.config_.serviceContext); @@ -307,7 +307,7 @@ describe('Debuglet', function() { it('should not provide minorversion upon registration on non flex', function(done) { - var debug = require('../src/debug.js').Debug( + var debug = require('../build/src/debug.js').Debug( {projectId: 'fake-project', credentials: fakeCredentials}); var debuglet = new Debuglet(debug, defaultConfig); @@ -329,7 +329,7 @@ describe('Debuglet', function() { it('should provide minorversion upon registration if on flex', function( done) { process.env.GAE_SERVICE = 'fake-service'; - var debug = require('../src/debug.js').Debug( + var debug = require('../build/src/debug.js').Debug( {projectId: 'fake-project', credentials: fakeCredentials}); var debuglet = new Debuglet(debug, defaultConfig); @@ -353,7 +353,7 @@ describe('Debuglet', function() { it('should retry on failed registration', function(done) { this.timeout(10000); - var debug = require('../src/debug.js').Debug( + var debug = require('../build/src/debug.js').Debug( {projectId: '11020304f2934', credentials: fakeCredentials}); var debuglet = new Debuglet(debug, defaultConfig); @@ -376,7 +376,7 @@ describe('Debuglet', function() { }); it('should error if a package.json doesn\'t exist', function(done) { - var debug = require('../src/debug.js').Debug( + var debug = require('../build/src/debug.js').Debug( {projectId: 'fake-project', credentials: fakeCredentials}); var config = extend({}, defaultConfig, {workingDirectory: __dirname, forceNewAgent_: true}); @@ -391,7 +391,7 @@ describe('Debuglet', function() { }); it('should register successfully otherwise', function(done) { - var debug = require('../src/debug.js').Debug( + var debug = require('../build/src/debug.js').Debug( {projectId: 'fake-project', credentials: fakeCredentials}); var debuglet = new Debuglet(debug, defaultConfig); @@ -412,7 +412,7 @@ describe('Debuglet', function() { it('should pass source context to api if present', function(done) { - var debug = require('../src/debug.js').Debug( + var debug = require('../build/src/debug.js').Debug( {projectId: 'fake-project', credentials: fakeCredentials}); var old = Debuglet.prototype.getSourceContext_; Debuglet.prototype.getSourceContext_ = function(cb) { @@ -441,7 +441,7 @@ describe('Debuglet', function() { it('should de-activate when the server responds with isDisabled', function(done) { this.timeout(4000); - var debug = require('../src/debug.js').Debug( + var debug = require('../build/src/debug.js').Debug( {projectId: 'fake-project', credentials: fakeCredentials}); var debuglet = new Debuglet(debug, defaultConfig); @@ -462,7 +462,7 @@ describe('Debuglet', function() { it('should retry after a isDisabled request', function(done) { this.timeout(4000); - var debug = require('../src/debug.js').Debug( + var debug = require('../build/src/debug.js').Debug( {projectId: 'fake-project', credentials: fakeCredentials}); var debuglet = new Debuglet(debug, defaultConfig); @@ -491,7 +491,7 @@ describe('Debuglet', function() { }); it('should re-register when registration expires', function(done) { - var debug = require('../src/debug.js').Debug( + var debug = require('../build/src/debug.js').Debug( {projectId: 'fake-project', credentials: fakeCredentials}); var debuglet = new Debuglet(debug, defaultConfig); @@ -518,7 +518,7 @@ describe('Debuglet', function() { it('should fetch and add breakpoints', function(done) { this.timeout(2000); - var debug = require('../src/debug.js').Debug( + var debug = require('../build/src/debug.js').Debug( {projectId: 'fake-project', credentials: fakeCredentials}); var debuglet = new Debuglet(debug, defaultConfig); @@ -544,7 +544,7 @@ describe('Debuglet', function() { it('should reject breakpoints with conditions when allowExpressions=false', function(done) { this.timeout(2000); - var debug = require('../src/debug.js').Debug( + var debug = require('../build/src/debug.js').Debug( {projectId: 'fake-project', credentials: fakeCredentials}); var debuglet = new Debuglet(debug, defaultConfig); debuglet.config_.allowExpressions = false; @@ -582,7 +582,7 @@ describe('Debuglet', function() { it('should reject breakpoints with expressions when allowExpressions=false', function(done) { this.timeout(2000); - var debug = require('../src/debug.js').Debug( + var debug = require('../build/src/debug.js').Debug( {projectId: 'fake-project', credentials: fakeCredentials}); var debuglet = new Debuglet(debug, defaultConfig); debuglet.config_.allowExpressions = false; @@ -620,7 +620,7 @@ describe('Debuglet', function() { it('should re-fetch breakpoints on error', function(done) { this.timeout(6000); - var debug = require('../src/debug.js').Debug( + var debug = require('../build/src/debug.js').Debug( {projectId: 'fake-project', credentials: fakeCredentials}); var debuglet = new Debuglet(debug, defaultConfig); @@ -659,7 +659,7 @@ describe('Debuglet', function() { }); it('should expire stale breakpoints', function(done) { - var debug = require('../src/debug.js').Debug( + var debug = require('../build/src/debug.js').Debug( {projectId: 'fake-project', credentials: fakeCredentials}); var config = extend({}, defaultConfig, {breakpointExpirationSec: 1, forceNewAgent_: true}); @@ -704,7 +704,7 @@ describe('Debuglet', function() { // the breakpoint listed as active. It validates that the breakpoint // is only expired with the server once. it('should not update expired breakpoints', function(done) { - var debug = require('../src/debug.js').Debug( + var debug = require('../build/src/debug.js').Debug( {projectId: 'fake-project', credentials: fakeCredentials}); var config = extend({}, defaultConfig, { breakpointExpirationSec: 1, diff --git a/test/test-duplicate-expressions.js b/test/test-duplicate-expressions.js index b74d63f1..59eb805f 100644 --- a/test/test-duplicate-expressions.js +++ b/test/test-duplicate-expressions.js @@ -28,11 +28,11 @@ var breakpointInFoo = { var assert = require('assert'); var extend = require('extend'); -var v8debugapi = require('../src/agent/v8debugapi.js'); +var v8debugapi = require('../build/src/agent/v8debugapi.js'); var common = require('@google-cloud/common'); -var defaultConfig = require('../src/agent/config.js').default; -var SourceMapper = require('../src/agent/sourcemapper.js'); -var scanner = require('../src/agent/scanner.js'); +var defaultConfig = require('../build/src/agent/config.js').default; +var SourceMapper = require('../build/src/agent/sourcemapper.js'); +var scanner = require('../build/src/agent/scanner.js'); function stateIsClean(api) { assert.equal(api.numBreakpoints_(), 0, diff --git a/test/test-duplicate-nested-expressions.js b/test/test-duplicate-nested-expressions.js index 6213630b..884db0ad 100644 --- a/test/test-duplicate-nested-expressions.js +++ b/test/test-duplicate-nested-expressions.js @@ -26,11 +26,11 @@ var assert = require('assert'); var extend = require('extend'); -var v8debugapi = require('../src/agent/v8debugapi.js'); +var v8debugapi = require('../build/src/agent/v8debugapi.js'); var common = require('@google-cloud/common'); -var defaultConfig = require('../src/agent/config.js').default; -var SourceMapper = require('../src/agent/sourcemapper.js'); -var scanner = require('../src/agent/scanner.js'); +var defaultConfig = require('../build/src/agent/config.js').default; +var SourceMapper = require('../build/src/agent/sourcemapper.js'); +var scanner = require('../build/src/agent/scanner.js'); function stateIsClean(api) { assert.equal(api.numBreakpoints_(), 0, diff --git a/test/test-fat-arrow.js b/test/test-fat-arrow.js index 6dd12190..723f9f5a 100644 --- a/test/test-fat-arrow.js +++ b/test/test-fat-arrow.js @@ -17,11 +17,11 @@ var assert = require('assert'); var extend = require('extend'); -var v8debugapi = require('../src/agent/v8debugapi.js'); +var v8debugapi = require('../build/src/agent/v8debugapi.js'); var common = require('@google-cloud/common'); -var defaultConfig = require('../src/agent/config.js').default; -var SourceMapper = require('../src/agent/sourcemapper.js'); -var scanner = require('../src/agent/scanner.js'); +var defaultConfig = require('../build/src/agent/config.js').default; +var SourceMapper = require('../build/src/agent/sourcemapper.js'); +var scanner = require('../build/src/agent/scanner.js'); process.env.GCLOUD_PROJECT = 0; diff --git a/test/test-max-data-size.js b/test/test-max-data-size.js index 4e3989e0..874b52ed 100644 --- a/test/test-max-data-size.js +++ b/test/test-max-data-size.js @@ -24,10 +24,10 @@ process.env.GCLOUD_DIAGNOSTICS_CONFIG = 'test/fixtures/test-config.js'; var assert = require('assert'); var extend = require('extend'); var common = require('@google-cloud/common'); -var v8debugapi = require('../src/agent/v8debugapi.js'); -var SourceMapper = require('../src/agent/sourcemapper.js'); -var scanner = require('../src/agent/scanner.js'); -var defaultConfig = require('../src/agent/config.js').default; +var v8debugapi = require('../build/src/agent/v8debugapi.js'); +var SourceMapper = require('../build/src/agent/sourcemapper.js'); +var scanner = require('../build/src/agent/scanner.js'); +var defaultConfig = require('../build/src/agent/config.js').default; var api; var breakpointInFoo = { diff --git a/test/test-options-credentials.js b/test/test-options-credentials.js index 5b4f76df..266519a2 100644 --- a/test/test-options-credentials.js +++ b/test/test-options-credentials.js @@ -20,8 +20,8 @@ var assert = require('assert'); var nock = require('nock'); var nocks = require('./nocks.js'); var extend = require('extend'); -var config = require('../src/agent/config.js').default; -var Debuglet = require('../src/agent/debuglet.js').Debuglet; +var config = require('../build/src/agent/config.js').default; +var Debuglet = require('../build/src/agent/debuglet.js').Debuglet; var envProject = process.env.GCLOUD_PROJECT; @@ -48,7 +48,7 @@ describe('test-options-credentials', function() { projectId: 'fake-project', keyFilename: path.join(__dirname, 'fixtures', 'gcloud-credentials.json') }); - var debug = require('../src/debug.js').Debug(options); + var debug = require('../build/src/debug.js').Debug(options); var scope = nocks.oauth2(function(body) { assert.equal(body.client_id, credentials.client_id); assert.equal(body.client_secret, credentials.client_secret); @@ -70,7 +70,7 @@ describe('test-options-credentials', function() { projectId: 'fake-project', credentials: require('./fixtures/gcloud-credentials.json') }); - var debug = require('../src/debug.js').Debug(options); + var debug = require('../build/src/debug.js').Debug(options); var scope = nocks.oauth2(function(body) { assert.equal(body.client_id, options.credentials.client_id); assert.equal(body.client_secret, options.credentials.client_secret); @@ -100,7 +100,7 @@ describe('test-options-credentials', function() { keyFilename: path.join('test', 'fixtures', 'gcloud-credentials.json'), credentials: credentials }); - var debug = require('../src/debug.js').Debug(options); + var debug = require('../build/src/debug.js').Debug(options); var scope = nocks.oauth2(function(body) { assert.equal(body.client_id, credentials.client_id); assert.equal(body.client_secret, credentials.client_secret); diff --git a/test/test-scanner.js b/test/test-scanner.js index a1680050..fb10092f 100644 --- a/test/test-scanner.js +++ b/test/test-scanner.js @@ -24,7 +24,7 @@ var fixture = function(file) { return path.join(fixtureDir, file); }; -var scanner = require('../src/agent/scanner.js'); +var scanner = require('../build/src/agent/scanner.js'); describe('scanner', function() { diff --git a/test/test-sourcemapper.js b/test/test-sourcemapper.js index ed0db093..4ade99c2 100644 --- a/test/test-sourcemapper.js +++ b/test/test-sourcemapper.js @@ -19,7 +19,7 @@ var assert = require('assert'); var path = require('path'); -var SourceMapper = require('../src/agent/sourcemapper.js'); +var SourceMapper = require('../build/src/agent/sourcemapper.js'); /** * @param {string} tool The name of the tool that was used to generate the diff --git a/test/test-state.js b/test/test-state.js index 69c3cce9..4fbd562e 100644 --- a/test/test-state.js +++ b/test/test-state.js @@ -16,7 +16,7 @@ 'use strict'; const assert = require('assert'); -const state = require('../src/agent/state.js'); +const state = require('../build/src/agent/state.js'); describe('state', () => { // Testing of state.js is driven through test-v8debugapi.js. There are diff --git a/test/test-this-context.js b/test/test-this-context.js index ab4aafc0..03e90675 100644 --- a/test/test-this-context.js +++ b/test/test-this-context.js @@ -26,11 +26,11 @@ var assert = require('assert'); var extend = require('extend'); -var v8debugapi = require('../src/agent/v8debugapi.js'); +var v8debugapi = require('../build/src/agent/v8debugapi.js'); var common = require('@google-cloud/common'); -var defaultConfig = require('../src/agent/config.js').default; -var SourceMapper = require('../src/agent/sourcemapper.js'); -var scanner = require('../src/agent/scanner.js'); +var defaultConfig = require('../build/src/agent/config.js').default; +var SourceMapper = require('../build/src/agent/sourcemapper.js'); +var scanner = require('../build/src/agent/scanner.js'); function stateIsClean(api) { assert.equal(api.numBreakpoints_(), 0, diff --git a/test/test-try-catch.js b/test/test-try-catch.js index 20c1c7ef..00cd09ac 100644 --- a/test/test-try-catch.js +++ b/test/test-try-catch.js @@ -26,11 +26,11 @@ var assert = require('assert'); var extend = require('extend'); -var v8debugapi = require('../src/agent/v8debugapi.js'); +var v8debugapi = require('../build/src/agent/v8debugapi.js'); var common = require('@google-cloud/common'); -var defaultConfig = require('../src/agent/config.js').default; -var SourceMapper = require('../src/agent/sourcemapper.js'); -var scanner = require('../src/agent/scanner.js'); +var defaultConfig = require('../build/src/agent/config.js').default; +var SourceMapper = require('../build/src/agent/sourcemapper.js'); +var scanner = require('../build/src/agent/scanner.js'); function stateIsClean(api) { assert.equal(api.numBreakpoints_(), 0, diff --git a/test/test-v8debugapi.js b/test/test-v8debugapi.js index 31a412be..d53f0de1 100644 --- a/test/test-v8debugapi.js +++ b/test/test-v8debugapi.js @@ -33,12 +33,12 @@ var MAX_INT = 2147483647; // Max signed int32. var assert = require('assert'); var extend = require('extend'); -var v8debugapi = require('../src/agent/v8debugapi.js'); +var v8debugapi = require('../build/src/agent/v8debugapi.js'); var common = require('@google-cloud/common'); -var defaultConfig = require('../src/agent/config.js').default; -var StatusMessage = require('../src/status-message.js').StatusMessage; -var scanner = require('../src/agent/scanner.js'); -var SourceMapper = require('../src/agent/sourcemapper.js'); +var defaultConfig = require('../build/src/agent/config.js').default; +var StatusMessage = require('../build/src/status-message.js').StatusMessage; +var scanner = require('../build/src/agent/scanner.js'); +var SourceMapper = require('../build/src/agent/sourcemapper.js'); var path = require('path'); var semver = require('semver');