Skip to content

Commit 6b5ee5b

Browse files
committed
Adding babel and babel scripts
1 parent c5806d8 commit 6b5ee5b

File tree

5 files changed

+56
-12
lines changed

5 files changed

+56
-12
lines changed

.gitignore

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
/node_modules/
21
/build/
3-
/test/coverage/
4-
/test/repos/
5-
/test/test/
6-
/test/home/
7-
/src/
2+
/coverage/
3+
/dist/
84
/include/
95
/lib/enums.js
106
/lib/nodegit.js
11-
/coverage/
7+
/node_modules/
8+
/src/
9+
/test/coverage/
10+
/test/home/
11+
/test/repos/
12+
/test/test/
1213

1314
/generate/output
1415
/generate/**/*.json

.npmignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/build/
22
/example/
33
/examples/
4+
/lib/
45
/test/
56
/vendor/Release/
67

lifecycleScripts/install.js

+39
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ var fromRegistry;
1212
try {
1313
fs.statSync(path.join(__dirname, "..", "include"));
1414
fs.statSync(path.join(__dirname, "..", "src"));
15+
fs.statSync(path.join(__dirname, "..", "dist"));
1516
fromRegistry = true;
1617
}
1718
catch(e) {
@@ -63,7 +64,45 @@ function prepareAndBuild() {
6364
return prepareForBuild()
6465
.then(function() {
6566
return build();
67+
})
68+
.then(function() {
69+
return transpileJavascript();
70+
});
71+
}
72+
73+
function transpileJavascript() {
74+
var cmd = pathForTool("babel");
75+
var args = [
76+
"--presets",
77+
"es2015",
78+
"-d",
79+
"./dist",
80+
"./lib"
81+
];
82+
var opts = {
83+
cwd: ".",
84+
maxBuffer: Number.MAX_VALUE,
85+
env: process.env,
86+
stdio: "inherit"
87+
};
88+
var home = process.platform == "win32" ?
89+
process.env.USERPROFILE : process.env.HOME;
90+
91+
opts.env.HOME = path.join(home, ".nodegit-gyp");
92+
93+
return new Promise(function(resolve, reject) {
94+
var child = cp.spawn(cmd, args, opts);
95+
child.on("close", function(code) {
96+
console.log(code);
97+
if (code) {
98+
reject(code);
99+
process.exitCode = 13;
100+
}
101+
else {
102+
resolve();
103+
}
66104
});
105+
});
67106
}
68107

69108
function build() {

package.json

+7-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"email": "[email protected]"
2222
}
2323
],
24-
"main": "lib/nodegit.js",
24+
"main": "dist/nodegit.js",
2525
"repository": {
2626
"type": "git",
2727
"url": "git://github.com/nodegit/nodegit.git"
@@ -42,6 +42,8 @@
4242
"promisify-node": "~0.3.0"
4343
},
4444
"devDependencies": {
45+
"babel-cli": "^6.7.7",
46+
"babel-preset-es2015": "^6.6.0",
4547
"clean-for-publish": "~1.0.2",
4648
"combyne": "~0.8.1",
4749
"coveralls": "~2.11.4",
@@ -68,6 +70,7 @@
6870
"host": "https://nodegit.s3.amazonaws.com/nodegit/nodegit/"
6971
},
7072
"scripts": {
73+
"babel": "babel --presets es2015 -d ./dist ./lib",
7174
"cov": "npm run cppcov && npm run filtercov && npm run mergecov",
7275
"coveralls": "cat ./test/coverage/merged.lcov | coveralls",
7376
"cppcov": "mkdir -p test/coverage/cpp && ./lcov-1.10/bin/lcov --gcov-tool /usr/bin/gcov-4.9 --capture --directory build/Release/obj.target/nodegit/src --output-file test/coverage/cpp/lcov_full.info",
@@ -82,9 +85,9 @@
8285
"mocha": "mocha test/runner test/tests --timeout 15000",
8386
"mochaDebug": "mocha --debug-brk test/runner test/tests --timeout 15000",
8487
"postinstall": "node postinstall.js",
85-
"prepublish": "node lifecycleScripts/prepareForBuild.js",
86-
"rebuild": "node generate && node-gyp configure build",
87-
"rebuildDebug": "node generate && node-gyp configure --debug build",
88+
"prepublish": "node lifecycleScripts/prepareForBuild.js && npm run babel",
89+
"rebuild": "node generate && npm run babel && node-gyp configure build",
90+
"rebuildDebug": "node generate && npm run babel && node-gyp configure --debug build",
8891
"recompile": "node-gyp configure build",
8992
"recompileDebug": "node-gyp configure --debug build",
9093
"test": "npm run lint && node --expose-gc test",

postinstall.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if (process.platform !== "linux") {
77
return;
88
}
99

10-
child_process.exec("node lib/nodegit.js", function(error, stdout, stderr) {
10+
child_process.exec("node dist/nodegit.js", function(error, stdout, stderr) {
1111
if (stderr && ~stderr.indexOf("libstdc++")) {
1212
console.log("[ERROR] Seems like the latest libstdc++ is missing on your system!");
1313
console.log("");

0 commit comments

Comments
 (0)