...
 
Commits (3)
......@@ -4,29 +4,15 @@ stages:
before_script:
- yarn
- mkdir -p packages/{clients/web,core/{client,plugin,server,shared},locales/{eo,fr}/{client,shared,plugin},plugins/{barter,basesys,mutcredit,nedb}}/dist
- yarn lerna link
- npx lerna exec -- mkdir -p dist/
- npx lerna link
build:
stage: build
tags:
- duniter
script:
- yarn --cwd packages/core/shared/ build
- yarn --cwd packages/core/plugin/ build
- yarn --cwd packages/plugins/nedb/ build
- yarn --cwd packages/plugins/basesys/ build
- yarn --cwd packages/plugins/barter/ build
- yarn --cwd packages/plugins/mutcredit/ build
- yarn --cwd packages/core/client/ build
- yarn --cwd packages/clients/web/ build
- yarn --cwd packages/core/server/ build
- yarn --cwd packages/locales/fr/shared/ build
- yarn --cwd packages/locales/fr/client/ build
- yarn --cwd packages/locales/fr/plugin/ build
- yarn --cwd packages/locales/eo/shared/ build
- yarn --cwd packages/locales/eo/client/ build
- yarn --cwd packages/locales/eo/plugin/ build
- npx lerna run build
artifacts:
paths:
- packages/clients/*/dist
......@@ -42,7 +28,7 @@ test:
dependencies:
- build
script:
- yarn lerna exec yarn test
- npx lerna run --parallel test
- rm -rf .nyc_output && mkdir .nyc_output
- cp packages/{clients/web,core/{client,plugin,server,shared},locales/{eo,fr}/{client,shared,plugin},plugins/{barter,basesys,mutcredit,nedb}}/.nyc_output/* .nyc_output/
- yarn nyc report --reporter=text-summary
- npx lerna exec -- "if [ -d .nyc_output ] && [ ! -z \"\$(ls .nyc_output)\" ]; then cp .nyc_output/* ${PWD}/.nyc_output/; fi"
- npx nyc report --reporter=text-summary
......@@ -7,9 +7,6 @@
"packages/**"
]
},
"scripts": {
"lerna": "lerna"
},
"keywords": [
"gecogvidanto",
"geconomicus",
......@@ -18,7 +15,8 @@
"author": "Stéphane Veyret",
"license": "GPL-3.0+",
"devDependencies": {
"lerna": "3.10.7"
"lerna": "3.10.7",
"nyc": "13.1.0"
},
"resolutions": {
"@types/react": "16.8.4"
......
......@@ -50,22 +50,22 @@
"license": "GPL-3.0+",
"dependencies": {
"@gecogvidanto/client": "^1.0.0",
"@material-ui/core": "3.9.0",
"@material-ui/core": "3.9.2",
"@material-ui/icons": "3.0.2",
"classnames": "2.2.6",
"deepmerge": "3.1.0",
"deepmerge": "3.2.0",
"is-plain-object": "2.0.4",
"mobx": "5.9.0",
"mobx-loadable": "1.0.1",
"mobx-react": "5.4.3",
"path-to-regexp": "3.0.0",
"places.js": "1.15.4",
"react": "16.7.0",
"react-dom": "16.7.0",
"places.js": "1.15.5",
"react": "16.8.3",
"react-dom": "16.8.3",
"react-jss": "8.6.1",
"react-router": "4.3.1",
"react-router-dom": "4.3.1",
"recharts": "1.4.2",
"recharts": "1.5.0",
"socket.io-client": "2.2.0",
"spu-md5": "0.0.3",
"ts-deferred": "1.0.4",
......@@ -76,7 +76,7 @@
"intl-ts": "^3.0.0"
},
"devDependencies": {
"@babel/core": "7.2.2",
"@babel/core": "7.3.3",
"@babel/polyfill": "7.2.5",
"@babel/preset-env": "7.3.1",
"@babel/preset-react": "7.0.0",
......@@ -86,19 +86,19 @@
"@types/chai-as-promised": "7.1.0",
"@types/classnames": "2.2.7",
"@types/html-webpack-plugin": "3.2.0",
"@types/mocha": "5.2.5",
"@types/node": "10.12.18",
"@types/react": "16.7.20",
"@types/react-dom": "16.0.11",
"@types/react-jss": "8.6.0",
"@types/react-router": "4.4.3",
"@types/mocha": "5.2.6",
"@types/node": "11.9.5",
"@types/react": "16.8.4",
"@types/react-dom": "16.8.2",
"@types/react-jss": "8.6.3",
"@types/react-router": "4.4.4",
"@types/react-router-dom": "4.3.1",
"@types/recharts": "1.1.9",
"@types/sinon": "7.0.4",
"@types/recharts": "1.1.13",
"@types/sinon": "7.0.6",
"@types/sinon-chai": "3.2.2",
"@types/socket.io-client": "1.4.32",
"@types/webpack": "4.4.24",
"@types/webpack-dev-server": "3.1.1",
"@types/webpack-dev-server": "3.1.2",
"@types/webpack-merge": "4.1.3",
"babel-loader": "8.0.5",
"chai": "4.2.0",
......@@ -110,24 +110,24 @@
"html-webpack-harddisk-plugin": "1.0.1",
"html-webpack-plugin": "3.2.0",
"intl-ts": "3.2.0",
"mocha": "5.2.0",
"nyc": "13.1.0",
"mocha": "6.0.1",
"nyc": "13.3.0",
"rimraf": "2.6.3",
"sinon": "7.2.3",
"sinon": "7.2.4",
"sinon-chai": "3.3.0",
"style-loader": "0.23.1",
"ts-loader": "5.3.3",
"ts-node": "8.0.1",
"ts-node": "8.0.2",
"ts-transform-asset": "1.0.1",
"tsconfig-paths-webpack-plugin": "3.2.0",
"tslint": "5.12.1",
"tslint": "5.13.0",
"tslint-react": "3.6.0",
"ttypescript": "1.5.6",
"typescript": "3.2.4",
"typescript": "3.3.3333",
"uglify-js": "3.4.9",
"webpack": "4.29.0",
"webpack-cli": "3.2.1",
"webpack-dev-server": "3.1.14",
"webpack": "4.29.5",
"webpack-cli": "3.2.3",
"webpack-dev-server": "3.2.0",
"webpack-merge": "4.2.1"
}
}
......@@ -107,7 +107,6 @@ class GamePlay extends Component<Props, State> {
toolsStore,
userStore,
classes,
innerRef,
...routerProps
} = this.props
const { state, formOption } = gamePlayStore
......
......@@ -63,28 +63,28 @@
"@gecogvidanto/tslint": "^1.0.0",
"@types/chai": "4.1.7",
"@types/chai-as-promised": "7.1.0",
"@types/mocha": "5.2.5",
"@types/mocha": "5.2.6",
"@types/moxios": "0.4.8",
"@types/node": "10.12.18",
"@types/node": "11.9.5",
"@types/qs": "6.5.1",
"@types/react": "16.7.20",
"@types/react-test-renderer": "16.0.3",
"@types/react": "16.8.4",
"@types/react-test-renderer": "16.8.1",
"chai": "4.2.0",
"chai-as-promised": "7.1.1",
"foreach-cli": "1.8.1",
"intl-ts": "3.2.0",
"jsdom": "13.2.0",
"jsdom-global": "3.0.2",
"mocha": "5.2.0",
"mocha": "6.0.1",
"moxios": "0.4.0",
"npm-watch": "0.6.0",
"nyc": "13.1.0",
"react": "16.7.0",
"react-test-renderer": "16.7.0",
"nyc": "13.3.0",
"react": "16.8.3",
"react-test-renderer": "16.8.3",
"rimraf": "2.6.3",
"ts-node": "8.0.1",
"tslint": "5.12.1",
"typescript": "3.2.4",
"ts-node": "8.0.2",
"tslint": "5.13.0",
"typescript": "3.3.3333",
"uglify-js": "3.4.9"
}
}
......@@ -34,6 +34,7 @@ chai.use(chaiAsPromised)
const SECRET_TOKEN = 'AVerySecretToken'
describe('SecurityApi', function() {
this.timeout(5000) // Can sometimes be very slow
this.slow(400)
let securityApi: SecurityApi
let cleanJSDom: any
......
......@@ -55,15 +55,15 @@
"@gecogvidanto/shared": "^1.0.0",
"@gecogvidanto/tslint": "^1.0.0",
"@types/chai": "4.1.7",
"@types/mocha": "5.2.5",
"@types/mocha": "5.2.6",
"chai": "4.2.0",
"intl-ts": "3.2.0",
"mocha": "5.2.0",
"mocha": "6.0.1",
"npm-watch": "0.6.0",
"nyc": "13.1.0",
"nyc": "13.3.0",
"rimraf": "2.6.3",
"ts-node": "8.0.1",
"tslint": "5.12.1",
"typescript": "3.2.4"
"ts-node": "8.0.2",
"tslint": "5.13.0",
"typescript": "3.3.3333"
}
}
......@@ -55,12 +55,12 @@
"@gecogvidanto/client-web": "^1.0.0",
"@gecogvidanto/plugin": "^1.0.0",
"@gecogvidanto/shared": "^1.0.0",
"bcrypt": "3.0.3",
"bcrypt": "3.0.4",
"body-parser": "1.18.3",
"cross-env": "5.2.0",
"express": "4.16.4",
"express-session": "1.15.6",
"helmet": "3.15.0",
"helmet": "3.15.1",
"intl-ts": "3.2.0",
"js-yaml": "3.12.1",
"nodemailer": "5.1.1",
......@@ -69,7 +69,7 @@
"passport-local": "1.0.0",
"pug": "2.0.3",
"socket.io": "2.2.0",
"winston": "3.1.0"
"winston": "3.2.1"
},
"devDependencies": {
"@gecogvidanto/tslint": "^1.0.0",
......@@ -78,29 +78,29 @@
"@types/chai": "4.1.7",
"@types/chai-as-promised": "7.1.0",
"@types/express": "4.16.1",
"@types/express-session": "1.15.11",
"@types/express-session": "1.15.12",
"@types/helmet": "0.0.42",
"@types/js-yaml": "3.12.0",
"@types/mocha": "5.2.5",
"@types/node": "10.12.18",
"@types/nodemailer": "4.6.5",
"@types/mocha": "5.2.6",
"@types/node": "11.9.5",
"@types/nodemailer": "4.6.6",
"@types/nodemailer-smtp-transport": "2.7.4",
"@types/passport": "1.0.0",
"@types/passport-local": "1.0.33",
"@types/sinon": "7.0.4",
"@types/sinon": "7.0.6",
"@types/sinon-chai": "3.2.2",
"@types/socket.io": "^2.1.0",
"chai": "4.2.0",
"chai-as-promised": "7.1.1",
"copyfiles": "2.1.0",
"mocha": "5.2.0",
"mocha": "6.0.1",
"npm-watch": "0.6.0",
"nyc": "13.1.0",
"nyc": "13.3.0",
"rimraf": "2.6.3",
"sinon": "7.2.3",
"sinon": "7.2.4",
"sinon-chai": "3.3.0",
"ts-node": "8.0.1",
"tslint": "5.12.1",
"typescript": "3.2.4"
"ts-node": "8.0.2",
"tslint": "5.13.0",
"typescript": "3.3.3333"
}
}
......@@ -104,7 +104,7 @@ function outputFormatter(format: string): (info: TransformableInfo) => string {
function buildOutput(type: 'json' | 'printf', format: string | number): Format {
switch (type) {
case 'json':
return winston.format.json({ spaces: format })
return winston.format.json({ space: Number(format) })
case 'printf':
return winston.format.printf(outputFormatter(format.toString()))
default:
......@@ -130,7 +130,9 @@ function buildLogger(definition: LoggerDefinition): Transport {
}
return { key, reworked }
})
.map(({ key, reworked }) => winston.format[key](reworked))
.map(({ key, reworked }) =>
(winston.format[key] as (f: any) => Format)(reworked)
)
)
formats.push(buildOutput(definition.output.type, definition.output.format))
......
......@@ -56,18 +56,18 @@
"@gecogvidanto/tslint": "^1.0.0",
"@types/chai": "4.1.7",
"@types/chai-as-promised": "7.1.0",
"@types/mocha": "5.2.5",
"@types/mocha": "5.2.6",
"chai": "4.2.0",
"chai-as-promised": "7.1.1",
"foreach-cli": "1.8.1",
"intl-ts": "3.2.0",
"mocha": "5.2.0",
"mocha": "6.0.1",
"npm-watch": "0.6.0",
"nyc": "13.1.0",
"nyc": "13.3.0",
"rimraf": "2.6.3",
"ts-node": "8.0.1",
"tslint": "5.12.1",
"typescript": "3.2.4",
"ts-node": "8.0.2",
"tslint": "5.13.0",
"typescript": "3.3.3333",
"uglify-js": "3.4.9"
}
}
......@@ -57,19 +57,19 @@
"@gecogvidanto/client": "^1.0.0",
"@gecogvidanto/tslint": "^1.0.0",
"@types/chai": "4.1.7",
"@types/mocha": "5.2.5",
"@types/react": "16.7.20",
"@types/mocha": "5.2.6",
"@types/react": "16.8.4",
"chai": "4.2.0",
"foreach-cli": "1.8.1",
"intl-ts": "3.2.0",
"mocha": "5.2.0",
"mocha": "6.0.1",
"npm-watch": "0.6.0",
"nyc": "13.1.0",
"react": "16.7.0",
"nyc": "13.3.0",
"react": "16.8.3",
"rimraf": "2.6.3",
"ts-node": "8.0.1",
"tslint": "5.12.1",
"typescript": "3.2.4",
"ts-node": "8.0.2",
"tslint": "5.13.0",
"typescript": "3.3.3333",
"uglify-js": "3.4.9"
}
}
......@@ -67,18 +67,18 @@
"@gecogvidanto/shared": "^1.0.0",
"@gecogvidanto/tslint": "^1.0.0",
"@types/chai": "4.1.7",
"@types/mocha": "5.2.5",
"@types/node": "10.12.18",
"@types/mocha": "5.2.6",
"@types/node": "11.9.5",
"chai": "4.2.0",
"foreach-cli": "1.8.1",
"intl-ts": "3.2.0",
"mocha": "5.2.0",
"mocha": "6.0.1",
"npm-watch": "0.6.0",
"nyc": "13.1.0",
"nyc": "13.3.0",
"rimraf": "2.6.3",
"ts-node": "8.0.1",
"tslint": "5.12.1",
"typescript": "3.2.4",
"ts-node": "8.0.2",
"tslint": "5.13.0",
"typescript": "3.3.3333",
"uglify-js": "3.4.9"
}
}
......@@ -54,17 +54,17 @@
"@gecogvidanto/shared": "^1.0.0",
"@gecogvidanto/tslint": "^1.0.0",
"@types/chai": "4.1.7",
"@types/mocha": "5.2.5",
"@types/mocha": "5.2.6",
"chai": "4.2.0",
"foreach-cli": "1.8.1",
"intl-ts": "3.2.0",
"mocha": "5.2.0",
"mocha": "6.0.1",
"npm-watch": "0.6.0",
"nyc": "13.1.0",
"nyc": "13.3.0",
"rimraf": "2.6.3",
"ts-node": "8.0.1",
"tslint": "5.12.1",
"typescript": "3.2.4",
"ts-node": "8.0.2",
"tslint": "5.13.0",
"typescript": "3.3.3333",
"uglify-js": "3.4.9"
}
}
......@@ -58,19 +58,19 @@
"@gecogvidanto/client": "^1.0.0",
"@gecogvidanto/tslint": "^1.0.0",
"@types/chai": "4.1.7",
"@types/mocha": "5.2.5",
"@types/react": "16.7.20",
"@types/mocha": "5.2.6",
"@types/react": "16.8.4",
"chai": "4.2.0",
"foreach-cli": "1.8.1",
"intl-ts": "3.2.0",
"mocha": "5.2.0",
"mocha": "6.0.1",
"npm-watch": "0.6.0",
"nyc": "13.1.0",
"react": "16.7.0",
"nyc": "13.3.0",
"react": "16.8.3",
"rimraf": "2.6.3",
"ts-node": "8.0.1",
"tslint": "5.12.1",
"typescript": "3.2.4",
"ts-node": "8.0.2",
"tslint": "5.13.0",
"typescript": "3.3.3333",
"uglify-js": "3.4.9"
}
}
......@@ -68,18 +68,18 @@
"@gecogvidanto/shared": "^1.0.0",
"@gecogvidanto/tslint": "^1.0.0",
"@types/chai": "4.1.7",
"@types/mocha": "5.2.5",
"@types/node": "10.12.18",
"@types/mocha": "5.2.6",
"@types/node": "11.9.5",
"chai": "4.2.0",
"foreach-cli": "1.8.1",
"intl-ts": "3.2.0",
"mocha": "5.2.0",
"mocha": "6.0.1",
"npm-watch": "0.6.0",
"nyc": "13.1.0",
"nyc": "13.3.0",
"rimraf": "2.6.3",
"ts-node": "8.0.1",
"tslint": "5.12.1",
"typescript": "3.2.4",
"ts-node": "8.0.2",
"tslint": "5.13.0",
"typescript": "3.3.3333",
"uglify-js": "3.4.9"
}
}
......@@ -55,17 +55,17 @@
"@gecogvidanto/shared": "^1.0.0",
"@gecogvidanto/tslint": "^1.0.0",
"@types/chai": "4.1.7",
"@types/mocha": "5.2.5",
"@types/mocha": "5.2.6",
"chai": "4.2.0",
"foreach-cli": "1.8.1",
"intl-ts": "3.2.0",
"mocha": "5.2.0",
"mocha": "6.0.1",
"npm-watch": "0.6.0",
"nyc": "13.1.0",
"nyc": "13.3.0",
"rimraf": "2.6.3",
"ts-node": "8.0.1",
"tslint": "5.12.1",
"typescript": "3.2.4",
"ts-node": "8.0.2",
"tslint": "5.13.0",
"typescript": "3.3.3333",
"uglify-js": "3.4.9"
}
}
......@@ -59,17 +59,17 @@
"@gecogvidanto/tslint": "^1.0.0",
"@types/chai": "4.1.7",
"@types/chai-as-promised": "7.1.0",
"@types/mocha": "5.2.5",
"@types/node": "10.12.18",
"@types/mocha": "5.2.6",
"@types/node": "11.9.5",
"chai": "4.2.0",
"chai-as-promised": "7.1.1",
"intl-ts": "3.2.0",
"mocha": "5.2.0",
"mocha": "6.0.1",
"npm-watch": "0.6.0",
"nyc": "13.1.0",
"nyc": "13.3.0",
"rimraf": "2.6.3",
"ts-node": "8.0.1",
"tslint": "5.12.1",
"typescript": "3.2.4"
"ts-node": "8.0.2",
"tslint": "5.13.0",
"typescript": "3.3.3333"
}
}
......@@ -63,9 +63,9 @@
"@gecogvidanto/tslint": "^1.0.0",
"@types/chai": "4.1.7",
"@types/chai-as-promised": "7.1.0",
"@types/mocha": "5.2.5",
"@types/node": "10.12.18",
"@types/sinon": "7.0.4",
"@types/mocha": "5.2.6",
"@types/node": "11.9.5",
"@types/sinon": "7.0.6",
"@types/sinon-chai": "3.2.2",
"chai": "4.2.0",
"chai-as-promised": "7.1.1",
......@@ -73,15 +73,15 @@
"cross-env": "5.2.0",
"foreach-cli": "1.8.1",
"intl-ts": "3.2.0",
"mocha": "5.2.0",
"mocha": "6.0.1",
"npm-watch": "0.6.0",
"nyc": "13.1.0",
"nyc": "13.3.0",
"rimraf": "2.6.3",
"sinon": "7.2.3",
"sinon": "7.2.4",
"sinon-chai": "3.3.0",
"ts-node": "8.0.1",
"tslint": "5.12.1",
"typescript": "3.2.4",
"ts-node": "8.0.2",
"tslint": "5.13.0",
"typescript": "3.3.3333",
"uglify-js": "3.4.9"
}
}
......@@ -59,17 +59,17 @@
"@gecogvidanto/tslint": "^1.0.0",
"@types/chai": "4.1.7",
"@types/chai-as-promised": "7.1.0",
"@types/mocha": "5.2.5",
"@types/node": "10.12.18",
"@types/mocha": "5.2.6",
"@types/node": "11.9.5",
"chai": "4.2.0",
"chai-as-promised": "7.1.1",
"intl-ts": "3.2.0",
"mocha": "5.2.0",
"mocha": "6.0.1",
"npm-watch": "0.6.0",
"nyc": "13.1.0",
"nyc": "13.3.0",
"rimraf": "2.6.3",
"ts-node": "8.0.1",
"tslint": "5.12.1",
"typescript": "3.2.4"
"ts-node": "8.0.2",
"tslint": "5.13.0",
"typescript": "3.3.3333"
}
}
......@@ -63,21 +63,21 @@
"@gecogvidanto/tslint": "^1.0.0",
"@types/chai": "4.1.7",
"@types/chai-as-promised": "7.1.0",
"@types/mocha": "5.2.5",
"@types/mocha": "5.2.6",
"@types/nedb": "1.8.7",
"@types/node": "10.12.18",
"@types/tmp": "0.0.33",
"@types/node": "11.9.5",
"@types/tmp": "0.0.34",
"chai": "4.2.0",
"chai-as-promised": "7.1.1",
"intl-ts": "3.2.0",
"mocha": "5.2.0",
"mocha": "6.0.1",
"npm-watch": "0.6.0",
"nyc": "13.1.0",
"nyc": "13.3.0",
"rimraf": "2.6.3",
"tmp": "0.0.33",
"ts-node": "8.0.1",
"tslint": "5.12.1",
"typescript": "3.2.4",
"winston": "3.1.0"
"ts-node": "8.0.2",
"tslint": "5.13.0",
"typescript": "3.3.3333",
"winston": "3.2.1"
}
}