Skip to content

Commit

Permalink
merge latest
Browse files Browse the repository at this point in the history
  • Loading branch information
gottfired committed Oct 21, 2019
1 parent 75760cc commit ae7eb13
Show file tree
Hide file tree
Showing 25 changed files with 122 additions and 123 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
### Master
* ...

### 2.0.1
### 2.0.1-2.0.4
* fix cls.test

### 2.0.0
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"hoist": true,
"npmClient": "yarn",
"useWorkspaces": true,
"version": "2.0.2"
"version": "2.0.4"
}
2 changes: 1 addition & 1 deletion packages/aaa-build-tools/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aaa-backend-stack/build-tools",
"version": "2.0.0",
"version": "2.0.4",
"description": "base tools for env sourcing and building cli tools",
"license": "MIT",
"author": "all about apps",
Expand Down
3 changes: 1 addition & 2 deletions packages/aaa-build-tools/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import * as dotenv from "dotenv";

export function setupDefaultEnv(absolutePathToEnvFile: string) {

const result = dotenv.config({
dotenv.config({
path: absolutePathToEnvFile
});

Expand All @@ -44,7 +44,6 @@ export function setupDefaultEnv(absolutePathToEnvFile: string) {
if (!process.env.HIDE_AAA_BUILD_TOOLS_INFO) {
console.log(`Running in node@${process.version} (NODE_ENV=${process.env.NODE_ENV} @aaa-backend-stack/build-tools@v${pkg.version}).`);
}

}

export {
Expand Down
8 changes: 4 additions & 4 deletions packages/aaa-devtools/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aaa-backend-stack/devtools",
"version": "2.0.0",
"version": "2.0.4",
"description": "Websocket devtools which integrates with aaa logger (pipes logs from stdout)",
"license": "MIT",
"author": "all about apps",
Expand All @@ -16,8 +16,8 @@
"test": "exit 0"
},
"dependencies": {
"@aaa-backend-stack/build-tools": "^2.0.0",
"@aaa-backend-stack/git-info": "^2.0.0",
"@aaa-backend-stack/build-tools": "^2.0.4",
"@aaa-backend-stack/git-info": "^2.0.4",
"@types/lodash": "4.14.144",
"@types/ws": "3.0.2",
"bufferutil": "4.0.1",
Expand All @@ -26,7 +26,7 @@
"ws": "3.2.0"
},
"devDependencies": {
"@aaa-backend-stack/test-environment": "^2.0.0",
"@aaa-backend-stack/test-environment": "^2.0.4",
"@aaa-backend-stack/tslint-rules": "^1.16.7",
"tslint": "5.11.0",
"typescript": "3.6.4"
Expand Down
8 changes: 4 additions & 4 deletions packages/aaa-example-lib/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aaa-backend-stack/example-lib",
"version": "2.0.0",
"version": "2.0.4",
"private": true,
"description": "Example Lib",
"license": "MIT",
Expand All @@ -17,11 +17,11 @@
"test": "exit 0"
},
"dependencies": {
"@aaa-backend-stack/build-tools": "^2.0.0",
"@aaa-backend-stack/utils": "^2.0.0"
"@aaa-backend-stack/build-tools": "^2.0.4",
"@aaa-backend-stack/utils": "^2.0.4"
},
"devDependencies": {
"@aaa-backend-stack/test-environment": "^2.0.0",
"@aaa-backend-stack/test-environment": "^2.0.4",
"@aaa-backend-stack/tslint-rules": "^1.16.7",
"tslint": "5.11.0",
"typescript": "3.6.4"
Expand Down
12 changes: 6 additions & 6 deletions packages/aaa-file-storage-local/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aaa-backend-stack/file-storage-local",
"version": "2.0.0",
"version": "2.0.4",
"description": "File storage service implementation using local file system",
"license": "MIT",
"author": "all about apps",
Expand All @@ -16,17 +16,17 @@
"test": "exit 0"
},
"dependencies": {
"@aaa-backend-stack/build-tools": "^2.0.0",
"@aaa-backend-stack/file-storage": "^2.0.0",
"@aaa-backend-stack/logger": "^2.0.0",
"@aaa-backend-stack/utils": "^2.0.0",
"@aaa-backend-stack/build-tools": "^2.0.4",
"@aaa-backend-stack/file-storage": "^2.0.4",
"@aaa-backend-stack/logger": "^2.0.4",
"@aaa-backend-stack/utils": "^2.0.4",
"@types/lodash": "4.14.144",
"@types/url-join": "0.8.2",
"lodash": "4.17.15",
"url-join": "4.0.0"
},
"devDependencies": {
"@aaa-backend-stack/test-environment": "^2.0.0",
"@aaa-backend-stack/test-environment": "^2.0.4",
"@aaa-backend-stack/tslint-rules": "^1.16.7",
"tslint": "5.11.0",
"typescript": "3.6.4"
Expand Down
12 changes: 6 additions & 6 deletions packages/aaa-file-storage-s3/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aaa-backend-stack/file-storage-s3",
"version": "2.0.0",
"version": "2.0.4",
"description": "File storage service implementation using Amazon S3 buckets (or compatible servers)",
"license": "MIT",
"author": "all about apps",
Expand All @@ -16,18 +16,18 @@
"test": "exit 0"
},
"dependencies": {
"@aaa-backend-stack/build-tools": "^2.0.0",
"@aaa-backend-stack/file-storage": "^2.0.0",
"@aaa-backend-stack/logger": "^2.0.0",
"@aaa-backend-stack/utils": "^2.0.0",
"@aaa-backend-stack/build-tools": "^2.0.4",
"@aaa-backend-stack/file-storage": "^2.0.4",
"@aaa-backend-stack/logger": "^2.0.4",
"@aaa-backend-stack/utils": "^2.0.4",
"@types/lodash": "4.14.144",
"@types/url-join": "0.8.2",
"aws-sdk": "2.311.0",
"lodash": "4.17.15",
"url-join": "4.0.0"
},
"devDependencies": {
"@aaa-backend-stack/test-environment": "^2.0.0",
"@aaa-backend-stack/test-environment": "^2.0.4",
"@aaa-backend-stack/tslint-rules": "^1.16.7",
"tslint": "5.11.0",
"typescript": "3.6.4"
Expand Down
4 changes: 2 additions & 2 deletions packages/aaa-file-storage/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aaa-backend-stack/file-storage",
"version": "2.0.0",
"version": "2.0.4",
"description": "High level API for a file storage service, actual implementation provided in separate packages",
"license": "MIT",
"author": "all about apps",
Expand All @@ -16,7 +16,7 @@
"test": "exit 0"
},
"dependencies": {
"@aaa-backend-stack/build-tools": "^2.0.0"
"@aaa-backend-stack/build-tools": "^2.0.4"
},
"devDependencies": {
"@aaa-backend-stack/tslint-rules": "^1.16.7",
Expand Down
6 changes: 3 additions & 3 deletions packages/aaa-git-info/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aaa-backend-stack/git-info",
"version": "2.0.0",
"version": "2.0.4",
"description": "Reads base directory to get current git commit information",
"license": "MIT",
"author": "all about apps",
Expand All @@ -16,11 +16,11 @@
"test": "exit 0"
},
"dependencies": {
"@aaa-backend-stack/build-tools": "^2.0.0",
"@aaa-backend-stack/build-tools": "^2.0.4",
"git-rev-sync": "1.9.1"
},
"devDependencies": {
"@aaa-backend-stack/test-environment": "^2.0.0",
"@aaa-backend-stack/test-environment": "^2.0.4",
"@aaa-backend-stack/tslint-rules": "^1.16.7",
"tslint": "5.11.0",
"typescript": "3.6.4"
Expand Down
14 changes: 7 additions & 7 deletions packages/aaa-graphql-rest-bindings/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aaa-backend-stack/graphql-rest-bindings",
"version": "2.0.0",
"version": "2.0.4",
"description": "Provides utils for graphql introspection and devtools in combination with rest layer",
"license": "MIT",
"author": "all about apps",
Expand All @@ -16,11 +16,11 @@
"test": "exit 0"
},
"dependencies": {
"@aaa-backend-stack/build-tools": "^2.0.0",
"@aaa-backend-stack/graphql": "^2.0.0",
"@aaa-backend-stack/logger": "^2.0.0",
"@aaa-backend-stack/rest": "^2.0.0",
"@aaa-backend-stack/utils": "^2.0.0",
"@aaa-backend-stack/build-tools": "^2.0.4",
"@aaa-backend-stack/graphql": "^2.0.4",
"@aaa-backend-stack/logger": "^2.0.4",
"@aaa-backend-stack/rest": "^2.0.4",
"@aaa-backend-stack/utils": "^2.0.4",
"@types/bluebird": "3.5.8",
"@types/bluebird-global": "3.5.3",
"@types/lodash": "4.14.144",
Expand All @@ -30,7 +30,7 @@
"lodash": "4.17.15"
},
"devDependencies": {
"@aaa-backend-stack/test-environment": "^2.0.0",
"@aaa-backend-stack/test-environment": "^2.0.4",
"@aaa-backend-stack/tslint-rules": "^1.16.7",
"tslint": "5.11.0",
"typescript": "3.6.4"
Expand Down
10 changes: 5 additions & 5 deletions packages/aaa-graphql/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aaa-backend-stack/graphql",
"version": "2.0.0",
"version": "2.0.4",
"description": "GraphQL Layer",
"license": "MIT",
"author": "all about apps",
Expand All @@ -19,9 +19,9 @@
"test": "exit 0"
},
"dependencies": {
"@aaa-backend-stack/build-tools": "^2.0.0",
"@aaa-backend-stack/logger": "^2.0.0",
"@aaa-backend-stack/utils": "^2.0.0",
"@aaa-backend-stack/build-tools": "^2.0.4",
"@aaa-backend-stack/logger": "^2.0.4",
"@aaa-backend-stack/utils": "^2.0.4",
"@types/bluebird": "3.5.8",
"@types/bluebird-global": "3.5.3",
"@types/graphql": "0.9.4",
Expand All @@ -41,7 +41,7 @@
"sequelize": "3.31.0"
},
"devDependencies": {
"@aaa-backend-stack/test-environment": "^2.0.0",
"@aaa-backend-stack/test-environment": "^2.0.4",
"@aaa-backend-stack/tslint-rules": "^1.16.7",
"tslint": "5.11.0",
"typescript": "3.6.4"
Expand Down
16 changes: 8 additions & 8 deletions packages/aaa-image-service/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aaa-backend-stack/image-service",
"version": "2.0.0",
"version": "2.0.4",
"description": "Image service for handling image uploads",
"license": "MIT",
"author": "all about apps",
Expand All @@ -16,20 +16,20 @@
"test": "exit 0"
},
"dependencies": {
"@aaa-backend-stack/build-tools": "^2.0.0",
"@aaa-backend-stack/file-storage": "^2.0.0",
"@aaa-backend-stack/logger": "^2.0.0",
"@aaa-backend-stack/rest": "^2.0.0",
"@aaa-backend-stack/storage": "^2.0.0",
"@aaa-backend-stack/utils": "^2.0.0",
"@aaa-backend-stack/build-tools": "^2.0.4",
"@aaa-backend-stack/file-storage": "^2.0.4",
"@aaa-backend-stack/logger": "^2.0.4",
"@aaa-backend-stack/rest": "^2.0.4",
"@aaa-backend-stack/storage": "^2.0.4",
"@aaa-backend-stack/utils": "^2.0.4",
"@types/gm": "1.18.0",
"@types/lodash": "4.14.144",
"command-exists": "1.2.7",
"gm": "1.23.1",
"lodash": "4.17.15"
},
"devDependencies": {
"@aaa-backend-stack/test-environment": "^2.0.0",
"@aaa-backend-stack/test-environment": "^2.0.4",
"@aaa-backend-stack/tslint-rules": "^1.16.7",
"tslint": "5.11.0",
"typescript": "3.6.4"
Expand Down
10 changes: 5 additions & 5 deletions packages/aaa-logger/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aaa-backend-stack/logger",
"version": "2.0.0",
"version": "2.0.4",
"description": "Bunyan logger interface implementation, hapi plugin, file rotation and email error reporting setup",
"license": "MIT",
"author": "all about apps",
Expand All @@ -19,9 +19,9 @@
"test": "exit 0"
},
"dependencies": {
"@aaa-backend-stack/build-tools": "^2.0.0",
"@aaa-backend-stack/git-info": "^2.0.0",
"@aaa-backend-stack/serverdate": "^2.0.0",
"@aaa-backend-stack/build-tools": "^2.0.4",
"@aaa-backend-stack/git-info": "^2.0.4",
"@aaa-backend-stack/serverdate": "^2.0.4",
"@types/bunyan": "0.0.30",
"@types/lodash": "4.14.144",
"@types/nodemailer": "6.2.1",
Expand All @@ -35,7 +35,7 @@
"safe-json-stringify": "1.1.0"
},
"devDependencies": {
"@aaa-backend-stack/test-environment": "^2.0.0",
"@aaa-backend-stack/test-environment": "^2.0.4",
"@aaa-backend-stack/tslint-rules": "^1.16.7",
"tslint": "5.11.0",
"typescript": "3.6.4"
Expand Down
10 changes: 5 additions & 5 deletions packages/aaa-mailer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aaa-backend-stack/mailer",
"version": "2.0.0",
"version": "2.0.4",
"description": "Example Lib",
"license": "MIT",
"author": "all about apps",
Expand All @@ -16,9 +16,9 @@
"test": "exit 0"
},
"dependencies": {
"@aaa-backend-stack/build-tools": "^2.0.0",
"@aaa-backend-stack/logger": "^2.0.0",
"@aaa-backend-stack/utils": "^2.0.0",
"@aaa-backend-stack/build-tools": "^2.0.4",
"@aaa-backend-stack/logger": "^2.0.4",
"@aaa-backend-stack/utils": "^2.0.4",
"@types/lodash": "4.14.144",
"@types/nodemailer": "6.2.1",
"handlebars": "4.0.6",
Expand All @@ -29,7 +29,7 @@
"nodemailer-stub-transport": "1.1.0"
},
"devDependencies": {
"@aaa-backend-stack/test-environment": "^2.0.0",
"@aaa-backend-stack/test-environment": "^2.0.4",
"@aaa-backend-stack/tslint-rules": "^1.16.7",
"tslint": "5.11.0",
"typescript": "3.6.4"
Expand Down
6 changes: 3 additions & 3 deletions packages/aaa-polyfills/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aaa-backend-stack/polyfills",
"version": "2.0.0",
"version": "2.0.4",
"description": "Unified core and polyfills injector for backend projects. This project explicitly maintains the cls patched sequelize, bluebird, fetch",
"license": "MIT",
"author": "all about apps",
Expand All @@ -16,7 +16,7 @@
"test": "exit 0"
},
"dependencies": {
"@aaa-backend-stack/build-tools": "^2.0.0",
"@aaa-backend-stack/build-tools": "^2.0.4",
"@types/bluebird": "3.5.8",
"@types/bluebird-global": "3.5.3",
"@types/lodash": "4.14.144",
Expand All @@ -33,7 +33,7 @@
"uuid": "3.1.0"
},
"devDependencies": {
"@aaa-backend-stack/test-environment": "^2.0.0",
"@aaa-backend-stack/test-environment": "^2.0.4",
"@aaa-backend-stack/tslint-rules": "^1.16.7",
"tslint": "5.11.0",
"typescript": "3.6.4"
Expand Down
Loading

0 comments on commit ae7eb13

Please sign in to comment.