gatsbyjs · Sep 9, 2020 · Sep 9, 2020 · Sep 10, 2020 · Sep 10, 2020 · Sep 10, 2020
diff --git a/packages/gatsby-admin/CHANGELOG.md b/packages/gatsby-admin/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.1.146](https://github.com/gatsbyjs/gatsby/compare/gatsby-admin@0.1.145...gatsby-admin@0.1.146) (2020-09-10)
+
+**Note:** Version bump only for package gatsby-admin
+
 ## [0.1.145](https://github.com/gatsbyjs/gatsby/compare/gatsby-admin@0.1.144...gatsby-admin@0.1.145) (2020-09-09)
 
 **Note:** Version bump only for package gatsby-admin

diff --git a/packages/gatsby-admin/package.json b/packages/gatsby-admin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gatsby-admin",
-  "version": "0.1.145",
+  "version": "0.1.146",
   "main": "index.js",
   "author": "Max Stoiber",
   "license": "MIT",
@@ -19,7 +19,7 @@
     "csstype": "^2.6.10",
     "feedback-fish": "^0.1.12",
     "formik": "^2.1.4",
-    "gatsby": "^2.24.56",
+    "gatsby": "^2.24.57",
     "gatsby-interface": "0.0.183",
     "gatsby-plugin-typescript": "^2.4.19",
     "gatsby-plugin-webfonts": "^1.1.3",

diff --git a/packages/gatsby-cli/CHANGELOG.md b/packages/gatsby-cli/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.12.95](https://github.com/gatsbyjs/gatsby/compare/gatsby-cli@2.12.94...gatsby-cli@2.12.95) (2020-09-10)
+
+**Note:** Version bump only for package gatsby-cli
+
 ## [2.12.94](https://github.com/gatsbyjs/gatsby/compare/gatsby-cli@2.12.93...gatsby-cli@2.12.94) (2020-09-09)
 
 **Note:** Version bump only for package gatsby-cli

diff --git a/packages/gatsby-cli/package.json b/packages/gatsby-cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-cli",
   "description": "Gatsby command-line interface for creating new sites and running Gatsby commands",
-  "version": "2.12.94",
+  "version": "2.12.95",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bin": {
     "gatsby": "cli.js"
@@ -24,7 +24,7 @@
     "fs-exists-cached": "^1.0.0",
     "fs-extra": "^8.1.0",
     "gatsby-core-utils": "^1.3.19",
-    "gatsby-recipes": "^0.2.23",
+    "gatsby-recipes": "^0.2.24",
     "gatsby-telemetry": "^1.3.32",
     "hosted-git-info": "^3.0.4",
     "ink": "^2.7.1",

diff --git a/packages/gatsby-plugin-sharp/CHANGELOG.md b/packages/gatsby-plugin-sharp/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.6.35](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-sharp@2.6.34...gatsby-plugin-sharp@2.6.35) (2020-09-10)
+
+**Note:** Version bump only for package gatsby-plugin-sharp
+
 ## [2.6.34](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-sharp@2.6.33...gatsby-plugin-sharp@2.6.34) (2020-09-09)
 
 **Note:** Version bump only for package gatsby-plugin-sharp

diff --git a/packages/gatsby-plugin-sharp/package.json b/packages/gatsby-plugin-sharp/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-plugin-sharp",
   "description": "Wrapper of the Sharp image manipulation library for Gatsby plugins",
-  "version": "2.6.34",
+  "version": "2.6.35",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
@@ -14,8 +14,8 @@
     "gatsby-core-utils": "^1.3.19",
     "got": "^10.7.0",
     "imagemin": "^7.0.1",
-    "imagemin-mozjpeg": "^8.0.0",
-    "imagemin-pngquant": "^6.0.1",
+    "imagemin-mozjpeg": "^9.0.0",
+    "imagemin-pngquant": "^9.0.1",
     "lodash": "^4.17.19",
     "mini-svg-data-uri": "^1.2.3",
     "potrace": "^2.1.8",

diff --git a/packages/gatsby-plugin-sharp/src/process-file.js b/packages/gatsby-plugin-sharp/src/process-file.js
@@ -194,10 +194,10 @@ const compressPng = (pipeline, outputPath, options) =>
       .buffer(sharpBuffer, {
         plugins: [
           imageminPngquant({
-            quality: `${options.pngQuality || options.quality}-${Math.min(
-              (options.pngQuality || options.quality) + 25,
-              100
-            )}`, // e.g. 40-65
+            quality: [
+              (options.pngQuality || options.quality) / 100,
+              Math.min(((options.pngQuality || options.quality) + 25) / 100, 1),
+            ], // e.g. [0.4, 0.65]
             speed: options.pngCompressionSpeed
               ? options.pngCompressionSpeed
               : undefined,

diff --git a/packages/gatsby-recipes/CHANGELOG.md b/packages/gatsby-recipes/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.2.24](https://github.com/gatsbyjs/gatsby/compare/gatsby-recipes@0.2.23...gatsby-recipes@0.2.24) (2020-09-10)
+
+### Bug Fixes
+
+- **gatsby-recipes:** renable e2e test for npm package resource & fix dev/prod resource bug ([#26699](https://github.com/gatsbyjs/gatsby/issues/26699)) ([6d963af](https://github.com/gatsbyjs/gatsby/commit/6d963af6d86cd5e9acf4db0d4be6b1ef37fb8dcf))
+
 ## [0.2.23](https://github.com/gatsbyjs/gatsby/compare/gatsby-recipes@0.2.22...gatsby-recipes@0.2.23) (2020-09-09)
 
 ### Bug Fixes

diff --git a/packages/gatsby-recipes/package.json b/packages/gatsby-recipes/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-recipes",
   "description": "Core functionality for Gatsby Recipes",
-  "version": "0.2.23",
+  "version": "0.2.24",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
@@ -75,6 +75,7 @@
     "remark-parse": "^6.0.3",
     "remark-stringify": "^8.1.0",
     "resolve-cwd": "^3.0.0",
+    "resolve-from": "^5.0.0",
     "semver": "^7.3.2",
     "single-trailing-newline": "^1.0.0",
     "strip-ansi": "^6.0.0",

diff --git a/packages/gatsby-recipes/src/providers/gatsby/plugin.js b/packages/gatsby-recipes/src/providers/gatsby/plugin.js
@@ -99,8 +99,8 @@ const getNameForPlugin = node => {
   return null
 }
 
-const getDescriptionForPlugin = async name => {
-  const pkg = await readPackageJSON({}, name)
+const getDescriptionForPlugin = async (root, name) => {
+  const pkg = await readPackageJSON(root, name)
 
   return pkg?.description || ``
 }
@@ -245,7 +245,7 @@ const read = async ({ root }, id) => {
 
     if (plugin) {
       const [description, readme] = await Promise.all([
-        getDescriptionForPlugin(id),
+        getDescriptionForPlugin(root, id),
         getReadmeForPlugin(id),
       ])
       const { shadowedFiles, shadowableFiles } = listShadowableFilesForTheme(

diff --git a/packages/gatsby-recipes/src/providers/npm/__snapshots__/package.test.js.snap b/packages/gatsby-recipes/src/providers/npm/__snapshots__/package.test.js.snap
@@ -1,5 +1,71 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`npm package resource e2e npm package resource test: NPMPackage create 1`] = `
+Object {
+  "_message": "Installed NPM package is-sorted@1.0.0",
+  "description": "A small module to check if an Array is sorted",
+  "id": "is-sorted",
+  "name": "is-sorted",
+  "version": "1.0.0",
+}
+`;
+
+exports[`npm package resource e2e npm package resource test: NPMPackage create plan 1`] = `
+Object {
+  "currentState": undefined,
+  "describe": "Install is-sorted@1.0.0",
+  "newState": "is-sorted@1.0.0",
+}
+`;
+
+exports[`npm package resource e2e npm package resource test: NPMPackage destroy 1`] = `
+Object {
+  "_message": "Installed NPM package is-sorted@1.0.2",
+  "description": "A small module to check if an Array is sorted",
+  "id": "is-sorted",
+  "name": "is-sorted",
+  "version": "1.0.2",
+}
+`;
+
+exports[`npm package resource e2e npm package resource test: NPMPackage update 1`] = `
+Object {
+  "_message": "Installed NPM package is-sorted@1.0.2",
+  "description": "A small module to check if an Array is sorted",
+  "id": "is-sorted",
+  "name": "is-sorted",
+  "version": "1.0.2",
+}
+`;
+
+exports[`npm package resource e2e npm package resource test: NPMPackage update plan 1`] = `
+Object {
+  "currentState": "is-sorted@1.0.0",
+  "describe": "Install is-sorted@1.0.2",
+  "newState": "is-sorted@1.0.2",
+}
+`;
+
+exports[`npm package resource installs 2 resources, one prod & one dev 1`] = `
+Object {
+  "_message": "Installed NPM package div@2.0.0",
+  "description": "&lt;Div row&gt; Use flexbox with ease in React! &lt;/Div&gt;",
+  "id": "div",
+  "name": "div",
+  "version": "2.0.0",
+}
+`;
+
+exports[`npm package resource installs 2 resources, one prod & one dev 2`] = `
+Object {
+  "_message": "Installed NPM package is-odd@3.0.1",
+  "description": "Returns true if the given number is odd, and is an integer that does not exceed the JavaScript MAXIMUM_SAFE_INTEGER.",
+  "id": "is-odd",
+  "name": "is-odd",
+  "version": "3.0.1",
+}
+`;
+
 exports[`package manager client commands generates the correct commands for npm 1`] = `
 Array [
   "install",

diff --git a/...s/src/providers/npm/fixtures/package.json → ...rs/npm/fixtures/package-json/package.json b/...s/src/providers/npm/fixtures/package.json → ...rs/npm/fixtures/package-json/package.json
diff --git a/packages/gatsby-recipes/src/providers/npm/fixtures/scripts/package.json b/packages/gatsby-recipes/src/providers/npm/fixtures/scripts/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "test",
+  "scripts": {}
+}
diff --git a/packages/gatsby-recipes/src/providers/npm/package-json.test.js b/packages/gatsby-recipes/src/providers/npm/package-json.test.js
@@ -3,7 +3,7 @@ const path = require(`path`)
 const pkgJson = require(`./package-json`)
 const resourceTestHelper = require(`../resource-test-helper`)
 
-const root = path.join(__dirname, `fixtures`)
+const root = path.join(__dirname, `fixtures`, `package-json`)
 
 const name = `husky`
 const initialValue = JSON.stringify(

diff --git a/packages/gatsby-recipes/src/providers/npm/package.js b/packages/gatsby-recipes/src/providers/npm/package.js
@@ -4,18 +4,31 @@ const Joi = require(`@hapi/joi`)
 const path = require(`path`)
 const fs = require(`fs-extra`)
 const { getConfigStore } = require(`gatsby-core-utils`)
-const resolveCwd = require(`resolve-cwd`)
+const resolveFrom = require(`resolve-from`)
+const lock = require(`../lock`)
 
 const packageMangerConfigKey = `cli.packageManager`
 const PACKAGE_MANGER = getConfigStore().get(packageMangerConfigKey) || `yarn`
 
 const resourceSchema = require(`../resource-schema`)
 
+const readPackageJson = async (root, pkg) => {
+  let obj
+  try {
+    const fullPath = resolveFrom(root, path.join(pkg, `package.json`))
+    const contents = await fs.readFile(fullPath, `utf8`)
+    obj = JSON.parse(contents)
+  } catch (e) {
+    // ignore
+  }
+  return obj
+}
+
 const getPackageNames = packages => packages.map(n => `${n.name}@${n.version}`)
 
 // Generate install commands
 const generateClientComands = ({ packageManager, depType, packageNames }) => {
-  let commands = []
+  const commands = []
   if (packageManager === `yarn`) {
     commands.push(`add`)
     // Needed for Yarn Workspaces and is a no-opt elsewhere.
@@ -48,7 +61,7 @@ const executeInstalls = async root => {
   const depType = installs[0].resource.dependencyType
   const packagesToInstall = types[depType]
   installs = installs.filter(
-    i => !_.some(packagesToInstall, p => i.resource.id === p.resource.id)
+    i => !packagesToInstall.some(p => i.resource.name === p.resource.name)
   )
 
   const pkgs = packagesToInstall.map(p => p.resource)
@@ -60,6 +73,7 @@ const executeInstalls = async root => {
     packageManager: PACKAGE_MANGER,
   })
 
+  const release = await lock(`package.json`)
   try {
     await execa(PACKAGE_MANGER, commands, {
       cwd: root,
@@ -75,12 +89,13 @@ const executeInstalls = async root => {
       )
     })
   }
+  release()
 
   packagesToInstall.forEach(p => p.outsideResolve())
 
   // Run again if there's still more installs.
   if (installs.length > 0) {
-    executeInstalls()
+    executeInstalls(root)
   }
 
   return undefined
@@ -118,22 +133,19 @@ const create = async ({ root }, resource) => {
 }
 
 const read = async ({ root }, id) => {
-  let packageJSON
-  try {
-    packageJSON = JSON.parse(
-      await fs.readFile(resolveCwd(path.join(id, `package.json`)))
-    )
-  } catch (e) {
+  const pkg = await readPackageJson(root, id)
+
+  if (pkg) {
+    return {
+      id,
+      name: id,
+      description: pkg.description,
+      version: pkg.version,
+      _message: `Installed NPM package ${id}@${pkg.version}`,
+    }
+  } else {
     return undefined
   }
-
-  return {
-    id: packageJSON.name,
-    name: packageJSON.name,
-    description: packageJSON.description,
-    version: packageJSON.version,
-    _message: `Installed NPM package ${packageJSON.name}@${packageJSON.version}`,
-  }
 }
 
 const schema = {

diff --git a/packages/gatsby-recipes/src/providers/npm/package.test.js b/packages/gatsby-recipes/src/providers/npm/package.test.js
@@ -8,15 +8,15 @@ const resourceTestHelper = require(`../resource-test-helper`)
 
 const root = path.join(os.tmpdir(), uuid.v4())
 fs.mkdirSync(root)
-const pkgResource = { name: `glob` }
+const pkgResource = { name: `div` }
 
 test(`plan returns a description`, async () => {
   const result = await pkg.plan({ root }, pkgResource)
 
-  expect(result.describe).toEqual(expect.stringContaining(`Install glob`))
+  expect(result.describe).toEqual(expect.stringContaining(`Install div`))
 })
 
-describe.skip(`npm package resource`, () => {
+describe(`npm package resource`, () => {
   test(`e2e npm package resource test`, async () => {
     await resourceTestHelper({
       resourceModule: pkg,
@@ -26,6 +26,18 @@ describe.skip(`npm package resource`, () => {
       partialUpdate: { name: `is-sorted`, version: `1.0.2` },
     })
   })
+  test(`installs 2 resources, one prod & one dev`, async () => {
+    await Promise.all([
+      pkg.create({ root }, { name: `div` }),
+      pkg.create({ root }, { name: `is-odd`, dependencyType: `development` }),
+    ])
+
+    const divResource = await pkg.read({ root }, `div`)
+    const isOddResource = await pkg.read({ root }, `is-odd`)
+
+    expect(divResource).toMatchSnapshot()
+    expect(isOddResource).toMatchSnapshot()
+  }, 20000)
 })
 
 describe(`package manager client commands`, () => {

diff --git a/packages/gatsby-recipes/src/providers/npm/script.test.js b/packages/gatsby-recipes/src/providers/npm/script.test.js
@@ -3,7 +3,7 @@ const path = require(`path`)
 const script = require(`./script`)
 const resourceTestHelper = require(`../resource-test-helper`)
 
-const root = path.join(__dirname, `fixtures`)
+const root = path.join(__dirname, `fixtures`, `scripts`)
 
 describe(`npm script resource`, () => {
   test(`e2e script resource test`, async () => {

diff --git a/packages/gatsby-source-contentful/CHANGELOG.md b/packages/gatsby-source-contentful/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.3.45](https://github.com/gatsbyjs/gatsby/compare/gatsby-source-contentful@2.3.44...gatsby-source-contentful@2.3.45) (2020-09-10)
+
+**Note:** Version bump only for package gatsby-source-contentful
+
 ## [2.3.44](https://github.com/gatsbyjs/gatsby/compare/gatsby-source-contentful@2.3.43...gatsby-source-contentful@2.3.44) (2020-09-09)
 
 **Note:** Version bump only for package gatsby-source-contentful