From 0e9730ec94ff92f96a014b1d6816d4f56b1585fe Mon Sep 17 00:00:00 2001 From: JeremyMarshall Date: Sun, 28 May 2017 19:57:04 +1000 Subject: [PATCH 1/4] circleci push to 4.2.2 --- Dockerfile | 2 +- package.json | 5 ++--- typings.json | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 88f31a7..d006446 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM node:latest MAINTAINER Jeremymarshall -LABEL "version"="4.1.2" +LABEL "version"="4.2.2" RUN npm install -g node-gyp diff --git a/package.json b/package.json index 8e7a61c..125708e 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "4.1.2", + "version": "4.2.2", "main": "server/index.js", "dependencies": { @@ -21,7 +21,7 @@ "core-js": "^2.2.1", "express": "^4.13.3", - "morgan": "~1.7.0", + "morgan": "^1.8.0", "body-parser": "^1.13.3", "method-override": "^2.3.5", "cookie-parser": "^1.3.5", @@ -91,7 +91,6 @@ "gulp-istanbul-enforcer": "^1.0.3", "gulp-load-plugins": "^1.0.0-rc.1", "gulp-mocha": "^2.1.3", - "gulp-node-inspector": "^0.1.0", "gulp-plumber": "^1.0.1", "gulp-protractor": "^3.0.0", "gulp-rev": "^7.0.0", diff --git a/typings.json b/typings.json index e96e189..f72331f 100644 --- a/typings.json +++ b/typings.json @@ -16,7 +16,7 @@ "chai": "github:DefinitelyTyped/DefinitelyTyped/chai/chai.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe", "assertion-error": "github:DefinitelyTyped/DefinitelyTyped/assertion-error/assertion-error.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe", "sinon": "github:DefinitelyTyped/DefinitelyTyped/sinon/sinon.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe", - "sinon-chai": "github:DefinitelyTyped/DefinitelyTyped/sinon-chai/sinon-chai.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe", + "sinon-chai": "github:DefinitelyTyped/DefinitelyTyped/sinon-chai/sinon-chai.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe" "jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe" } From 5e8f85520e8f5081aeab7beb95c65896dc6789e9 Mon Sep 17 00:00:00 2001 From: JeremyMarshall Date: Sun, 28 May 2017 20:07:23 +1000 Subject: [PATCH 2/4] version 4.2.2 --- Dockerfile | 2 +- package.json | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 88f31a7..d006446 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM node:latest MAINTAINER Jeremymarshall -LABEL "version"="4.1.2" +LABEL "version"="4.2.2" RUN npm install -g node-gyp diff --git a/package.json b/package.json index 8e7a61c..125708e 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "4.1.2", + "version": "4.2.2", "main": "server/index.js", "dependencies": { @@ -21,7 +21,7 @@ "core-js": "^2.2.1", "express": "^4.13.3", - "morgan": "~1.7.0", + "morgan": "^1.8.0", "body-parser": "^1.13.3", "method-override": "^2.3.5", "cookie-parser": "^1.3.5", @@ -91,7 +91,6 @@ "gulp-istanbul-enforcer": "^1.0.3", "gulp-load-plugins": "^1.0.0-rc.1", "gulp-mocha": "^2.1.3", - "gulp-node-inspector": "^0.1.0", "gulp-plumber": "^1.0.1", "gulp-protractor": "^3.0.0", "gulp-rev": "^7.0.0", From 12ae24705865c00cdc15a91e2a0a65fba739a9cd Mon Sep 17 00:00:00 2001 From: JeremyMarshall Date: Sun, 28 May 2017 20:12:05 +1000 Subject: [PATCH 3/4] fix json error --- typings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/typings.json b/typings.json index f72331f..e96e189 100644 --- a/typings.json +++ b/typings.json @@ -16,7 +16,7 @@ "chai": "github:DefinitelyTyped/DefinitelyTyped/chai/chai.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe", "assertion-error": "github:DefinitelyTyped/DefinitelyTyped/assertion-error/assertion-error.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe", "sinon": "github:DefinitelyTyped/DefinitelyTyped/sinon/sinon.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe", - "sinon-chai": "github:DefinitelyTyped/DefinitelyTyped/sinon-chai/sinon-chai.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe" + "sinon-chai": "github:DefinitelyTyped/DefinitelyTyped/sinon-chai/sinon-chai.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe", "jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe" } From 4c90523c5f1f60c2ffcf1f50ebd98ade806d3c19 Mon Sep 17 00:00:00 2001 From: JeremyMarshall Date: Sun, 28 May 2017 20:56:01 +1000 Subject: [PATCH 4/4] update readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index b39da3e..72c7c55 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,10 @@ docker pull generatorangularfullstack/angular-fullstack-dist:latest - 4.0.4 - 4.1.1 - 4.1.2 +- 4.2.2 - alpine.4.0.4 - alpine.4.1.1 - alpine.4.1.2 +- alpine.4.2.2 Alpine branches aren't that much smaller as some modules need python and a build chain to build.