Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Lock dependencies #504

Merged
merged 5 commits into from
Feb 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ dist/
dist-web/
node_modules/
docs-build/
*.tgz

#cypress artifacts
cypress/screenshots/
Expand Down
8 changes: 7 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
dist/**/*.test.*
dist-web/
docs/
cypress.json
cypress/
examples/
scripts/
src/
src/**/*.ts
src/**/*.js
src/tests/
reports/
.babelrc
.eslintrc.json
.github/
Expand All @@ -20,5 +25,6 @@ tsconfig.*.json
tslint.json
typedoc.json
webpack.*.js
*.tgz
yarn.lock
yarn-error.log
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ deploy:
- ./scripts/publish-tag.sh $PUBLISH_NPM_LATEST_FROM
on:
tags: true
condition: $TRAVIS_IS_LATEST_TAG = true # sourced from ./scripts/is_latest.sh
condition: $TRAVIS_IS_LATEST_TAG = true # sourced from ./scripts/is_latest.sh
7 changes: 4 additions & 3 deletions cypress/integration/index.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ describe('eosjs web test', () => {
});
it('runs all tests successfully', () => {
cy.visit(('./src/tests/web.html'))
cy.get('div.tests>div>button').each((test) => {
cy.wrap(test).click();
cy.wrap(test).contains('Success', { timeout: 5000 })
cy.get('div.tests>div>button').each((test) => { // iterate through all the tests
cy.wrap(test).click(); // click the button to start the test
cy.wrap(test).contains('Success', { timeout: 5000 }); // wait 5 seconds for success or treat as failure
cy.wait(500); // allow time for transaction to confirm (prevents duplicate transactions)
});
});
})
49 changes: 25 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@
"scripts": {
"cypress": "./scripts/run-cypress.sh",
"cypress-ui": "./scripts/run-cypress.sh ui",
"prepare": "npm run build",
"lint": "tslint -c tslint.json -p tsconfig.json",
"lint-fix": "tslint -c tslint.json -p tsconfig.json --fix",
"test": "jest src/tests/*eosjs*",
"test-node": "jest src/tests/*node*",
"test-all": "yarn test && yarn test-node && yarn cypress",
"build": "tsc -p ./tsconfig.json && cp src/ripemd.es5.js dist/ripemd.js",
"build-web": "webpack --config webpack.prod.js && webpack --config webpack.debug.js",
"build-production": "yarn test-all && yarn build && yarn build-web",
"build-production": "yarn build && yarn build-web && yarn test-all",
"clean": "rm -rf dist",
"docs-init": "sh .docs/scripts/init.sh",
"docs-build": "sh .docs/scripts/build.sh",
Expand All @@ -27,32 +28,32 @@
"url": "https://github.com/EOSIO/eosjs.git"
},
"dependencies": {
"babel-runtime": "^6.26.0",
"eosjs-ecc": "^4.0.1",
"text-encoding": "^0.6.4"
"babel-runtime": "6.26.0",
"eosjs-ecc": "4.0.4",
"text-encoding": "0.7.0"
},
"devDependencies": {
"@blockone/tslint-config-blockone": "^2.0.0",
"@types/jest": "23.3.1",
"@types/node": "^10.3.1",
"@types/text-encoding": "^0.0.35",
"babel-cli": "^6.26.0",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-env": "^1.7.0",
"babel-preset-stage-1": "^6.24.1",
"cypress": "^3.1.5",
"@blockone/tslint-config-blockone": "2.0.0",
"@types/jest": "24.0.6",
"@types/node": "11.9.4",
"@types/text-encoding": "0.0.35",
"babel-cli": "6.26.0",
"babel-plugin-transform-runtime": "6.23.0",
"babel-preset-env": "1.7.0",
"babel-preset-stage-1": "6.24.1",
"cypress": "3.1.5",
"jest": "23.5.0",
"jest-fetch-mock": "^1.6.5",
"json-loader": "^0.5.7",
"mocha": "^5.2.0",
"mochawesome": "^3.1.1",
"ts-jest": "23.1.4",
"ts-loader": "^4.3.1",
"tslint": "^5.11.0",
"tslint-eslint-rules": "^5.4.0",
"typescript": "^2.9.1",
"webpack": "^4.11.0",
"webpack-cli": "^3.0.2"
"jest-fetch-mock": "2.1.1",
"json-loader": "0.5.7",
"mocha": "5.2.0",
"mochawesome": "3.1.1",
"ts-jest": "24.0.0",
"ts-loader": "5.3.3",
"tslint": "5.12.1",
"tslint-eslint-rules": "5.4.0",
"typescript": "3.3.3",
"webpack": "4.29.5",
"webpack-cli": "3.2.3"
},
"jest": {
"automock": false,
Expand Down
2 changes: 1 addition & 1 deletion src/abi.abi.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,4 +190,4 @@
]
}
]
}
}
2 changes: 1 addition & 1 deletion src/tests/node.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ describe('Node JS environment', () => {
it('transacts with manually configured TAPOS fields', async () => {
transactionResponse = await tests.transactWithoutConfig();
expect(Object.keys(transactionResponse)).toContain('transaction_id');
});
}, 10000);

it('transacts without broadcasting, returning signatures and packed transaction', async () => {
transactionSignatures = await tests.transactWithoutBroadcast();
Expand Down
2 changes: 1 addition & 1 deletion src/transaction.abi.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,4 @@
]
}
]
}
}
1 change: 1 addition & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"moduleResolution": "node",
"declaration": true,
"downlevelIteration": true,
"skipLibCheck": true,
"lib": [
"es2017",
"dom"
Expand Down
Loading