diff --git a/packages/embark/package.json b/packages/embark/package.json index 4d3a0fcaa..2655e36d5 100644 --- a/packages/embark/package.json +++ b/packages/embark/package.json @@ -39,16 +39,11 @@ "_build": "npm run solo -- build", "ci": "npm run qa", "clean": "npm run reset", - "lint": "npm-run-all lint:*", - "lint:js": "eslint bin/embark src/bin/ src/lib/", - "lint:ts": "tslint -c tslint.json \"src/**/*.ts\"", - "qa": "npm-run-all lint typecheck _build test", + "lint": "eslint bin/embark src/bin/ src/lib/", + "qa": "npm-run-all lint _build test", "reset": "npx rimraf .nyc_output coverage dist embark-*.tgz package", "solo": "embark-solo", - "test": "nyc --reporter=html --reporter=json mocha \"dist/test/**/*.js\" --exit --no-timeouts --require ./scripts/test.js --require source-map-support/register", - "typecheck": "tsc", - "watch": "run-p watch:*", - "watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "test": "nyc --reporter=html --reporter=json mocha \"dist/test/**/*.js\" --exit --no-timeouts --require ./scripts/test.js --require source-map-support/register" }, "eslintConfig": { "extends": "../../.eslintrc.json" @@ -235,9 +230,7 @@ "nyc": "13.1.0", "rejected-or-not": "1.0.1", "rimraf": "3.0.0", - "sinon": "4.5.0", - "tslint": "5.16.0", - "typescript": "3.6.3" + "sinon": "4.5.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/embark/src/lib/core/core.ts b/packages/embark/src/lib/core/core.ts deleted file mode 100644 index 96cdd1226..000000000 --- a/packages/embark/src/lib/core/core.ts +++ /dev/null @@ -1,3 +0,0 @@ -export class Core { - -} diff --git a/packages/plugins/basic-pipeline/package.json b/packages/plugins/basic-pipeline/package.json index f16f92141..8f5447e30 100644 --- a/packages/plugins/basic-pipeline/package.json +++ b/packages/plugins/basic-pipeline/package.json @@ -33,7 +33,7 @@ "ci": "npm run qa", "clean": "npm run reset", "lint": "eslint src/", - "qa": "npm-run-all lint _build", + "qa": "npm-run-all lint _build test", "reset": "npx rimraf dist embark-*.tgz package", "solo": "embark-solo", "test": "jest" diff --git a/packages/plugins/basic-pipeline/test/index.js b/packages/plugins/basic-pipeline/test/index.js new file mode 100644 index 000000000..5add1df94 --- /dev/null +++ b/packages/plugins/basic-pipeline/test/index.js @@ -0,0 +1,7 @@ +import BasicPipeline from '../src/index'; + +describe('needs tests', () => { + it('should have tests, please write them', () => { + expect(true).toBe(true); + }); +}); diff --git a/packages/plugins/ethereum-blockchain-client/package.json b/packages/plugins/ethereum-blockchain-client/package.json index 09b6bc48e..247f65aae 100644 --- a/packages/plugins/ethereum-blockchain-client/package.json +++ b/packages/plugins/ethereum-blockchain-client/package.json @@ -32,14 +32,10 @@ "_build": "npm run solo -- build", "ci": "npm run qa", "clean": "npm run reset", - "lint": "npm-run-all lint:*", - "lint:ts": "tslint -c tslint.json \"src/**/*.ts\"", - "qa": "npm-run-all lint typecheck _build", + "lint": "eslint src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "solo": "embark-solo", - "typecheck": "tsc", - "watch": "run-p watch:*", - "watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo" }, "eslintConfig": { "extends": "../../../.eslintrc.json" @@ -58,9 +54,7 @@ "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", - "rimraf": "3.0.0", - "tslint": "5.16.0", - "typescript": "3.6.3" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/plugins/ganache/package.json b/packages/plugins/ganache/package.json index ddb30b591..355167dbc 100644 --- a/packages/plugins/ganache/package.json +++ b/packages/plugins/ganache/package.json @@ -32,14 +32,10 @@ "_build": "npm run solo -- build", "ci": "npm run qa", "clean": "npm run reset", - "lint": "npm-run-all lint:*", - "lint:ts": "tslint -c tslint.json \"src/**/*.ts\"", - "qa": "npm-run-all lint typecheck _build", + "lint": "eslint src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "solo": "embark-solo", - "typecheck": "tsc", - "watch": "run-p watch:*", - "watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo" }, "eslintConfig": { "extends": "../../../.eslintrc.json" @@ -52,9 +48,7 @@ "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", - "rimraf": "3.0.0", - "tslint": "5.16.0", - "typescript": "3.6.3" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/plugins/geth/package.json b/packages/plugins/geth/package.json index b32931124..d03807b51 100644 --- a/packages/plugins/geth/package.json +++ b/packages/plugins/geth/package.json @@ -32,14 +32,10 @@ "_build": "npm run solo -- build", "ci": "npm run qa", "clean": "npm run reset", - "lint": "npm-run-all lint:*", - "lint:ts": "tslint -c tslint.json \"src/**/*.ts\"", - "qa": "npm-run-all lint typecheck _build", + "lint": "eslint src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "solo": "embark-solo", - "typecheck": "tsc", - "watch": "run-p watch:*", - "watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo" }, "eslintConfig": { "extends": "../../../.eslintrc.json" @@ -60,9 +56,7 @@ "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", - "rimraf": "3.0.0", - "tslint": "5.16.0", - "typescript": "3.6.3" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/plugins/transaction-logger/src/index.js b/packages/plugins/transaction-logger/src/index.js index 301143952..d5eaf4587 100644 --- a/packages/plugins/transaction-logger/src/index.js +++ b/packages/plugins/transaction-logger/src/index.js @@ -1,6 +1,6 @@ const async = require('async'); import {__} from 'embark-i18n'; -const Web3 = require('Web3'); +const Web3 = require('web3'); const {blockchain: blockchainConstants} = require('embark-core/constants'); import {dappPath, getAddressToContract, getTransactionParams, hexToNumber} from 'embark-utils'; diff --git a/packages/stack/blockchain-client/package.json b/packages/stack/blockchain-client/package.json index 49ed5f45b..efd12c6f4 100644 --- a/packages/stack/blockchain-client/package.json +++ b/packages/stack/blockchain-client/package.json @@ -32,14 +32,10 @@ "_build": "npm run solo -- build", "ci": "npm run qa", "clean": "npm run reset", - "lint": "npm-run-all lint:*", - "lint:ts": "tslint -c tslint.json \"src/**/*.ts\"", - "qa": "npm-run-all lint typecheck _build", + "lint": "eslint src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "solo": "embark-solo", - "typecheck": "tsc", - "watch": "run-p watch:*", - "watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo" }, "eslintConfig": { "extends": "../../../.eslintrc.json" @@ -52,9 +48,7 @@ "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", - "rimraf": "3.0.0", - "tslint": "5.16.0", - "typescript": "3.6.3" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/stack/blockchain/package.json b/packages/stack/blockchain/package.json index 3666be1dd..44ae426e4 100644 --- a/packages/stack/blockchain/package.json +++ b/packages/stack/blockchain/package.json @@ -33,7 +33,7 @@ "ci": "npm run qa", "clean": "npm run reset", "lint": "eslint src/", - "qa": "npm-run-all lint _build", + "qa": "npm-run-all lint _build test", "reset": "npx rimraf dist embark-*.tgz package", "solo": "embark-solo", "test": "jest" @@ -71,7 +71,7 @@ "**/test/**/*.js" ], "transform": { - "\\.js$": [ + "\\.(js|ts)$": [ "babel-jest", { "rootMode": "upward" diff --git a/packages/stack/blockchain/test/index.js b/packages/stack/blockchain/test/index.js new file mode 100644 index 000000000..44c4727e6 --- /dev/null +++ b/packages/stack/blockchain/test/index.js @@ -0,0 +1,7 @@ +import Blockchain from '../src/index'; + +describe('needs tests', () => { + it('should have tests, please write them', () => { + expect(true).toBe(true); + }); +}); diff --git a/packages/utils/solo/index.js b/packages/utils/solo/index.js index 75954f822..28eddca4d 100644 --- a/packages/utils/solo/index.js +++ b/packages/utils/solo/index.js @@ -24,7 +24,7 @@ module.exports = function (cliArgs) { join(embarkCollectivePath, 'package.json') ); - const npxCmd = process.platform === 'win32' ? 'npx.cmd': 'npx'; + const npmCmd = process.platform === 'win32' ? 'npm.cmd': 'npm'; process.chdir(embarkCollectivePath); - spawn(npxCmd, ['run', '--', ...cliArgs], {stdio: 'inherit'}); + spawn(npmCmd, ['run', '--', ...cliArgs], {stdio: 'inherit'}); };