From 36a9f5ac4fe0dd30b1a2f2937832b854803d60b7 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Fri, 31 Mar 2017 12:46:53 -0400 Subject: [PATCH 1/4] all: drop support for 0.12 [ci skip] --- package.json | 2 +- packages/bigquery/package.json | 2 +- packages/bigtable/package.json | 2 +- packages/compute/package.json | 2 +- packages/datastore/package.json | 2 +- packages/dns/package.json | 2 +- packages/google-cloud/package.json | 2 +- packages/language/package.json | 2 +- packages/logging-bunyan/package.json | 2 +- packages/logging-winston/package.json | 2 +- packages/logging/package.json | 2 +- packages/monitoring/package.json | 2 +- packages/prediction/package.json | 2 +- packages/pubsub/package.json | 2 +- packages/resource/package.json | 2 +- packages/speech/package.json | 2 +- packages/storage/package.json | 2 +- packages/translate/package.json | 2 +- packages/vision/package.json | 2 +- scripts/update-deps.js | 3 ++- 20 files changed, 21 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index e29837c073f..2f3f9383aa7 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,6 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=0.12.0" + "node": ">=4.0.0" } } diff --git a/packages/bigquery/package.json b/packages/bigquery/package.json index f95536870b5..5c060c49f6d 100644 --- a/packages/bigquery/package.json +++ b/packages/bigquery/package.json @@ -74,6 +74,6 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=0.12.0" + "node": ">=4.0.0" } } diff --git a/packages/bigtable/package.json b/packages/bigtable/package.json index 98edb2aa64b..28ea96fe068 100644 --- a/packages/bigtable/package.json +++ b/packages/bigtable/package.json @@ -80,6 +80,6 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=0.12.0" + "node": ">=4.0.0" } } diff --git a/packages/compute/package.json b/packages/compute/package.json index 5e66ab70bdb..410c5c0f24d 100644 --- a/packages/compute/package.json +++ b/packages/compute/package.json @@ -73,6 +73,6 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=0.12.0" + "node": ">=4.0.0" } } diff --git a/packages/datastore/package.json b/packages/datastore/package.json index 2f6aae6bd93..cea58c3c7ed 100644 --- a/packages/datastore/package.json +++ b/packages/datastore/package.json @@ -79,6 +79,6 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=0.12.0" + "node": ">=4.0.0" } } diff --git a/packages/dns/package.json b/packages/dns/package.json index b5930a5a020..459a099f001 100644 --- a/packages/dns/package.json +++ b/packages/dns/package.json @@ -72,6 +72,6 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=0.12.0" + "node": ">=4.0.0" } } diff --git a/packages/google-cloud/package.json b/packages/google-cloud/package.json index e81c9929035..0ac594532fe 100644 --- a/packages/google-cloud/package.json +++ b/packages/google-cloud/package.json @@ -128,6 +128,6 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=0.4.0" + "node": ">=4.0.0" } } diff --git a/packages/language/package.json b/packages/language/package.json index f8bbba41ccd..6761eb70bd3 100644 --- a/packages/language/package.json +++ b/packages/language/package.json @@ -73,6 +73,6 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=0.12.0" + "node": ">=4.0.0" } } diff --git a/packages/logging-bunyan/package.json b/packages/logging-bunyan/package.json index 3779ba4920b..859fe97b057 100644 --- a/packages/logging-bunyan/package.json +++ b/packages/logging-bunyan/package.json @@ -44,6 +44,6 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=0.12.0" + "node": ">=4.0.0" } } diff --git a/packages/logging-winston/package.json b/packages/logging-winston/package.json index f5154385df3..65b286e3967 100644 --- a/packages/logging-winston/package.json +++ b/packages/logging-winston/package.json @@ -45,6 +45,6 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=0.12.0" + "node": ">=4.0.0" } } diff --git a/packages/logging/package.json b/packages/logging/package.json index 239222a723f..f4f74c6321e 100644 --- a/packages/logging/package.json +++ b/packages/logging/package.json @@ -80,6 +80,6 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=0.12.0" + "node": ">=4.0.0" } } diff --git a/packages/monitoring/package.json b/packages/monitoring/package.json index d80aa854eea..bd93a06bbb2 100644 --- a/packages/monitoring/package.json +++ b/packages/monitoring/package.json @@ -65,6 +65,6 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=0.12.0" + "node": ">=4.0.0" } } diff --git a/packages/prediction/package.json b/packages/prediction/package.json index 8e4371c4990..f1faaaac5fd 100644 --- a/packages/prediction/package.json +++ b/packages/prediction/package.json @@ -75,6 +75,6 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=0.12.0" + "node": ">=4.0.0" } } diff --git a/packages/pubsub/package.json b/packages/pubsub/package.json index 0436dcc85a5..af59772a385 100644 --- a/packages/pubsub/package.json +++ b/packages/pubsub/package.json @@ -73,6 +73,6 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=0.12.0" + "node": ">=4.0.0" } } diff --git a/packages/resource/package.json b/packages/resource/package.json index 167704aa725..1051c94b715 100644 --- a/packages/resource/package.json +++ b/packages/resource/package.json @@ -70,6 +70,6 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=0.12.0" + "node": ">=4.0.0" } } diff --git a/packages/speech/package.json b/packages/speech/package.json index 68c846f0b4a..1909cb9a3cc 100644 --- a/packages/speech/package.json +++ b/packages/speech/package.json @@ -84,6 +84,6 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=0.12.0" + "node": ">=4.0.0" } } diff --git a/packages/storage/package.json b/packages/storage/package.json index a4df4f52671..f14c47948bf 100644 --- a/packages/storage/package.json +++ b/packages/storage/package.json @@ -84,6 +84,6 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=0.12.0" + "node": ">=4.0.0" } } diff --git a/packages/translate/package.json b/packages/translate/package.json index 44a8be43317..fdc67529856 100644 --- a/packages/translate/package.json +++ b/packages/translate/package.json @@ -68,6 +68,6 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=0.12.0" + "node": ">=4.0.0" } } diff --git a/packages/vision/package.json b/packages/vision/package.json index 405b4dd49fb..897c1e5857c 100644 --- a/packages/vision/package.json +++ b/packages/vision/package.json @@ -80,6 +80,6 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=0.12.0" + "node": ">=4.0.0" } } diff --git a/scripts/update-deps.js b/scripts/update-deps.js index f93d75f8c1b..24bdd4ad431 100644 --- a/scripts/update-deps.js +++ b/scripts/update-deps.js @@ -38,7 +38,8 @@ require('shelljs/global'); * @type {string[]} */ var BLACKLIST = [ - 'dns-zonefile' + 'dns-zonefile', + 'dot-prop' ]; /** From 962d801fa8e06d84a3affce96caf7a5e23d0d7b2 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Fri, 31 Mar 2017 13:46:00 -0400 Subject: [PATCH 2/4] scripts: add more modules to blacklist for now --- scripts/update-deps.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/update-deps.js b/scripts/update-deps.js index 24bdd4ad431..f163e02a9c4 100644 --- a/scripts/update-deps.js +++ b/scripts/update-deps.js @@ -39,7 +39,9 @@ require('shelljs/global'); */ var BLACKLIST = [ 'dns-zonefile', - 'dot-prop' + // @TODO: update the code that uses these to use the promise format + 'dot-prop', + 'rgb-hex' ]; /** From 28aeea85c0c813bf354be8afba8881b5772a3611 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Fri, 31 Mar 2017 13:46:31 -0400 Subject: [PATCH 3/4] update common deps --- packages/bigquery/package.json | 2 +- packages/bigtable/package.json | 4 ++-- packages/compute/package.json | 2 +- packages/datastore/package.json | 4 ++-- packages/dns/package.json | 2 +- packages/google-cloud/npm-shrinkwrap.json | 8 ++++---- packages/google-cloud/package.json | 2 +- packages/language/package.json | 2 +- packages/logging-winston/package.json | 2 +- packages/logging/package.json | 4 ++-- packages/prediction/package.json | 2 +- packages/pubsub/package.json | 4 ++-- packages/resource/package.json | 2 +- packages/spanner/package.json | 4 ++-- packages/speech/package.json | 4 ++-- packages/storage/package.json | 2 +- packages/translate/package.json | 2 +- packages/vision/package.json | 4 ++-- 18 files changed, 28 insertions(+), 28 deletions(-) diff --git a/packages/bigquery/package.json b/packages/bigquery/package.json index 5c060c49f6d..da543be7191 100644 --- a/packages/bigquery/package.json +++ b/packages/bigquery/package.json @@ -50,7 +50,7 @@ "bigquery" ], "dependencies": { - "@google-cloud/common": "^0.12.0", + "@google-cloud/common": "^0.13.0", "arrify": "^1.0.0", "duplexify": "^3.2.0", "extend": "^3.0.0", diff --git a/packages/bigtable/package.json b/packages/bigtable/package.json index 28ea96fe068..f02f7cdc7c5 100644 --- a/packages/bigtable/package.json +++ b/packages/bigtable/package.json @@ -50,8 +50,8 @@ "bigtable" ], "dependencies": { - "@google-cloud/common": "^0.12.0", - "@google-cloud/common-grpc": "^0.2.1", + "@google-cloud/common": "^0.13.0", + "@google-cloud/common-grpc": "^0.3.0", "arrify": "^1.0.0", "concat-stream": "^1.5.0", "create-error-class": "^3.0.2", diff --git a/packages/compute/package.json b/packages/compute/package.json index 410c5c0f24d..1311a53d2f4 100644 --- a/packages/compute/package.json +++ b/packages/compute/package.json @@ -50,7 +50,7 @@ "compute engine" ], "dependencies": { - "@google-cloud/common": "^0.12.0", + "@google-cloud/common": "^0.13.0", "arrify": "^1.0.0", "async": "^2.0.1", "create-error-class": "^3.0.2", diff --git a/packages/datastore/package.json b/packages/datastore/package.json index cea58c3c7ed..9f7e29f3dc6 100644 --- a/packages/datastore/package.json +++ b/packages/datastore/package.json @@ -50,8 +50,8 @@ "datastore" ], "dependencies": { - "@google-cloud/common": "^0.12.0", - "@google-cloud/common-grpc": "^0.2.1", + "@google-cloud/common": "^0.13.0", + "@google-cloud/common-grpc": "^0.3.0", "arrify": "^1.0.0", "concat-stream": "^1.5.0", "create-error-class": "^3.0.2", diff --git a/packages/dns/package.json b/packages/dns/package.json index 459a099f001..46ff3bba38b 100644 --- a/packages/dns/package.json +++ b/packages/dns/package.json @@ -50,7 +50,7 @@ "dns" ], "dependencies": { - "@google-cloud/common": "^0.12.0", + "@google-cloud/common": "^0.13.0", "arrify": "^1.0.0", "dns-zonefile": "0.1.18", "extend": "^3.0.0", diff --git a/packages/google-cloud/npm-shrinkwrap.json b/packages/google-cloud/npm-shrinkwrap.json index 395173b7d73..f4562d2668f 100644 --- a/packages/google-cloud/npm-shrinkwrap.json +++ b/packages/google-cloud/npm-shrinkwrap.json @@ -119,7 +119,7 @@ }, "@google-cloud/pubsub": { "version": "0.8.3", - "from": "@google-cloud/pubsub@>=0.8.3 <0.9.0", + "from": "@google-cloud/pubsub@0.8.3", "resolved": "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-0.8.3.tgz", "dependencies": { "@google-cloud/common-grpc": { @@ -145,9 +145,9 @@ "resolved": "https://registry.npmjs.org/@google-cloud/resource/-/resource-0.6.0.tgz" }, "@google-cloud/spanner": { - "version": "0.1.2", - "from": "@google-cloud/spanner@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/@google-cloud/spanner/-/spanner-0.1.2.tgz", + "version": "0.2.0", + "from": "@google-cloud/spanner@0.2.0", + "resolved": "https://registry.npmjs.org/@google-cloud/spanner/-/spanner-0.2.0.tgz", "dependencies": { "@google-cloud/common-grpc": { "version": "0.2.1", diff --git a/packages/google-cloud/package.json b/packages/google-cloud/package.json index 0ac594532fe..7d5782cecaf 100644 --- a/packages/google-cloud/package.json +++ b/packages/google-cloud/package.json @@ -111,7 +111,7 @@ "@google-cloud/prediction": "^0.5.0", "@google-cloud/pubsub": "^0.8.3", "@google-cloud/resource": "^0.6.0", - "@google-cloud/spanner": "^0.1.0", + "@google-cloud/spanner": "^0.2.0", "@google-cloud/speech": "^0.7.0", "@google-cloud/storage": "^0.8.0", "@google-cloud/translate": "^0.7.0", diff --git a/packages/language/package.json b/packages/language/package.json index 6761eb70bd3..238b1f7d520 100644 --- a/packages/language/package.json +++ b/packages/language/package.json @@ -52,7 +52,7 @@ "language" ], "dependencies": { - "@google-cloud/common": "^0.12.0", + "@google-cloud/common": "^0.13.0", "extend": "^3.0.0", "google-gax": "^0.12.0", "google-proto-files": "^0.10.0", diff --git a/packages/logging-winston/package.json b/packages/logging-winston/package.json index 65b286e3967..d63f9ae0ae8 100644 --- a/packages/logging-winston/package.json +++ b/packages/logging-winston/package.json @@ -28,7 +28,7 @@ "winston" ], "dependencies": { - "@google-cloud/common": "^0.12.0", + "@google-cloud/common": "^0.13.0", "@google-cloud/logging": "^0.8.1", "is": "^3.2.0", "winston": "^2.2.0" diff --git a/packages/logging/package.json b/packages/logging/package.json index f4f74c6321e..806fa8e01a3 100644 --- a/packages/logging/package.json +++ b/packages/logging/package.json @@ -52,8 +52,8 @@ "stackdriver" ], "dependencies": { - "@google-cloud/common": "^0.12.0", - "@google-cloud/common-grpc": "^0.2.1", + "@google-cloud/common": "^0.13.0", + "@google-cloud/common-grpc": "^0.3.0", "arrify": "^1.0.0", "async": "^2.1.4", "eventid": "^0.1.0", diff --git a/packages/prediction/package.json b/packages/prediction/package.json index f1faaaac5fd..10b3bf84428 100644 --- a/packages/prediction/package.json +++ b/packages/prediction/package.json @@ -50,7 +50,7 @@ "prediction" ], "dependencies": { - "@google-cloud/common": "^0.12.0", + "@google-cloud/common": "^0.13.0", "JSONStream": "^1.0.7", "arrify": "^1.0.0", "extend": "^3.0.0", diff --git a/packages/pubsub/package.json b/packages/pubsub/package.json index af59772a385..6a2982d2f05 100644 --- a/packages/pubsub/package.json +++ b/packages/pubsub/package.json @@ -50,8 +50,8 @@ "pubsub" ], "dependencies": { - "@google-cloud/common": "^0.12.0", - "@google-cloud/common-grpc": "^0.2.1", + "@google-cloud/common": "^0.13.0", + "@google-cloud/common-grpc": "^0.3.0", "arrify": "^1.0.0", "extend": "^3.0.0", "google-gax": "^0.12.2", diff --git a/packages/resource/package.json b/packages/resource/package.json index 1051c94b715..0fee13f09a0 100644 --- a/packages/resource/package.json +++ b/packages/resource/package.json @@ -50,7 +50,7 @@ "resource" ], "dependencies": { - "@google-cloud/common": "^0.12.0", + "@google-cloud/common": "^0.13.0", "extend": "^3.0.0", "is": "^3.0.1" }, diff --git a/packages/spanner/package.json b/packages/spanner/package.json index adcc7b11371..c9dee4a6996 100644 --- a/packages/spanner/package.json +++ b/packages/spanner/package.json @@ -33,8 +33,8 @@ "spanner" ], "dependencies": { - "@google-cloud/common": "^0.12.0", - "@google-cloud/common-grpc": "^0.2.1", + "@google-cloud/common": "^0.13.0", + "@google-cloud/common-grpc": "^0.3.0", "arrify": "^1.0.1", "checkpoint-stream": "^0.1.0", "events-intercept": "^2.0.0", diff --git a/packages/speech/package.json b/packages/speech/package.json index 1909cb9a3cc..7824e20517f 100644 --- a/packages/speech/package.json +++ b/packages/speech/package.json @@ -54,8 +54,8 @@ "speech" ], "dependencies": { - "@google-cloud/common": "^0.12.0", - "@google-cloud/common-grpc": "^0.2.1", + "@google-cloud/common": "^0.13.0", + "@google-cloud/common-grpc": "^0.3.0", "events-intercept": "^2.0.0", "extend": "^3.0.0", "google-gax": "^0.12.0", diff --git a/packages/storage/package.json b/packages/storage/package.json index f14c47948bf..50f41622463 100644 --- a/packages/storage/package.json +++ b/packages/storage/package.json @@ -50,7 +50,7 @@ "storage" ], "dependencies": { - "@google-cloud/common": "^0.12.0", + "@google-cloud/common": "^0.13.0", "arrify": "^1.0.0", "async": "^2.0.1", "concat-stream": "^1.5.0", diff --git a/packages/translate/package.json b/packages/translate/package.json index fdc67529856..0ba5a5c91f5 100644 --- a/packages/translate/package.json +++ b/packages/translate/package.json @@ -50,7 +50,7 @@ "translate" ], "dependencies": { - "@google-cloud/common": "^0.12.0", + "@google-cloud/common": "^0.13.0", "arrify": "^1.0.0", "extend": "^3.0.0", "is": "^3.0.1", diff --git a/packages/vision/package.json b/packages/vision/package.json index 897c1e5857c..8ff8e39042a 100644 --- a/packages/vision/package.json +++ b/packages/vision/package.json @@ -50,8 +50,8 @@ "vision" ], "dependencies": { - "@google-cloud/common": "^0.12.0", - "@google-cloud/common-grpc": "^0.2.1", + "@google-cloud/common": "^0.13.0", + "@google-cloud/common-grpc": "^0.3.0", "arrify": "^1.0.0", "async": "^2.0.1", "extend": "^3.0.0", From 4e3bcdd3ec0a7fcacdbae627cc30749dc150b678 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Fri, 31 Mar 2017 13:47:32 -0400 Subject: [PATCH 4/4] remove google-cloud from the update process for now --- packages/google-cloud/npm-shrinkwrap.json | 8 ++++---- packages/google-cloud/package.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/google-cloud/npm-shrinkwrap.json b/packages/google-cloud/npm-shrinkwrap.json index f4562d2668f..395173b7d73 100644 --- a/packages/google-cloud/npm-shrinkwrap.json +++ b/packages/google-cloud/npm-shrinkwrap.json @@ -119,7 +119,7 @@ }, "@google-cloud/pubsub": { "version": "0.8.3", - "from": "@google-cloud/pubsub@0.8.3", + "from": "@google-cloud/pubsub@>=0.8.3 <0.9.0", "resolved": "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-0.8.3.tgz", "dependencies": { "@google-cloud/common-grpc": { @@ -145,9 +145,9 @@ "resolved": "https://registry.npmjs.org/@google-cloud/resource/-/resource-0.6.0.tgz" }, "@google-cloud/spanner": { - "version": "0.2.0", - "from": "@google-cloud/spanner@0.2.0", - "resolved": "https://registry.npmjs.org/@google-cloud/spanner/-/spanner-0.2.0.tgz", + "version": "0.1.2", + "from": "@google-cloud/spanner@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/@google-cloud/spanner/-/spanner-0.1.2.tgz", "dependencies": { "@google-cloud/common-grpc": { "version": "0.2.1", diff --git a/packages/google-cloud/package.json b/packages/google-cloud/package.json index 7d5782cecaf..e81c9929035 100644 --- a/packages/google-cloud/package.json +++ b/packages/google-cloud/package.json @@ -111,7 +111,7 @@ "@google-cloud/prediction": "^0.5.0", "@google-cloud/pubsub": "^0.8.3", "@google-cloud/resource": "^0.6.0", - "@google-cloud/spanner": "^0.2.0", + "@google-cloud/spanner": "^0.1.0", "@google-cloud/speech": "^0.7.0", "@google-cloud/storage": "^0.8.0", "@google-cloud/translate": "^0.7.0", @@ -128,6 +128,6 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=4.0.0" + "node": ">=0.4.0" } }