Skip to content
This repository was archived by the owner on Mar 8, 2020. It is now read-only.
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
16 changes: 14 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,21 @@
sudo: false
os:
- osx
- linux

language: node_js
node_js:
- '6'
- '8'
dist: trusty

before_install:
- if [ $TRAVIS_OS_NAME == "linux" ]; then
export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:99.0;
sh -e /etc/init.d/xvfb start;
sleep 3;
fi
install: |
./.travis/install.sh
./.travis/install.sh
script: |
./.travis/script.sh
deploy:
Expand Down
3 changes: 2 additions & 1 deletion .travis/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ set -o pipefail

cd ./server
npm run compile:server
npm test --silent

cd ../client

npm run package:vsix
npm install -g vsce

npm test 2>&1 | tee
npm test --silent
18 changes: 18 additions & 0 deletions client/.vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,24 @@
{
"version": "0.2.0",
"configurations": [
{
"type": "node",
"request": "launch",
"name": "Mocha Tests",
"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
"args": [
"-u",
"tdd",
"--no-timeouts",
"--compilers",
"ts:ts-node/register",
"--colors",
"${workspaceFolder}/test/**/*.test.ts"
],
"cwd": "${workspaceFolder}",
"protocol": "inspector",
"internalConsoleOptions": "openOnSessionStart"
},
{
"name": "Launch Client Extension",
"type": "extensionHost",
Expand Down
1 change: 1 addition & 0 deletions client/.vscodeignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@ test/**
src/**
**/*.map
.gitignore
.eslintignore
tsconfig.json
vsc-extension-quickstart.md
51 changes: 43 additions & 8 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"publisher": "HyperledgerComposer",
"icon": "icon.png",
"engines": {
"vscode": "^1.15.1"
"vscode": "^1.19.2"
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -248,21 +248,56 @@
},
"scripts": {
"compile:client": "tsc -p ./",
"watch:client": "tsc -w -p ./",
"watch:client": "tsc -w -p ./",
"update-vscode": "node ./node_modules/vscode/bin/install",
"postinstall": "node ./node_modules/vscode/bin/install",
"package:vsix": "node ./node_modules/vsce/out/vsce package",
"prepublish": "tsc -p ./",
"test": ""
"pretest": "npm run lint",
"test": "nyc node ./node_modules/vscode/bin/test --compilers ts:ts-node/register ./test/*.test.ts",
"tslint": "tslint",
"lint": "npm run tslint 'src/**/*.ts' 'test/extension.test.ts'"
},
"devDependencies": {
"@types/chai": "^3.5.2",
"@types/mocha": "^2.2.33",
"@types/node": "^6.0.52",
"typescript": "^2.1.5",
"vscode": "^1.1.5",
"vsce": "^1.30.0"
"angular-tslint-rules": "^1.2.1",
"chai": "^4.1.2",
"mocha": "^5.0.0",
"nyc": "^11.4.1",
"ts-node": "^4.1.0",
"tslint": "^5.9.1",
"tslint-loader": "^3.3.0",
"typescript": "^2.6.2",
"vsce": "^1.30.0",
"vscode": "^1.1.5"
},
"dependencies": {
"vscode-languageclient": "^3.3.0"
"vscode-languageclient": "^3.5.0"
},
"nyc": {
"include": [
"src/**/*.ts",
"test/data"
],
"extension": [
".ts"
],
"exclude": [
"out/**",
"server/**",
"coverage/**"
],
"reporter": [
"text-summary",
"html"
],
"all": true,
"check-coverage": true,
"statements": 0,
"branches": 0,
"functions": 0,
"lines": 0
}
}
}
Loading