Skip to content

fix(gatsby): Deprecate schema-related APIs in sourceNodes #32291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Sep 10, 2021
Merged

fix(gatsby): Deprecate schema-related APIs in sourceNodes #32291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f86a403
Deprecate createTypes in sourceNodes
abhiaiyer91 Jul 7, 2021
6c373df
Update the restriction list for other schema-related actions
abhiaiyer91 Jul 12, 2021
6615a2d
Update snapshots
abhiaiyer91 Jul 12, 2021
e6beec8
Restore package.test.js.snap
LekoArts Jul 13, 2021
388cb71
Restore share-state.ts
LekoArts Jul 13, 2021
902b9ed
Merge branch 'master' into disallowCreateTypes
wardpeet Aug 19, 2021
f5fd2d8
Merge remote-tracking branch 'upstream/master' into disallowCreateTypes
Sep 9, 2021
86034c2
Merge branch 'master' into disallowCreateTypes
wardpeet Sep 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions packages/gatsby/src/redux/actions/__tests__/restricted.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,25 @@ const dispatchWithThunk = actionOrThunk =>
describe(`Restricted actions`, () => {
it(`handles actions allowed in API`, () => {
const action = dispatchWithThunk(
availableActionsByAPI.sourceNodes.createTypes()
availableActionsByAPI.createSchemaCustomization.createTypes()
)
expect(action).toEqual({ type: `CREATE_TYPES` })
expect(report.warn).not.toHaveBeenCalled()
expect(report.error).not.toHaveBeenCalled()
})

it(`handles actions deprecated in API`, () => {
const action = dispatchWithThunk(
let action = dispatchWithThunk(
availableActionsByAPI.onPreBootstrap.createTypes()
)
expect(action).toEqual({ type: `CREATE_TYPES` })
expect(report.warn).toHaveBeenCalled()
expect(report.error).not.toHaveBeenCalled()

action = dispatchWithThunk(availableActionsByAPI.sourceNodes.createTypes())
expect(action).toEqual({ type: `CREATE_TYPES` })
expect(report.warn).toHaveBeenCalled()
expect(report.error).not.toHaveBeenCalled()
})

it(`handles actions forbidden in API`, () => {
Expand Down
11 changes: 6 additions & 5 deletions packages/gatsby/src/redux/actions/restricted.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,18 +522,19 @@ const mapAvailableActionsToAPIs = (

export const availableActionsByAPI = mapAvailableActionsToAPIs({
createFieldExtension: {
[ALLOWED_IN]: [`sourceNodes`, `createSchemaCustomization`],
[ALLOWED_IN]: [`createSchemaCustomization`],
[DEPRECATED_IN]: [`sourceNodes`],
},
createTypes: {
[ALLOWED_IN]: [`sourceNodes`, `createSchemaCustomization`],
[DEPRECATED_IN]: [`onPreInit`, `onPreBootstrap`],
[ALLOWED_IN]: [`createSchemaCustomization`],
[DEPRECATED_IN]: [`onPreInit`, `onPreBootstrap`, `sourceNodes`],
},
createResolverContext: {
[ALLOWED_IN]: [`createSchemaCustomization`],
},
addThirdPartySchema: {
[ALLOWED_IN]: [`sourceNodes`, `createSchemaCustomization`],
[DEPRECATED_IN]: [`onPreInit`, `onPreBootstrap`],
[ALLOWED_IN]: [`createSchemaCustomization`],
[DEPRECATED_IN]: [`onPreInit`, `onPreBootstrap`, `sourceNodes`],
},
printTypeDefinitions: {
[ALLOWED_IN]: [`createSchemaCustomization`],
Expand Down