Skip to content

Commit

Permalink
merge latest
Browse files Browse the repository at this point in the history
  • Loading branch information
gottfired committed Nov 20, 2019
1 parent ae7eb13 commit 5a4c773
Show file tree
Hide file tree
Showing 38 changed files with 417 additions and 213 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
### Master
* ...

### 2.1.1
* unit test that all foreign keys are indexed
* switch between continuation-local-storage and cls-hooked via env var CLS_USE_CONTINUATION_LOCAL_STORAGE
* update to typescript 3.7.2
* fixed deprecated linter settings

### 2.0.1-2.0.4
* fix cls.test

Expand Down
16 changes: 16 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,22 @@ local$ yarn check-package-validity && git status
# Is your git still clean? Else go back to step 0.
#

# 1.1 Check scaffolded project compiles and lints correctly
# This is necessary due to different (stricter) compiler and linter
# settings in scaffolded projects
local$ yarn create-aaa-backend scaffold -xly --debug

# Move the scaffolded project outside of aaa-backend-stack
# Otherwise vagrant gets confused
local$ mv aaa-backend .. && cd ../aaa-backend && code .

# Now check that scaffolded project in aaa-backend still compiles
local$ vagrant up && vagrant ssh
vagrant$ yarn && yarn build

# Fix compiler and linter erros until all is well.
# Then change back to aaa-backend-stack and copy the fixes to the template.

# 2. clean all node_modules in root and at the packages level
local$ yarn clean-modules

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.4"
"version": "2.1.1"
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"lodash": "4.17.15",
"rimraf": "2.6.1",
"tslint": "5.11.0",
"typescript": "3.6.4"
"typescript": "3.7.2"
},
"workspaces": [
"packages/*"
Expand Down
6 changes: 3 additions & 3 deletions 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.4",
"version": "2.1.1",
"description": "base tools for env sourcing and building cli tools",
"license": "MIT",
"author": "all about apps",
Expand Down Expand Up @@ -42,9 +42,9 @@
"sort-package-json": "1.7.1"
},
"devDependencies": {
"@aaa-backend-stack/tslint-rules": "^1.16.7",
"@aaa-backend-stack/tslint-rules": "^2.1.1",
"tslint": "5.11.0",
"typescript": "3.6.4"
"typescript": "3.7.2"
},
"publishConfig": {
"access": "public"
Expand Down
12 changes: 6 additions & 6 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.4",
"version": "2.1.1",
"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.4",
"@aaa-backend-stack/git-info": "^2.0.4",
"@aaa-backend-stack/build-tools": "^2.1.1",
"@aaa-backend-stack/git-info": "^2.1.1",
"@types/lodash": "4.14.144",
"@types/ws": "3.0.2",
"bufferutil": "4.0.1",
Expand All @@ -26,10 +26,10 @@
"ws": "3.2.0"
},
"devDependencies": {
"@aaa-backend-stack/test-environment": "^2.0.4",
"@aaa-backend-stack/tslint-rules": "^1.16.7",
"@aaa-backend-stack/test-environment": "^2.1.1",
"@aaa-backend-stack/tslint-rules": "^2.1.1",
"tslint": "5.11.0",
"typescript": "3.6.4"
"typescript": "3.7.2"
},
"publishConfig": {
"access": "public"
Expand Down
12 changes: 6 additions & 6 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.4",
"version": "2.1.1",
"private": true,
"description": "Example Lib",
"license": "MIT",
Expand All @@ -17,14 +17,14 @@
"test": "exit 0"
},
"dependencies": {
"@aaa-backend-stack/build-tools": "^2.0.4",
"@aaa-backend-stack/utils": "^2.0.4"
"@aaa-backend-stack/build-tools": "^2.1.1",
"@aaa-backend-stack/utils": "^2.1.1"
},
"devDependencies": {
"@aaa-backend-stack/test-environment": "^2.0.4",
"@aaa-backend-stack/tslint-rules": "^1.16.7",
"@aaa-backend-stack/test-environment": "^2.1.1",
"@aaa-backend-stack/tslint-rules": "^2.1.1",
"tslint": "5.11.0",
"typescript": "3.6.4"
"typescript": "3.7.2"
},
"publishConfig": {
"access": "public"
Expand Down
16 changes: 8 additions & 8 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.4",
"version": "2.1.1",
"description": "File storage service implementation using local file system",
"license": "MIT",
"author": "all about apps",
Expand All @@ -16,20 +16,20 @@
"test": "exit 0"
},
"dependencies": {
"@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",
"@aaa-backend-stack/build-tools": "^2.1.1",
"@aaa-backend-stack/file-storage": "^2.1.1",
"@aaa-backend-stack/logger": "^2.1.1",
"@aaa-backend-stack/utils": "^2.1.1",
"@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.4",
"@aaa-backend-stack/tslint-rules": "^1.16.7",
"@aaa-backend-stack/test-environment": "^2.1.1",
"@aaa-backend-stack/tslint-rules": "^2.1.1",
"tslint": "5.11.0",
"typescript": "3.6.4"
"typescript": "3.7.2"
},
"publishConfig": {
"access": "public"
Expand Down
16 changes: 8 additions & 8 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.4",
"version": "2.1.1",
"description": "File storage service implementation using Amazon S3 buckets (or compatible servers)",
"license": "MIT",
"author": "all about apps",
Expand All @@ -16,21 +16,21 @@
"test": "exit 0"
},
"dependencies": {
"@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",
"@aaa-backend-stack/build-tools": "^2.1.1",
"@aaa-backend-stack/file-storage": "^2.1.1",
"@aaa-backend-stack/logger": "^2.1.1",
"@aaa-backend-stack/utils": "^2.1.1",
"@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.4",
"@aaa-backend-stack/tslint-rules": "^1.16.7",
"@aaa-backend-stack/test-environment": "^2.1.1",
"@aaa-backend-stack/tslint-rules": "^2.1.1",
"tslint": "5.11.0",
"typescript": "3.6.4"
"typescript": "3.7.2"
},
"publishConfig": {
"access": "public"
Expand Down
8 changes: 4 additions & 4 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.4",
"version": "2.1.1",
"description": "High level API for a file storage service, actual implementation provided in separate packages",
"license": "MIT",
"author": "all about apps",
Expand All @@ -16,12 +16,12 @@
"test": "exit 0"
},
"dependencies": {
"@aaa-backend-stack/build-tools": "^2.0.4"
"@aaa-backend-stack/build-tools": "^2.1.1"
},
"devDependencies": {
"@aaa-backend-stack/tslint-rules": "^1.16.7",
"@aaa-backend-stack/tslint-rules": "^2.1.1",
"tslint": "5.11.0",
"typescript": "3.6.4"
"typescript": "3.7.2"
},
"publishConfig": {
"access": "public"
Expand Down
10 changes: 5 additions & 5 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.4",
"version": "2.1.1",
"description": "Reads base directory to get current git commit information",
"license": "MIT",
"author": "all about apps",
Expand All @@ -16,14 +16,14 @@
"test": "exit 0"
},
"dependencies": {
"@aaa-backend-stack/build-tools": "^2.0.4",
"@aaa-backend-stack/build-tools": "^2.1.1",
"git-rev-sync": "1.9.1"
},
"devDependencies": {
"@aaa-backend-stack/test-environment": "^2.0.4",
"@aaa-backend-stack/tslint-rules": "^1.16.7",
"@aaa-backend-stack/test-environment": "^2.1.1",
"@aaa-backend-stack/tslint-rules": "^2.1.1",
"tslint": "5.11.0",
"typescript": "3.6.4"
"typescript": "3.7.2"
},
"publishConfig": {
"access": "public"
Expand Down
18 changes: 9 additions & 9 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.4",
"version": "2.1.1",
"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.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",
"@aaa-backend-stack/build-tools": "^2.1.1",
"@aaa-backend-stack/graphql": "^2.1.1",
"@aaa-backend-stack/logger": "^2.1.1",
"@aaa-backend-stack/rest": "^2.1.1",
"@aaa-backend-stack/utils": "^2.1.1",
"@types/bluebird": "3.5.8",
"@types/bluebird-global": "3.5.3",
"@types/lodash": "4.14.144",
Expand All @@ -30,10 +30,10 @@
"lodash": "4.17.15"
},
"devDependencies": {
"@aaa-backend-stack/test-environment": "^2.0.4",
"@aaa-backend-stack/tslint-rules": "^1.16.7",
"@aaa-backend-stack/test-environment": "^2.1.1",
"@aaa-backend-stack/tslint-rules": "^2.1.1",
"tslint": "5.11.0",
"typescript": "3.6.4"
"typescript": "3.7.2"
},
"publishConfig": {
"access": "public"
Expand Down
14 changes: 7 additions & 7 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.4",
"version": "2.1.1",
"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.4",
"@aaa-backend-stack/logger": "^2.0.4",
"@aaa-backend-stack/utils": "^2.0.4",
"@aaa-backend-stack/build-tools": "^2.1.1",
"@aaa-backend-stack/logger": "^2.1.1",
"@aaa-backend-stack/utils": "^2.1.1",
"@types/bluebird": "3.5.8",
"@types/bluebird-global": "3.5.3",
"@types/graphql": "0.9.4",
Expand All @@ -41,10 +41,10 @@
"sequelize": "3.31.0"
},
"devDependencies": {
"@aaa-backend-stack/test-environment": "^2.0.4",
"@aaa-backend-stack/tslint-rules": "^1.16.7",
"@aaa-backend-stack/test-environment": "^2.1.1",
"@aaa-backend-stack/tslint-rules": "^2.1.1",
"tslint": "5.11.0",
"typescript": "3.6.4"
"typescript": "3.7.2"
},
"publishConfig": {
"access": "public"
Expand Down
20 changes: 10 additions & 10 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.4",
"version": "2.1.1",
"description": "Image service for handling image uploads",
"license": "MIT",
"author": "all about apps",
Expand All @@ -16,23 +16,23 @@
"test": "exit 0"
},
"dependencies": {
"@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",
"@aaa-backend-stack/build-tools": "^2.1.1",
"@aaa-backend-stack/file-storage": "^2.1.1",
"@aaa-backend-stack/logger": "^2.1.1",
"@aaa-backend-stack/rest": "^2.1.1",
"@aaa-backend-stack/storage": "^2.1.1",
"@aaa-backend-stack/utils": "^2.1.1",
"@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.4",
"@aaa-backend-stack/tslint-rules": "^1.16.7",
"@aaa-backend-stack/test-environment": "^2.1.1",
"@aaa-backend-stack/tslint-rules": "^2.1.1",
"tslint": "5.11.0",
"typescript": "3.6.4"
"typescript": "3.7.2"
},
"publishConfig": {
"access": "public"
Expand Down
Loading

0 comments on commit 5a4c773

Please sign in to comment.