Skip to content

Commit 5041fad

Browse files
committed
Other: Additional restructuring for moving configuration files out of the root folder
1 parent c0b7c9f commit 5041fad

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+458
-361
lines changed

.codeclimate.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
engines:
33
eslint:
44
enabled: true
5+
config:
6+
config: config/eslint.json
57
tslint:
68
enabled: true
79
channel: beta
8-
config: .tslint.json
10+
config: config/tslint.json
911
ratings:
1012
paths:
1113
- "src/**.js"

.istanbul.yml

Lines changed: 0 additions & 2 deletions
This file was deleted.

bench/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ setTimeout(function() {
9696
Test.fromObject(dataObject);
9797
})
9898
.run();
99-
99+
100100
newSuite("message to object")
101101
.add("Type.toObject", function() {
102102
Test.toObject(dataMessage);

cli/pbjs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ exports.main = function main(args, callback) {
278278
else
279279
process.stdout.write(output, "utf8");
280280
}
281-
return callback
281+
return callback
282282
? callback(null)
283283
: undefined;
284284
});

cli/pbts.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ exports.main = function(args, callback) {
9898
// There is no proper API for jsdoc, so this executes the CLI and pipes the output
9999
var basedir = path.join(__dirname, "..");
100100
var moduleName = argv.name || "null";
101-
var cmd = "node \"" + require.resolve("jsdoc/jsdoc.js") + "\" -c \"" + path.join(basedir, "scripts", "jsdoc.types.json") + "\" -q \"module=" + encodeURIComponent(moduleName) + "&comments=" + Boolean(argv.comments) + "\" " + files.map(function(file) { return "\"" + file + "\""; }).join(" ");
101+
var cmd = "node \"" + require.resolve("jsdoc/jsdoc.js") + "\" -c \"" + path.join(basedir, "config", "jsdoc-types.json") + "\" -q \"module=" + encodeURIComponent(moduleName) + "&comments=" + Boolean(argv.comments) + "\" " + files.map(function(file) { return "\"" + file + "\""; }).join(" ");
102102
var child = child_process.exec(cmd, {
103103
cwd: process.cwd(),
104104
argv0: "node",

cli/targets/json-module.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var util = require("../util");
66
json_module.description = "JSON representation as a module";
77

88
function json_module(root, options, callback) {
9-
try {
9+
try {
1010
var rootProp = util.safeProp(options.root || "default");
1111
var output = [
1212
(options.es6 ? "const" : "var") + " $root = ($protobuf.roots" + rootProp + " || ($protobuf.roots" + rootProp + " = new $protobuf.Root()))\n"

cli/targets/json.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ module.exports = json_target;
44
json_target.description = "JSON representation";
55

66
function json_target(root, options, callback) {
7-
callback(null, JSON.stringify(root, null, 2));
7+
callback(null, JSON.stringify(root, null, 2));
88
}

cli/targets/proto.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function underScore(str) {
2424
var out = [];
2525
var indent = 0;
2626
var first = false;
27-
var syntax = 3;
27+
var syntax = 3;
2828

2929
function proto_target(root, options, callback) {
3030
if (options) {

.eslintrc.json renamed to config/eslint.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,10 @@
117117
// Stylistic Issues
118118
"semi": 1, // maybe next time
119119
"no-extra-semi": 1,
120-
"quotes": 1 // useful for gzip
120+
"quotes": 1, // useful for gzip
121+
"no-trailing-spaces": 1,
122+
"no-unneeded-ternary": 1,
123+
"unicode-bom": [2, "never"]
121124

122125
// ECMAScript 6 // maybe next time
123126
}

config/istanbul.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"instrumentation": {
3+
"root": "./src"
4+
}
5+
}

0 commit comments

Comments
 (0)