Skip to content

Commit

Permalink
ident files with 4 spaces instead of 2
Browse files Browse the repository at this point in the history
  • Loading branch information
tiagoschenkel committed Oct 27, 2016
1 parent f61cd7f commit a0a2aa6
Show file tree
Hide file tree
Showing 6 changed files with 263 additions and 263 deletions.
24 changes: 12 additions & 12 deletions .publishrc
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"validations": {
"vulnerableDependencies": true,
"uncommittedChanges": true,
"untrackedFiles": true,
"sensitiveData": {
"ignore": []
"validations": {
"vulnerableDependencies": true,
"uncommittedChanges": true,
"untrackedFiles": true,
"sensitiveData": {
"ignore": []
},
"branch": "master",
"gitTag": true
},
"branch": "master",
"gitTag": true
},
"confirm": true,
"publishTag": "latest",
"prePublishScript": "npm test"
"confirm": true,
"publishTag": "latest",
"prePublishScript": "npm test"
}
130 changes: 65 additions & 65 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,71 +9,71 @@ delete webpackConfig.entry;

module.exports = function(config) {

var configuration = {
basePath: "",
frameworks: [
"mocha",
"chai",
"sinon",
"es6-shim"
],
files: [
"./test/entry.test.ts",
"./test/**/**/**.test.ts",
{
pattern: '**/*.map',
served: true,
included: false,
watched: true
}
],
preprocessors: {
"./**/**/**/**.ts": ["sourcemap"],
"./test/**/**/**.test.ts": ["webpack"]
},
webpack: webpackConfig,
webpackMiddleware: {
noInfo: true
},
plugins: [
"karma-webpack",
"karma-sourcemap-writer",
"karma-sourcemap-loader",
"karma-remap-istanbul",
"karma-mocha-reporter",
"karma-mocha",
"karma-chai",
"karma-sinon",
"karma-es6-shim",
"karma-coverage"
],
reporters: (config.singleRun
? ["dots", "mocha", "coverage"]
: ["dots", "mocha"]),
coverageReporter: {
dir: "coverage",
reporters: [
{ type: 'html', subdir: 'report-html' },
{ type: 'lcov', subdir: 'report-lcov' }
],
instrumenterOptions: {
istanbul: { noCompact: true }
}
},
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['Chrome']
};
var configuration = {
basePath: "",
frameworks: [
"mocha",
"chai",
"sinon",
"es6-shim"
],
files: [
"./test/entry.test.ts",
"./test/**/**/**.test.ts",
{
pattern: '**/*.map',
served: true,
included: false,
watched: true
}
],
preprocessors: {
"./**/**/**/**.ts": ["sourcemap"],
"./test/**/**/**.test.ts": ["webpack"]
},
webpack: webpackConfig,
webpackMiddleware: {
noInfo: true
},
plugins: [
"karma-webpack",
"karma-sourcemap-writer",
"karma-sourcemap-loader",
"karma-remap-istanbul",
"karma-mocha-reporter",
"karma-mocha",
"karma-chai",
"karma-sinon",
"karma-es6-shim",
"karma-coverage"
],
reporters: (config.singleRun
? ["dots", "mocha", "coverage"]
: ["dots", "mocha"]),
coverageReporter: {
dir: "coverage",
reporters: [
{ type: 'html', subdir: 'report-html' },
{ type: 'lcov', subdir: 'report-lcov' }
],
instrumenterOptions: {
istanbul: { noCompact: true }
}
},
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['Chrome']
};

if (process.env.TRAVIS) {
configuration.browsers = ['PhantomJS'];
configuration.plugins.push("karma-phantomjs-launcher");
} else {
configuration.plugins.push("karma-phantomjs-launcher");
configuration.browsers = ['PhantomJS'];
}
if (process.env.TRAVIS) {
configuration.browsers = ['PhantomJS'];
configuration.plugins.push("karma-phantomjs-launcher");
} else {
configuration.plugins.push("karma-phantomjs-launcher");
configuration.browsers = ['PhantomJS'];
}

config.set(configuration);
config.set(configuration);
};
152 changes: 76 additions & 76 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,78 +1,78 @@
{
"name": "signals.js",
"version": "1.0.0-alpha.2",
"description": "TypeScript port of AS3 Signals.",
"main": "lib/src/index.js",
"typings": "lib/src/index.d.ts",
"scripts": {
"test": "karma start --single-run",
"mocha": "mocha test/**/*.test.ts --require ts-node/register",
"autoformat": "tsfmt -r",
"prepublish": "tsc -d && publish-please guard",
"publish-please": "publish-please",
"install": "tsc -d"
},
"repository": {
"type": "git",
"url": "https://github.com/GoodgameStudios/SignalJS.git"
},
"keywords": [
"Signals",
"TypeScript"
],
"author": "Goodgame Studios",
"contributors": [
"Bartosz Oczujda <[email protected]>",
"Tiago Schenkel <[email protected]>"
],
"license": "MIT",
"bugs": {
"url": "https://github.com/GoodgameStudios/SignalJS/issues"
},
"homepage": "https://github.com/GoodgameStudios/SignalJS#readme",
"devDependencies": {
"@types/bluebird": "^3.0.35",
"@types/chai": "^3.4.34",
"@types/mocha": "^2.2.32",
"@types/sinon": "^1.16.31",
"awesome-typescript-loader": "^2.2.4",
"bluebird": "^3.4.6",
"browserify-versionify": "^1.0.6",
"chai": "^3.5.0",
"es6-map": "^0.1.4",
"es6-symbol": "^3.1.0",
"glslify": "^6.0.1",
"imports-loader": "^0.6.5",
"istanbul": "^1.1.0-alpha.1",
"istanbul-instrumenter-loader": "^0.2.0",
"karma": "^1.3.0",
"karma-chai": "^0.1.0",
"karma-chai-sinon": "^0.1.5",
"karma-chrome-launcher": "^2.0.0",
"karma-coverage": "^1.1.1",
"karma-es6-shim": "^1.0.0",
"karma-jasmine": "^1.0.2",
"karma-mocha": "^1.2.0",
"karma-mocha-reporter": "^2.2.0",
"karma-phantomjs-launcher": "^1.0.2",
"karma-remap-istanbul": "^0.2.1",
"karma-sinon": "^1.0.5",
"karma-sourcemap-loader": "^0.3.7",
"karma-sourcemap-writer": "^0.1.2",
"karma-webpack": "^1.8.0",
"mocha": "^3.1.2",
"publish-please": "^2.2.0",
"reflect-metadata": "^0.1.8",
"remap-istanbul": "^0.7.0",
"rimraf": "^2.5.4",
"sinon": "^2.0.0-pre.3",
"sinon-chai": "^2.8.0",
"ts-node": "^1.6.0",
"tslint": "^3.15.1",
"typedoc": "^0.5.0",
"typescript": "^2.0.3",
"typescript-formatter": "^4.0.0",
"webpack": "^2.1.0-beta.25",
"webpack-dev-server": "^2.1.0-beta.9"
}
"name": "signals.js",
"version": "1.0.0-alpha.2",
"description": "TypeScript port of AS3 Signals.",
"main": "lib/src/index.js",
"typings": "lib/src/index.d.ts",
"scripts": {
"test": "karma start --single-run",
"mocha": "mocha test/**/*.test.ts --require ts-node/register",
"autoformat": "tsfmt -r",
"prepublish": "tsc -d && publish-please guard",
"publish-please": "publish-please",
"install": "tsc -d"
},
"repository": {
"type": "git",
"url": "https://github.com/GoodgameStudios/SignalJS.git"
},
"keywords": [
"Signals",
"TypeScript"
],
"author": "Goodgame Studios",
"contributors": [
"Bartosz Oczujda <[email protected]>",
"Tiago Schenkel <[email protected]>"
],
"license": "MIT",
"bugs": {
"url": "https://github.com/GoodgameStudios/SignalJS/issues"
},
"homepage": "https://github.com/GoodgameStudios/SignalJS#readme",
"devDependencies": {
"@types/bluebird": "^3.0.35",
"@types/chai": "^3.4.34",
"@types/mocha": "^2.2.32",
"@types/sinon": "^1.16.31",
"awesome-typescript-loader": "^2.2.4",
"bluebird": "^3.4.6",
"browserify-versionify": "^1.0.6",
"chai": "^3.5.0",
"es6-map": "^0.1.4",
"es6-symbol": "^3.1.0",
"glslify": "^6.0.1",
"imports-loader": "^0.6.5",
"istanbul": "^1.1.0-alpha.1",
"istanbul-instrumenter-loader": "^0.2.0",
"karma": "^1.3.0",
"karma-chai": "^0.1.0",
"karma-chai-sinon": "^0.1.5",
"karma-chrome-launcher": "^2.0.0",
"karma-coverage": "^1.1.1",
"karma-es6-shim": "^1.0.0",
"karma-jasmine": "^1.0.2",
"karma-mocha": "^1.2.0",
"karma-mocha-reporter": "^2.2.0",
"karma-phantomjs-launcher": "^1.0.2",
"karma-remap-istanbul": "^0.2.1",
"karma-sinon": "^1.0.5",
"karma-sourcemap-loader": "^0.3.7",
"karma-sourcemap-writer": "^0.1.2",
"karma-webpack": "^1.8.0",
"mocha": "^3.1.2",
"publish-please": "^2.2.0",
"reflect-metadata": "^0.1.8",
"remap-istanbul": "^0.7.0",
"rimraf": "^2.5.4",
"sinon": "^2.0.0-pre.3",
"sinon-chai": "^2.8.0",
"ts-node": "^1.6.0",
"tslint": "^3.15.1",
"typedoc": "^0.5.0",
"typescript": "^2.0.3",
"typescript-formatter": "^4.0.0",
"webpack": "^2.1.0-beta.25",
"webpack-dev-server": "^2.1.0-beta.9"
}
}
32 changes: 16 additions & 16 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"compilerOptions": {
"outDir": "lib",
"target": "es5",
"lib": ["es6", "dom"],
"module": "commonjs",
"moduleResolution": "node",
"declaration": false,
"noImplicitAny": false,
"sourceMap": true,
"experimentalDecorators": true,
"emitDecoratorMetadata": true
},
"include": [
"./src/**/*.ts",
"./test/**/*.ts"
]
"compilerOptions": {
"outDir": "lib",
"target": "es5",
"lib": ["es6", "dom"],
"module": "commonjs",
"moduleResolution": "node",
"declaration": false,
"noImplicitAny": false,
"sourceMap": true,
"experimentalDecorators": true,
"emitDecoratorMetadata": true
},
"include": [
"./src/**/*.ts",
"./test/**/*.ts"
]
}
24 changes: 12 additions & 12 deletions tsfmt.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"indentSize": 4,
"tabSize": 4,
"newLineCharacter": "\n",
"convertTabsToSpaces": true,
"insertSpaceAfterCommaDelimiter": true,
"insertSpaceAfterSemicolonInForStatements": true,
"insertSpaceBeforeAndAfterBinaryOperators": true,
"insertSpaceAfterKeywordsInControlFlowStatements": true,
"insertSpaceAfterFunctionKeywordForAnonymousFunctions": false,
"insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": false,
"placeOpenBraceOnNewLineForFunctions": false,
"placeOpenBraceOnNewLineForControlBlocks": false
"indentSize": 4,
"tabSize": 4,
"newLineCharacter": "\n",
"convertTabsToSpaces": true,
"insertSpaceAfterCommaDelimiter": true,
"insertSpaceAfterSemicolonInForStatements": true,
"insertSpaceBeforeAndAfterBinaryOperators": true,
"insertSpaceAfterKeywordsInControlFlowStatements": true,
"insertSpaceAfterFunctionKeywordForAnonymousFunctions": false,
"insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": false,
"placeOpenBraceOnNewLineForFunctions": false,
"placeOpenBraceOnNewLineForControlBlocks": false
}
Loading

0 comments on commit a0a2aa6

Please sign in to comment.