Skip to content

Commit

Permalink
Merge pull request #390 from vladimir-kotikov/node-debug2-v3
Browse files Browse the repository at this point in the history
Migrate to "node2" debug engine
  • Loading branch information
MSLaguana authored Feb 9, 2017
2 parents dec006c + 553b717 commit dd977f5
Show file tree
Hide file tree
Showing 17 changed files with 809 additions and 947 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ os:
- osx

env:
- NODE_VERSION="5.11"
- NODE_VERSION="6.9.5"

before_install:
# nvm is not yet supported on osx, manually install
Expand Down
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
},
{
"name": "Run mocha",
"type": "node",
"type": "node2",
"program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
"stopOnEntry": false,
// Command line arguments passed to the program.
Expand Down
4 changes: 1 addition & 3 deletions SampleApplication/.vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"type": "reactnative",
"request": "launch",
"platform": "android",
"internalDebuggerPort": 9090,
"sourceMaps": true,
"outDir": "${workspaceRoot}/.vscode/.react"
},
Expand All @@ -18,9 +17,8 @@
"request": "launch",
"platform": "ios",
"target": "iPhone 5s",
"internalDebuggerPort": 9090,
"sourceMaps": true,
"outDir": "${workspaceRoot}/.vscode/.react"
}
]
}
}
3 changes: 2 additions & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ gulp.task('build', ["check-imports", "check-copyright"], function (callback) {
.pipe(sourcemaps.write('.', {
includeContent: false,
sourceRoot: function (file) {
return path.relative(path.dirname(file.path), __dirname + '/src');
return path.relative(path.dirname(path.dirname(file.path)), __dirname + '/src');
}
}))
.pipe(gulp.dest(outPath));
Expand Down Expand Up @@ -114,6 +114,7 @@ gulp.task('check-copyright', function (cb) {
"**/*.js",
"!**/*.d.ts",
"!node_modules/**",
"!out/test/**/*.js",
"!SampleApplication/**",
"!src/test/resources/sampleReactNative022Project/**/*.js",
])
Expand Down
Loading

0 comments on commit dd977f5

Please sign in to comment.