From 5edaa54d133310bf8d51d840d0fb3b7583e85e2c Mon Sep 17 00:00:00 2001 From: tsigel Date: Mon, 8 Jul 2019 15:01:10 +0300 Subject: [PATCH 1/7] Fix build --- scripts/dataServicesTask.ts | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/scripts/dataServicesTask.ts b/scripts/dataServicesTask.ts index bb7aa37159..35f7d033b9 100644 --- a/scripts/dataServicesTask.ts +++ b/scripts/dataServicesTask.ts @@ -1,16 +1,18 @@ import { TaskFunction } from 'gulp'; import { createSpawn } from './utils'; +import { normalize } from 'path'; export function createDataServicesTask(): TaskFunction { return async function dataServicesTask() { - await createSpawn('node', [ - './node_modules/.bin/tsc', - '-p', './data-service' + + await createSpawn('sh', [ + normalize('./node_modules/.bin/tsc'), + '-p', normalize('./data-service') ]); - await createSpawn('node', [ - './node_modules/.bin/browserify', - 'data-service/index.js', + await createSpawn('sh', [ + normalize('./node_modules/.bin/browserify'), + normalize('data-service/index.js'), '-s', 'ds', '-u', 'ts-utils', '-u', 'ramda', @@ -19,15 +21,15 @@ export function createDataServicesTask(): TaskFunction { '-u', '@waves/signature-generator', '-u', '@waves/signature-adapter', '--no-bf', - '-o', './data-service-dist/data-service-es6.js' + '-o', normalize('./data-service-dist/data-service-es6.js') ]); - await createSpawn('node', [ - './node_modules/.bin/babel', - './data-service-dist/data-service-es6.js', + await createSpawn('sh', [ + normalize('./node_modules/.bin/babel'), + normalize('./data-service-dist/data-service-es6.js'), '--presets=es2015', '--plugins=transform-decorators-legacy,transform-class-properties,transform-object-rest-spread', - '-o', './data-service-dist/data-service.js' + '-o', normalize('./data-service-dist/data-service.js') ]); - } -} + }; +} \ No newline at end of file From 0dcbfe1539729e7a5973cea6743210964b4ac632 Mon Sep 17 00:00:00 2001 From: tsigel Date: Mon, 8 Jul 2019 15:37:07 +0300 Subject: [PATCH 2/7] DEXW-1910: fix build --- .gitignore | 2 ++ hooks/pre-commit | 2 +- package-lock.json | 54 ++++++++++++------------------------------ scripts/eslintTask.ts | 2 +- scripts/postinstall.sh | 4 ++-- 5 files changed, 21 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index 6d09b82ada..85926c4f94 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,6 @@ WavesGUI.iml /.cache-download /data-service/**/*.js /data-service/**/*.js.map +/scripts/**/*.js +/scripts/**/*.js.map /data-service-dist diff --git a/hooks/pre-commit b/hooks/pre-commit index c7450f0f60..06ed62a846 100755 --- a/hooks/pre-commit +++ b/hooks/pre-commit @@ -1,7 +1,7 @@ #!/usr/bin/env bash echo "pre-commit hook" -node ./node_modules/.bin/eslint -c ./.eslintrc.json ./src/modules/ || exit 1 +sh ./node_modules/.bin/eslint -c ./.eslintrc.json ./src/modules/ || exit 1 if [ $? -ne 0 ] then echo "Bad code! :(" && exit 1 diff --git a/package-lock.json b/package-lock.json index a166b9e81e..2ce38a4c37 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "waves-client", - "version": "1.3.5", + "version": "1.3.8", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1963,15 +1963,13 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true, - "optional": true + "dev": true }, "is-glob": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, - "optional": true, "requires": { "is-extglob": "^1.0.0" } @@ -7042,8 +7040,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -7064,14 +7061,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -7086,20 +7081,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -7216,8 +7208,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -7229,7 +7220,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -7244,7 +7234,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -7252,14 +7241,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -7278,7 +7265,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -7366,8 +7352,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -7379,7 +7364,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -7465,8 +7449,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -7502,7 +7485,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -7522,7 +7504,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -7566,14 +7547,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, @@ -7703,15 +7682,13 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true, - "optional": true + "dev": true }, "is-glob": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, - "optional": true, "requires": { "is-extglob": "^1.0.0" } @@ -12388,8 +12365,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true, - "optional": true + "dev": true }, "is-glob": { "version": "2.0.1", diff --git a/scripts/eslintTask.ts b/scripts/eslintTask.ts index aff3a5b80c..d08a47239b 100644 --- a/scripts/eslintTask.ts +++ b/scripts/eslintTask.ts @@ -3,7 +3,7 @@ import { createSpawn } from './utils'; export function createEslintTask(): TaskFunction { return function eslintTask() { - return createSpawn('node', [ + return createSpawn('sh', [ './node_modules/.bin/eslint', '-c', '.eslintrc.json', './src/modules/' diff --git a/scripts/postinstall.sh b/scripts/postinstall.sh index 1270bd7b61..268735d4b7 100644 --- a/scripts/postinstall.sh +++ b/scripts/postinstall.sh @@ -10,8 +10,8 @@ echo "compile typescript >> DONE" echo "run post install script >> DONE" echo "copy hooks" -cp hooks/pre-commit .git/hooks || exit 0 -cp hooks/commit-msg .git/hooks || exit 0 +cp -f hooks/pre-commit .git/hooks || exit 0 +cp -f hooks/commit-msg .git/hooks || exit 0 echo "copy hooks >> DONE" echo "apply aliases" From d8e9d1a854a2e41ddf34a62d79eae9d20792ccb8 Mon Sep 17 00:00:00 2001 From: tsigel Date: Wed, 10 Jul 2019 15:10:13 +0300 Subject: [PATCH 3/7] DEXW-1910: remove pre-commit --- hooks/pre-commit | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100755 hooks/pre-commit diff --git a/hooks/pre-commit b/hooks/pre-commit deleted file mode 100755 index 06ed62a846..0000000000 --- a/hooks/pre-commit +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -echo "pre-commit hook" -sh ./node_modules/.bin/eslint -c ./.eslintrc.json ./src/modules/ || exit 1 - -if [ $? -ne 0 ] - then echo "Bad code! :(" && exit 1 -fi - -if grep -r --ignore-case "TODO!" ./src - then echo "Can't commit with TODO!" && exit 1 -fi - -if grep -r --ignore-case "debugger" ./src - then echo "Can't commit with debugger" && exit 1 -fi - -if grep -r --ignore-case "> DONE" - -exit 0 From afe48a6bf1bda9e498d15193f9cc7f7ec3f7c256 Mon Sep 17 00:00:00 2001 From: tsigel Date: Wed, 10 Jul 2019 15:27:21 +0300 Subject: [PATCH 4/7] DEXW-1910: fix build for windows --- electron/decorators/loggable.js | 21 --------------------- scripts/dataServicesTask.ts | 9 +++------ 2 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 electron/decorators/loggable.js diff --git a/electron/decorators/loggable.js b/electron/decorators/loggable.js deleted file mode 100644 index 06a9de64d2..0000000000 --- a/electron/decorators/loggable.js +++ /dev/null @@ -1,21 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -function loggable(constructor) { - const constructorsClass = constructor.prototype; - Object.getOwnPropertyNames(constructorsClass) - .filter(name => typeof constructorsClass[name] === 'function') - .forEach(propertyName => { - const descriptor = Object.getOwnPropertyDescriptor(constructorsClass, propertyName); - ; - const originalMethod = descriptor.value; - descriptor.value = function (...args) { - console.log("Method's name " + propertyName); - const result = originalMethod.apply(this, args); - console.log("The return value is: " + result); - return result; - }; - Object.defineProperty(constructorsClass, propertyName, descriptor); - }); -} -exports.default = loggable; -//# sourceMappingURL=loggable.js.map \ No newline at end of file diff --git a/scripts/dataServicesTask.ts b/scripts/dataServicesTask.ts index 35f7d033b9..0aadbdd6b0 100644 --- a/scripts/dataServicesTask.ts +++ b/scripts/dataServicesTask.ts @@ -5,13 +5,11 @@ import { normalize } from 'path'; export function createDataServicesTask(): TaskFunction { return async function dataServicesTask() { - await createSpawn('sh', [ - normalize('./node_modules/.bin/tsc'), + await createSpawn(normalize('./node_modules/.bin/tsc'), [ '-p', normalize('./data-service') ]); - await createSpawn('sh', [ - normalize('./node_modules/.bin/browserify'), + await createSpawn(normalize('./node_modules/.bin/browserify'), [ normalize('data-service/index.js'), '-s', 'ds', '-u', 'ts-utils', @@ -24,8 +22,7 @@ export function createDataServicesTask(): TaskFunction { '-o', normalize('./data-service-dist/data-service-es6.js') ]); - await createSpawn('sh', [ - normalize('./node_modules/.bin/babel'), + await createSpawn(normalize('./node_modules/.bin/babel'), [ normalize('./data-service-dist/data-service-es6.js'), '--presets=es2015', '--plugins=transform-decorators-legacy,transform-class-properties,transform-object-rest-spread', From 9f92a9afd2d5cdeeee5dea02b0ba971df733ecaa Mon Sep 17 00:00:00 2001 From: tsigel Date: Wed, 10 Jul 2019 15:41:32 +0300 Subject: [PATCH 5/7] DEXW-1910: fix eslint task --- scripts/eslintTask.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/eslintTask.ts b/scripts/eslintTask.ts index d08a47239b..7ad3194f06 100644 --- a/scripts/eslintTask.ts +++ b/scripts/eslintTask.ts @@ -1,10 +1,10 @@ import { TaskFunction } from 'gulp'; import { createSpawn } from './utils'; +import { normalize } from 'path'; export function createEslintTask(): TaskFunction { return function eslintTask() { - return createSpawn('sh', [ - './node_modules/.bin/eslint', + return createSpawn(normalize('./node_modules/.bin/eslint'), [ '-c', '.eslintrc.json', './src/modules/' ]); From fc7fc4176fc45df078b77593539d2ca32d26246c Mon Sep 17 00:00:00 2001 From: finico Date: Thu, 11 Jul 2019 16:57:06 +0300 Subject: [PATCH 6/7] DEXW-1911: Fix creating spawn for win32 --- scripts/dataServicesTask.ts | 9 +++------ scripts/eslintTask.ts | 3 +-- scripts/utils.ts | 21 +++++++++++---------- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/scripts/dataServicesTask.ts b/scripts/dataServicesTask.ts index bb7aa37159..e5f82e33c6 100644 --- a/scripts/dataServicesTask.ts +++ b/scripts/dataServicesTask.ts @@ -3,13 +3,11 @@ import { createSpawn } from './utils'; export function createDataServicesTask(): TaskFunction { return async function dataServicesTask() { - await createSpawn('node', [ - './node_modules/.bin/tsc', + await createSpawn('./node_modules/.bin/tsc', [ '-p', './data-service' ]); - await createSpawn('node', [ - './node_modules/.bin/browserify', + await createSpawn('./node_modules/.bin/browserify', [ 'data-service/index.js', '-s', 'ds', '-u', 'ts-utils', @@ -22,8 +20,7 @@ export function createDataServicesTask(): TaskFunction { '-o', './data-service-dist/data-service-es6.js' ]); - await createSpawn('node', [ - './node_modules/.bin/babel', + await createSpawn('./node_modules/.bin/babel', [ './data-service-dist/data-service-es6.js', '--presets=es2015', '--plugins=transform-decorators-legacy,transform-class-properties,transform-object-rest-spread', diff --git a/scripts/eslintTask.ts b/scripts/eslintTask.ts index aff3a5b80c..cb8faa892a 100644 --- a/scripts/eslintTask.ts +++ b/scripts/eslintTask.ts @@ -3,8 +3,7 @@ import { createSpawn } from './utils'; export function createEslintTask(): TaskFunction { return function eslintTask() { - return createSpawn('node', [ - './node_modules/.bin/eslint', + return createSpawn('./node_modules/.bin/eslint', [ '-c', '.eslintrc.json', './src/modules/' ]); diff --git a/scripts/utils.ts b/scripts/utils.ts index 3bc584d976..304f82c8c6 100644 --- a/scripts/utils.ts +++ b/scripts/utils.ts @@ -2,19 +2,20 @@ import { spawn } from 'child_process'; export function createSpawn(command: string, args?: string[]): Promise { return new Promise((resolve, reject) => { - const sp = spawn(command, args); + const sp = process.platform === 'win32' + ? spawn('sh', [command, ...args], { + stdio: [null, process.stdout, process.stderr] + }) + : spawn(command, args, { + stdio: [null, process.stdout, process.stderr] + }); - sp.stdout.pipe(process.stdout); - sp.stderr.pipe(process.stderr); - - sp.on('error', reject); - - sp.on('exit', (code, signal) => { + sp.on('close', (code) => { if (code === 0) { - resolve(signal); + resolve(); } else { - reject(signal); + reject(); } - }) + }); }); } From 68fe5ecb1d0e64d7bb7ea818cde157ce6f84725f Mon Sep 17 00:00:00 2001 From: tsigel Date: Wed, 17 Jul 2019 16:07:23 +0300 Subject: [PATCH 7/7] DEXW-1910: fix win build --- scripts/utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/utils.ts b/scripts/utils.ts index 304f82c8c6..c9ba540bf3 100644 --- a/scripts/utils.ts +++ b/scripts/utils.ts @@ -2,7 +2,7 @@ import { spawn } from 'child_process'; export function createSpawn(command: string, args?: string[]): Promise { return new Promise((resolve, reject) => { - const sp = process.platform === 'win32' + const sp = process.platform === 'win32' && command !== 'rm' ? spawn('sh', [command, ...args], { stdio: [null, process.stdout, process.stderr] })