Merge pull request #3487 from LiskHQ/3401-review-prettier

Review prettier setting for overall SDK structure - Closes #3401
LiskHQ · May 2, 2019 · 32950c9 · 32950c9
2 parents 7b4fcbf + 11bacca
commit 32950c9
Show file tree

Hide file tree

Showing 38 changed files with 774 additions and 968 deletions.
diff --git a/commander/.prettierignore b/commander/.prettierignore
@@ -0,0 +1,22 @@
+# Files
+LICENSE
+.gitkeep
+mocha.opts
+
+# rc files
+.*rc
+## ignore files
+.*ignore
+
+# Ignore extensions
+*.png
+*.sql
+*.sh
+*.cmd
+## jest snapshot
+*.snap
+
+# project specific paths
+.nyc_output/
+coverage/
+dist/
diff --git a/commander/bin/run b/commander/bin/run
@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 
-require('@oclif/command').run()
+require('@oclif/command')
+	.run()
 	.then(require('@oclif/command/flush'))
 	.catch(require('@oclif/errors/handle'));
diff --git a/commander/package.json b/commander/package.json
@@ -29,7 +29,7 @@
 	},
 	"scripts": {
 		"start": "ts-node src/index.js",
-		"format": "prettier --write \"*.{ts,js,json,md}\" \"{docs,src,test}/**/*.{ts,js,json,md}\"",
+		"format": "prettier --write '**/*'",
 		"lint": "tslint --config tslint.json --format codeFrame --project .",
 		"lint:fix": "npm run lint -- --fix",
 		"test": "TS_NODE_TRANSPILE_ONLY=true TS_NODE_FILES=true TS_NODE_PROJECT=./test/tsconfig.json nyc mocha test/{,/**/,/**/**/,/**/**/**/}/*.ts",

diff --git a/elements/lisk-api-client/package.json b/elements/lisk-api-client/package.json
@@ -29,7 +29,7 @@
 		"uglify": "uglifyjs -nm -o ./dist-browser/index.min.js ./dist-browser/index.js",
 		"uglify:browsertest": "uglifyjs -o ./browsertest.build/browsertest.min.js ./browsertest.build/browsertest.js",
 		"clean": "./scripts/clean.sh",
-		"format": "prettier --write \"*.{ts,js,json}\" \"{src,test}/**/*.{ts,js,json}\"",
+		"format": "prettier --write '**/*'",
 		"lint": "tslint --format verbose --project .",
 		"lint:fix": "npm run lint -- --fix",
 		"test": "TS_NODE_PROJECT=./test/tsconfig.json nyc mocha test/{,/**/}/*.ts",

diff --git a/elements/lisk-client/index.html b/elements/lisk-client/index.html
@@ -1,14 +1,13 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-</head>
-<body>
-Open the console to get started with Lisk Client.
-<div id="output"></div>
+	<head>
+		<meta charset="UTF-8" />
+		<title>Title</title>
+	</head>
+	<body>
+		Open the console to get started with Lisk Client.
+		<div id="output"></div>
 
-<script src="dist-browser/lisk-client.min.js"></script>
-
-</body>
+		<script src="dist-browser/lisk-client.min.js"></script>
+	</body>
 </html>
diff --git a/elements/lisk-client/package.json b/elements/lisk-client/package.json
@@ -31,7 +31,7 @@
 		"uglify": "uglifyjs -nm -o ./dist-browser/index.min.js ./dist-browser/index.js",
 		"uglify:browsertest": "uglifyjs -o ./browsertest.build/browsertest.min.js ./browsertest.build/browsertest.js",
 		"clean": "./scripts/clean.sh",
-		"format": "prettier --write \"*.{js,json}\" \"{src,test}/**/*.{js,json}\"",
+		"format": "prettier --write '**/*'",
 		"lint": "tslint --format verbose --project .",
 		"lint:fix": "npm run lint -- --fix",
 		"test": "TS_NODE_PROJECT=./test/tsconfig.json nyc mocha test/**/*.ts test/**/**/*.ts",

diff --git a/elements/lisk-constants/package.json b/elements/lisk-constants/package.json
@@ -29,7 +29,7 @@
 		"uglify": "uglifyjs -nm -o ./dist-browser/index.min.js ./dist-browser/index.js",
 		"uglify:browsertest": "uglifyjs -o ./browsertest.build/browsertest.min.js ./browsertest.build/browsertest.js",
 		"clean": "./scripts/clean.sh",
-		"format": "prettier --write \"*.{ts,js,json}\" \"{src,test}/**/*.{ts,js,json}\"",
+		"format": "prettier --write '**/*'",
 		"lint": "tslint --format verbose --project .",
 		"lint:fix": "npm run lint -- --fix",
 		"test": "TS_NODE_PROJECT=./test/tsconfig.json nyc mocha test/**/*.ts",

diff --git a/elements/lisk-cryptography/package.json b/elements/lisk-cryptography/package.json
@@ -29,7 +29,7 @@
 		"uglify": "uglifyjs -nm -o ./dist-browser/index.min.js ./dist-browser/index.js",
 		"uglify:browsertest": "uglifyjs -o ./browsertest.build/browsertest.min.js ./browsertest.build/browsertest.js",
 		"clean": "./scripts/clean.sh",
-		"format": "prettier --write \"*.{ts,json}\" \"{src,test}/**/*.{ts,json}\"",
+		"format": "prettier --write '**/*'",
 		"lint": "tslint --format verbose --project .",
 		"lint:fix": "npm run lint -- --fix",
 		"test": "TS_NODE_PROJECT=./test/tsconfig.json nyc mocha test/{,/**/}/*.ts",

diff --git a/elements/lisk-elements/index.html b/elements/lisk-elements/index.html
@@ -1,14 +1,13 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-</head>
-<body>
-Open the console to get started with Lisk Elements.
-<div id="output"></div>
+	<head>
+		<meta charset="UTF-8" />
+		<title>Title</title>
+	</head>
+	<body>
+		Open the console to get started with Lisk Elements.
+		<div id="output"></div>
 
-<script src="dist-browser/lisk-elements.min.js"></script>
-
-</body>
+		<script src="dist-browser/lisk-elements.min.js"></script>
+	</body>
 </html>
diff --git a/elements/lisk-elements/package.json b/elements/lisk-elements/package.json
@@ -31,7 +31,7 @@
 		"uglify": "uglifyjs -nm -o ./dist-browser/index.min.js ./dist-browser/index.js",
 		"uglify:browsertest": "uglifyjs -o ./browsertest.build/browsertest.min.js ./browsertest.build/browsertest.js",
 		"clean": "./scripts/clean.sh",
-		"format": "prettier --write \"*.{js,json}\" \"{src,test}/**/*.{js,json}\"",
+		"format": "prettier --write '**/*'",
 		"lint": "tslint --format verbose --project .",
 		"lint:fix": "npm run lint -- --fix",
 		"test": "TS_NODE_PROJECT=./test/tsconfig.json nyc mocha test/{,/**/}/*.ts",

diff --git a/elements/lisk-p2p/package.json b/elements/lisk-p2p/package.json
@@ -25,7 +25,7 @@
 	"scripts": {
 		"transpile": "tsc",
 		"clean": "./scripts/clean.sh",
-		"format": "prettier --write \"*.{ts,js,json}\" \"{src,test}/**/*.{ts,js,json}\"",
+		"format": "prettier --write '**/*'",
 		"lint": "tslint --format verbose --project .",
 		"lint:fix": "npm run lint -- --fix",
 		"test": "TS_NODE_PROJECT=./test/tsconfig.json nyc mocha test/{,/**/}/*.ts",

diff --git a/elements/lisk-passphrase/package.json b/elements/lisk-passphrase/package.json
@@ -31,7 +31,7 @@
 		"uglify": "uglifyjs -nm -o ./dist-browser/index.min.js ./dist-browser/index.js",
 		"uglify:browsertest": "uglifyjs -o ./browsertest.build/browsertest.min.js ./browsertest.build/browsertest.js",
 		"clean": "./scripts/clean.sh",
-		"format": "prettier --write \"*.{ts,js,json}\" \"{src,test}/**/*.{ts,js,json}\"",
+		"format": "prettier --write '**/*'",
 		"lint": "tslint --format verbose --project .",
 		"lint:fix": "npm run lint -- --fix",
 		"test": "TS_NODE_PROJECT=./test/tsconfig.json nyc mocha test/**/*.ts",

diff --git a/elements/lisk-transaction-pool/.prettierignore b/elements/lisk-transaction-pool/.prettierignore
@@ -0,0 +1 @@
+../../templates/.prettierignore.tmpl
diff --git a/elements/lisk-transaction-pool/package.json b/elements/lisk-transaction-pool/package.json
@@ -25,7 +25,7 @@
 	"scripts": {
 		"transpile": "tsc",
 		"clean": "./scripts/clean.sh",
-		"format": "prettier --write \"*.{ts,js,json}\" \"{src,test}/**/*.{ts,js,json}\"",
+		"format": "prettier --write '**/*'",
 		"lint": "tslint --format verbose --project .",
 		"lint:fix": "npm run lint -- --fix",
 		"test": "TS_NODE_PROJECT=./test/tsconfig.json nyc mocha test/{,/**/}/*.ts",

diff --git a/elements/lisk-transactions/package.json b/elements/lisk-transactions/package.json
@@ -29,7 +29,7 @@
 		"uglify": "uglifyjs -nm -o ./dist-browser/index.min.js ./dist-browser/index.js",
 		"uglify:browsertest": "uglifyjs -o ./browsertest.build/browsertest.min.js ./browsertest.build/browsertest.js",
 		"clean": "./scripts/clean.sh",
-		"format": "prettier --write \"*.{ts,js,json}\" \"{src,test}/**/*.{ts,js,json}\"",
+		"format": "prettier --write '**/*'",
 		"lint": "tslint --format verbose --project .",
 		"lint:fix": "npm run lint -- --fix",
 		"test": "TS_NODE_PROJECT=./test/tsconfig.json nyc mocha test/{,/**/,/**/**/}/*.ts",

diff --git a/elements/lisk-validator/package.json b/elements/lisk-validator/package.json
@@ -32,7 +32,7 @@
 		"uglify": "uglifyjs -nm -o ./dist-browser/index.min.js ./dist-browser/index.js",
 		"uglify:browsertest": "uglifyjs -o ./browsertest.build/browsertest.min.js ./browsertest.build/browsertest.js",
 		"clean": "./scripts/clean.sh",
-		"format": "prettier --write \"*.{ts,js,json}\" \"{src,test}/**/*.{ts,js,json}\"",
+		"format": "prettier --write '**/*'",
 		"lint": "tslint --format verbose --project .",
 		"lint:fix": "npm run lint -- --fix",
 		"test": "TS_NODE_PROJECT=./test/tsconfig.json nyc mocha test/{,/**/,/**/**/}/*.ts",

diff --git a/framework/.prettierignore b/framework/.prettierignore
@@ -1 +1,18 @@
-test/.coverage-unit
+# Files
+Jenkinsfile*
+.gitkeep
+mocha.opts
+
+# rc files
+.*rc
+## ignore files
+.*ignore
+
+# Ignore extensions
+*.png
+*.sql
+## jest snapshot
+*.snap
+
+# project specific paths
+test/.coverage-unit/