From c07efefd200b8de63901e50790561c93cb5ac1db Mon Sep 17 00:00:00 2001 From: Korwit Date: Sat, 19 Oct 2019 14:15:38 +0700 Subject: [PATCH 1/5] update gatsby plugins to use new createContentDigest helper at gatsby-transformer-screenshot & replace peerDependency for gatsby-transformer-sqip --- packages/gatsby-transformer-screenshot/lambda/index.js | 4 ++-- packages/gatsby-transformer-sqip/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/gatsby-transformer-screenshot/lambda/index.js b/packages/gatsby-transformer-screenshot/lambda/index.js index 3bb3a76d1b092..c45b3eda32fb6 100644 --- a/packages/gatsby-transformer-screenshot/lambda/index.js +++ b/packages/gatsby-transformer-screenshot/lambda/index.js @@ -1,6 +1,6 @@ const setup = require(`./starter-kit/setup`) -const crypto = require(`crypto`) +const createContentDigest = jest.fn().mockReturnValue(`contentDigest`) const AWS = require(`aws-sdk`) const s3 = new AWS.S3({ @@ -56,7 +56,7 @@ exports.run = async (browser, url, width, height, fullPage) => { } const keyBase = `${url}-(${width},${height})` - const digest = crypto + const contentDigest = createContentDigest .createHash(`md5`) .update(keyBase) .digest(`hex`) diff --git a/packages/gatsby-transformer-sqip/package.json b/packages/gatsby-transformer-sqip/package.json index 33dcf82f8ad99..d98719ec9971d 100644 --- a/packages/gatsby-transformer-sqip/package.json +++ b/packages/gatsby-transformer-sqip/package.json @@ -24,7 +24,7 @@ "debug": "^3.2.6" }, "peerDependencies": { - "gatsby": "^2.0.0", + "gatsby": "^2.0.15", "gatsby-source-contentful": "^2.0.0", "gatsby-transformer-sharp": "^2.0.0" }, From c1d08340acf777467103e325413fa68e538e9415 Mon Sep 17 00:00:00 2001 From: Korwit Date: Thu, 24 Oct 2019 09:30:03 +0700 Subject: [PATCH 2/5] change to use contentDigest --- packages/gatsby-transformer-screenshot/lambda/index.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/gatsby-transformer-screenshot/lambda/index.js b/packages/gatsby-transformer-screenshot/lambda/index.js index c45b3eda32fb6..69a08e0b6c71c 100644 --- a/packages/gatsby-transformer-screenshot/lambda/index.js +++ b/packages/gatsby-transformer-screenshot/lambda/index.js @@ -56,10 +56,7 @@ exports.run = async (browser, url, width, height, fullPage) => { } const keyBase = `${url}-(${width},${height})` - const contentDigest = createContentDigest - .createHash(`md5`) - .update(keyBase) - .digest(`hex`) + const contentDigest = createContentDigest({ url, width, height }) const key = `${digest}.png` const screenshotUrl = `https://s3-${region}.amazonaws.com/${ From 3109ef2e09eb1c7874090c2ead837d28bf2a34dc Mon Sep 17 00:00:00 2001 From: Sidhartha Chatterjee Date: Mon, 28 Oct 2019 19:33:44 +0530 Subject: [PATCH 3/5] Update yarn.lock --- packages/gatsby-transformer-sqip/package.json | 1 + yarn.lock | 23 +++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/packages/gatsby-transformer-sqip/package.json b/packages/gatsby-transformer-sqip/package.json index d98719ec9971d..1ddf7276d4806 100644 --- a/packages/gatsby-transformer-sqip/package.json +++ b/packages/gatsby-transformer-sqip/package.json @@ -10,6 +10,7 @@ "@babel/runtime": "^7.6.3", "bluebird": "^3.7.0", "fs-extra": "^8.1.0", + "gatsby-core-utils": "^1.0.15", "gatsby-plugin-sharp": "^2.2.32", "md5-file": "^4.0.0", "mini-svg-data-uri": "^1.1.3", diff --git a/yarn.lock b/yarn.lock index e5dad6d5997e3..78befc9cf7ec0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -20565,7 +20565,7 @@ type-of@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/type-of/-/type-of-2.0.1.tgz#e72a1741896568e9f628378d816d6912f7f23972" -typedarray-to-buffer@~3.1.5: +typedarray-to-buffer@^3.1.5, typedarray-to-buffer@~3.1.5: version "3.1.5" resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== @@ -21940,7 +21940,7 @@ wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" -write-file-atomic@2.4.1, write-file-atomic@^2.0.0, write-file-atomic@^2.3.0, write-file-atomic@^2.4.2, write-file-atomic@^3.0.0: +write-file-atomic@2.4.1, write-file-atomic@^2.0.0, write-file-atomic@^2.3.0: version "2.4.1" resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.1.tgz#d0b05463c188ae804396fd5ab2a370062af87529" integrity sha512-TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg== @@ -21949,6 +21949,25 @@ write-file-atomic@2.4.1, write-file-atomic@^2.0.0, write-file-atomic@^2.3.0, wri imurmurhash "^0.1.4" signal-exit "^3.0.2" +write-file-atomic@^2.4.2: + version "2.4.3" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481" + integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ== + dependencies: + graceful-fs "^4.1.11" + imurmurhash "^0.1.4" + signal-exit "^3.0.2" + +write-file-atomic@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.1.tgz#558328352e673b5bb192cf86500d60b230667d4b" + integrity sha512-JPStrIyyVJ6oCSz/691fAjFtefZ6q+fP6tm+OS4Qw6o+TGQxNp1ziY2PgS+X/m0V8OWhZiO/m4xSj+Pr4RrZvw== + dependencies: + imurmurhash "^0.1.4" + is-typedarray "^1.0.0" + signal-exit "^3.0.2" + typedarray-to-buffer "^3.1.5" + write-file-stdout@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/write-file-stdout/-/write-file-stdout-0.0.2.tgz#c252d7c7c5b1b402897630e3453c7bfe690d9ca1" From 3fbe931ccc9c7cb624eedfa7eb019f78889745ce Mon Sep 17 00:00:00 2001 From: Sidhartha Chatterjee Date: Mon, 28 Oct 2019 19:36:56 +0530 Subject: [PATCH 4/5] Make changes from review --- packages/gatsby-transformer-screenshot/lambda/index.js | 5 ++--- packages/gatsby-transformer-sqip/package.json | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/gatsby-transformer-screenshot/lambda/index.js b/packages/gatsby-transformer-screenshot/lambda/index.js index 69a08e0b6c71c..31f6fe3ecc4e7 100644 --- a/packages/gatsby-transformer-screenshot/lambda/index.js +++ b/packages/gatsby-transformer-screenshot/lambda/index.js @@ -1,6 +1,6 @@ const setup = require(`./starter-kit/setup`) -const createContentDigest = jest.fn().mockReturnValue(`contentDigest`) +const { createContentDigest } = require(`gatsby-core-utils`) const AWS = require(`aws-sdk`) const s3 = new AWS.S3({ @@ -55,9 +55,8 @@ exports.run = async (browser, url, width, height, fullPage) => { throw new Error(`invalid bucket ${process.env.S3_BUCKET}`) } - const keyBase = `${url}-(${width},${height})` const contentDigest = createContentDigest({ url, width, height }) - const key = `${digest}.png` + const key = `${contentDigest}.png` const screenshotUrl = `https://s3-${region}.amazonaws.com/${ process.env.S3_BUCKET diff --git a/packages/gatsby-transformer-sqip/package.json b/packages/gatsby-transformer-sqip/package.json index 1ddf7276d4806..b0664b852bba1 100644 --- a/packages/gatsby-transformer-sqip/package.json +++ b/packages/gatsby-transformer-sqip/package.json @@ -25,7 +25,7 @@ "debug": "^3.2.6" }, "peerDependencies": { - "gatsby": "^2.0.15", + "gatsby": "^2.0.0", "gatsby-source-contentful": "^2.0.0", "gatsby-transformer-sharp": "^2.0.0" }, From 09c3a87149a35751754d0970321e8ca36bcc9c13 Mon Sep 17 00:00:00 2001 From: Sidhartha Chatterjee Date: Mon, 28 Oct 2019 19:43:40 +0530 Subject: [PATCH 5/5] Move dependency to right package --- .../lambda/package.json | 3 ++- packages/gatsby-transformer-sqip/package.json | 1 - yarn.lock | 23 ++----------------- 3 files changed, 4 insertions(+), 23 deletions(-) diff --git a/packages/gatsby-transformer-screenshot/lambda/package.json b/packages/gatsby-transformer-screenshot/lambda/package.json index d743d3eea00f9..754fa19e99e1c 100644 --- a/packages/gatsby-transformer-screenshot/lambda/package.json +++ b/packages/gatsby-transformer-screenshot/lambda/package.json @@ -1,5 +1,6 @@ { "dependencies": { + "gatsby-core-utils": "^1.0.15", "puppeteer": "0.13.0", "tar": "^4.4.13" }, @@ -9,4 +10,4 @@ "keywords": [ "gatsby-plugin" ] -} \ No newline at end of file +} diff --git a/packages/gatsby-transformer-sqip/package.json b/packages/gatsby-transformer-sqip/package.json index b0664b852bba1..33dcf82f8ad99 100644 --- a/packages/gatsby-transformer-sqip/package.json +++ b/packages/gatsby-transformer-sqip/package.json @@ -10,7 +10,6 @@ "@babel/runtime": "^7.6.3", "bluebird": "^3.7.0", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.0.15", "gatsby-plugin-sharp": "^2.2.32", "md5-file": "^4.0.0", "mini-svg-data-uri": "^1.1.3", diff --git a/yarn.lock b/yarn.lock index 78befc9cf7ec0..e5dad6d5997e3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -20565,7 +20565,7 @@ type-of@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/type-of/-/type-of-2.0.1.tgz#e72a1741896568e9f628378d816d6912f7f23972" -typedarray-to-buffer@^3.1.5, typedarray-to-buffer@~3.1.5: +typedarray-to-buffer@~3.1.5: version "3.1.5" resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== @@ -21940,7 +21940,7 @@ wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" -write-file-atomic@2.4.1, write-file-atomic@^2.0.0, write-file-atomic@^2.3.0: +write-file-atomic@2.4.1, write-file-atomic@^2.0.0, write-file-atomic@^2.3.0, write-file-atomic@^2.4.2, write-file-atomic@^3.0.0: version "2.4.1" resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.1.tgz#d0b05463c188ae804396fd5ab2a370062af87529" integrity sha512-TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg== @@ -21949,25 +21949,6 @@ write-file-atomic@2.4.1, write-file-atomic@^2.0.0, write-file-atomic@^2.3.0: imurmurhash "^0.1.4" signal-exit "^3.0.2" -write-file-atomic@^2.4.2: - version "2.4.3" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481" - integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ== - dependencies: - graceful-fs "^4.1.11" - imurmurhash "^0.1.4" - signal-exit "^3.0.2" - -write-file-atomic@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.1.tgz#558328352e673b5bb192cf86500d60b230667d4b" - integrity sha512-JPStrIyyVJ6oCSz/691fAjFtefZ6q+fP6tm+OS4Qw6o+TGQxNp1ziY2PgS+X/m0V8OWhZiO/m4xSj+Pr4RrZvw== - dependencies: - imurmurhash "^0.1.4" - is-typedarray "^1.0.0" - signal-exit "^3.0.2" - typedarray-to-buffer "^3.1.5" - write-file-stdout@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/write-file-stdout/-/write-file-stdout-0.0.2.tgz#c252d7c7c5b1b402897630e3453c7bfe690d9ca1"