grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:grpc/grpc-node into node45

This commit is contained in:
Nicolas "Pixel" Noble 2017-09-16 02:30:16 +02:00
parent 574a2c7fda 1809154457
commit 727f5419bb
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/grpc-js-core/gulpfile.js
View File

@ -64,9 +64,9 @@ function makeCompileFn(globs) {
.on('error', onError); .on('error', onError);
const dts = data.dts const dts = data.dts
const js = data.js const js = data.js
const jsmap = js.pipe(sourcemaps.write(jsCoreDir, { const jsmap = js.pipe(sourcemaps.write('.', {
includeContent: false, includeContent: false,
sourceRoot: path.resolve(jsCoreDir, '..') sourceRoot: '..'
})); }));
const copy = gulp.src(copyGlob, { base: jsCoreDir }); const copy = gulp.src(copyGlob, { base: jsCoreDir });
return merge2([ return merge2([
@ -147,9 +147,11 @@ gulp.task('js.core.test.single', 'After dep tasks, runs individual files specifi
// util.env contains CLI arguments for the gulp task. // util.env contains CLI arguments for the gulp task.
// Determine the path to the transpiled version of this TS file. // Determine the path to the transpiled version of this TS file.
const getTranspiledPath = (file) => { const getTranspiledPath = (file) => {
const dir = path.dirname(path.relative('.', file)); const dir = path.dirname(path.relative(jsCoreDir, file));
const basename = path.basename(file, '.ts'); const basename = path.basename(file, '.ts');
return `${outDir}/${dir}/${basename}.js`; const result = `${outDir}/${dir}/${basename}.js`;
console.log(result);
return result;
}; };
// Construct an instance of Mocha's runner API and feed it the path to the // Construct an instance of Mocha's runner API and feed it the path to the
// transpiled source. // transpiled source.

10
packages/grpc-js-core/package.json
View File

@ -15,6 +15,7 @@
"types": "src/index.ts", "types": "src/index.ts",
"license": "Apache-2.0", "license": "Apache-2.0",
"devDependencies": { "devDependencies": {
"@types/lodash": "^4.14.73",
"@types/mocha": "^2.2.42", "@types/mocha": "^2.2.42",
"@types/node": "^8.0.25", "@types/node": "^8.0.25",
"clang-format": "^1.0.53", "clang-format": "^1.0.53",
@ -29,13 +30,16 @@
"scripts": { "scripts": {
"build": "npm run compile", "build": "npm run compile",
"clean": "gulp clean", "clean": "gulp clean",
"compile": "gulp compile", "compile": "gulp js.core.compile",
"format": "clang-format -i -style=\"{Language: JavaScript, BasedOnStyle: Google, ColumnLimit: 80}\" src/*.ts test/*.ts", "format": "clang-format -i -style=\"{Language: JavaScript, BasedOnStyle: Google, ColumnLimit: 80}\" src/*.ts test/*.ts",
"lint": "tslint -c node_modules/google-ts-style/tslint.json -p . -t codeFrame --type-check", "lint": "tslint -c node_modules/google-ts-style/tslint.json -p . -t codeFrame --type-check",
"prepare": "npm run build",
"test": "gulp test" "test": "gulp test"
}, },
"dependencies": { "dependencies": {
"@types/lodash": "^4.14.73",
"lodash": "^4.17.4" "lodash": "^4.17.4"
} },
"files": [
"build/src/*.js"
]
} }