chore(gatsby, gatsby-transformer-remark, gatsby-plugin-sharp): Cleanu…

…p v4 compile flag conditions (#36486) Co-authored-by: Ward Peeters <ward@coding-tech.com>
gatsbyjs · Aug 30, 2022 · 9dcc773 · 9dcc773
1 parent e421c10
commit 9dcc773
Show file tree

Hide file tree

Showing 20 changed files with 152 additions and 270 deletions.
diff --git a/packages/gatsby-plugin-sharp/src/gatsby-node.js b/packages/gatsby-plugin-sharp/src/gatsby-node.js
@@ -11,20 +11,6 @@ const { slash } = require(`gatsby-core-utils/path`)
 const { setPluginOptions } = require(`./plugin-options`)
 const path = require(`path`)
 
-let coreSupportsOnPluginInit
-try {
-  const { isGatsbyNodeLifecycleSupported } = require(`gatsby-plugin-utils`)
-  if (_CFLAGS_.GATSBY_MAJOR === `4`) {
-    coreSupportsOnPluginInit = isGatsbyNodeLifecycleSupported(`onPluginInit`)
-  } else {
-    coreSupportsOnPluginInit = isGatsbyNodeLifecycleSupported(
-      `unstable_onPluginInit`
-    )
-  }
-} catch (e) {
-  coreSupportsOnPluginInit = false
-}
-
 function removeCachedValue(cache, key) {
   if (cache?.del) {
     // if cache expose ".del" method directly on public interface
@@ -129,19 +115,10 @@ exports.onPostBootstrap = async ({ reporter, cache, store }) => {
   }
 }
 
-if (coreSupportsOnPluginInit) {
-  // to properly initialize plugin in worker (`onPreBootstrap` won't run in workers)
-  if (_CFLAGS_.GATSBY_MAJOR === `4`) {
-    exports.onPluginInit = async ({ actions }, pluginOptions) => {
-      setActions(actions)
-      setPluginOptions(pluginOptions)
-    }
-  } else {
-    exports.unstable_onPluginInit = async ({ actions }, pluginOptions) => {
-      setActions(actions)
-      setPluginOptions(pluginOptions)
-    }
-  }
+// to properly initialize plugin in worker (`onPreBootstrap` won't run in workers)
+exports.onPluginInit = async ({ actions }, pluginOptions) => {
+  setActions(actions)
+  setPluginOptions(pluginOptions)
 }
 
 exports.onPreBootstrap = async ({ actions, emitter, cache }, pluginOptions) => {

diff --git a/packages/gatsby-transformer-remark/src/create-schema-customization.js b/packages/gatsby-transformer-remark/src/create-schema-customization.js
@@ -40,8 +40,7 @@ module.exports = (nodeApiArgs, pluginOptions = {}) => {
   // to customize the GraphQL schema. This makes it possible for subplugins to
   // modify types owned by `gatsby-transformer-remark`.
   plugins.forEach(plugin => {
-    const resolvedPlugin =
-      _CFLAGS_.GATSBY_MAJOR === `4` ? plugin.module : require(plugin.resolve)
+    const resolvedPlugin = plugin.module
 
     if (typeof resolvedPlugin.createSchemaCustomization === `function`) {
       resolvedPlugin.createSchemaCustomization(

diff --git a/packages/gatsby-transformer-remark/src/extend-node-type.js b/packages/gatsby-transformer-remark/src/extend-node-type.js
@@ -135,8 +135,7 @@ module.exports = function remarkExtendNodeType(
     }
 
     for (const plugin of pluginOptions.plugins) {
-      const requiredPlugin =
-        _CFLAGS_.GATSBY_MAJOR === `4` ? plugin.module : require(plugin.resolve)
+      const requiredPlugin = plugin.module
       if (_.isFunction(requiredPlugin.setParserPlugins)) {
         for (const parserPlugin of requiredPlugin.setParserPlugins(
           plugin.pluginOptions
@@ -294,10 +293,8 @@ module.exports = function remarkExtendNodeType(
 
       // Use a for loop to run remark plugins serially.
       for (const plugin of pluginOptions.plugins) {
-        const requiredPlugin =
-          _CFLAGS_.GATSBY_MAJOR === `4`
-            ? plugin.module
-            : require(plugin.resolve)
+        const requiredPlugin = plugin.module
+
         // Allow both exports = function(), and exports.default = function()
         const defaultFunction = _.isFunction(requiredPlugin)
           ? requiredPlugin
@@ -350,10 +347,8 @@ module.exports = function remarkExtendNodeType(
       //
       // Use for loop to run remark plugins serially.
       for (const plugin of pluginOptions.plugins) {
-        const requiredPlugin =
-          _CFLAGS_.GATSBY_MAJOR === `4`
-            ? plugin.module
-            : require(plugin.resolve)
+        const requiredPlugin = plugin.module
+
         if (typeof requiredPlugin.mutateSource === `function`) {
           await requiredPlugin.mutateSource(
             {

diff --git a/packages/gatsby-transformer-remark/src/gatsby-node.js b/packages/gatsby-transformer-remark/src/gatsby-node.js
@@ -18,22 +18,8 @@ exports.pluginOptionsSchema = function ({ Joi }) {
     excerpt_separator: Joi.string().description(
       `If your Markdown file contains HTML, excerpt will not return a value. In that case, you can set an excerpt_separator to an HTML tag. Edit your Markdown files to include that HTML tag after the text you’d like to appear in the excerpt.`
     ),
-    plugins:
-      _CFLAGS_.GATSBY_MAJOR === `4`
-        ? Joi.subPlugins().description(
-            `A list of remark plugins. See also: https://github.com/gatsbyjs/gatsby/tree/master/examples/using-remark for examples`
-          )
-        : Joi.array()
-            .items(
-              Joi.string(),
-              Joi.object({
-                resolve: Joi.string(),
-                options: Joi.object({}).unknown(true),
-              })
-            )
-            .default([])
-            .description(
-              `A list of remark plugins. See also: https://github.com/gatsbyjs/gatsby/tree/master/examples/using-remark for examples`
-            ),
+    plugins: Joi.subPlugins().description(
+      `A list of remark plugins. See also: https://github.com/gatsbyjs/gatsby/tree/master/examples/using-remark for examples`
+    ),
   })
 }
diff --git a/packages/gatsby/src/bootstrap/load-plugins/load-internal-plugins.ts b/packages/gatsby/src/bootstrap/load-plugins/load-internal-plugins.ts
@@ -76,7 +76,6 @@ export function loadInternalPlugins(
   })
 
   if (
-    _CFLAGS_.GATSBY_MAJOR === `4` &&
     configuredPluginNames.has(GATSBY_CLOUD_PLUGIN_NAME) &&
     incompatibleGatsbyCloudPlugin(plugins)
   ) {

diff --git a/packages/gatsby/src/bootstrap/requires-writer.ts b/packages/gatsby/src/bootstrap/requires-writer.ts
@@ -111,14 +111,8 @@ const getMatchPaths = (
   const matchPathPages: Array<IMatchPathEntry> = []
 
   pages.forEach((page: IGatsbyPage, index: number): void => {
-    if (_CFLAGS_.GATSBY_MAJOR === `4`) {
-      if (page.matchPath && getPageMode(page) === `SSG`) {
-        matchPathPages.push(createMatchPathEntry(page, index))
-      }
-    } else {
-      if (page.matchPath) {
-        matchPathPages.push(createMatchPathEntry(page, index))
-      }
+    if (page.matchPath && getPageMode(page) === `SSG`) {
+      matchPathPages.push(createMatchPathEntry(page, index))
     }
   })
 

diff --git a/packages/gatsby/src/commands/build-html.ts b/packages/gatsby/src/commands/build-html.ts
@@ -546,14 +546,6 @@ export async function buildHTMLPagesAndDeleteStaleArtifacts({
     reporter.info(`There are no new or changed html files to build.`)
   }
 
-  if (_CFLAGS_.GATSBY_MAJOR !== `4` && !program.keepPageRenderer) {
-    try {
-      await deleteRenderer(pageRenderer)
-    } catch (err) {
-      // pass through
-    }
-  }
-
   if (toDelete.length > 0) {
     const publicDir = path.join(program.directory, `public`)
     const deletePageDataActivityTimer = reporter.activityTimer(

diff --git a/packages/gatsby/src/commands/build-utils.ts b/packages/gatsby/src/commands/build-utils.ts
@@ -162,15 +162,7 @@ export function calcDirtyHtmlFiles(state: IGatsbyState): {
       // and because of that `isDeleted` might not be set ...
       markActionForPage(path, `delete`)
     } else {
-      if (_CFLAGS_.GATSBY_MAJOR === `4`) {
-        if (getPageMode(page, state) === `SSG`) {
-          if (htmlFile.dirty || state.html.unsafeBuiltinWasUsedInSSR) {
-            markActionForPage(path, `regenerate`)
-          } else {
-            markActionForPage(path, `reuse`)
-          }
-        }
-      } else {
+      if (getPageMode(page, state) === `SSG`) {
         if (htmlFile.dirty || state.html.unsafeBuiltinWasUsedInSSR) {
           markActionForPage(path, `regenerate`)
         } else {

diff --git a/packages/gatsby/src/commands/build.ts b/packages/gatsby/src/commands/build.ts
@@ -180,7 +180,7 @@ module.exports = async function build(
     buildActivityTimer.end()
   }
 
-  if (_CFLAGS_.GATSBY_MAJOR === `4` && shouldGenerateEngines()) {
+  if (shouldGenerateEngines()) {
     const state = store.getState()
     const buildActivityTimer = report.activityTimer(
       `Building Rendering Engines`,
@@ -246,7 +246,7 @@ module.exports = async function build(
     pageConfigActivity.end()
   }
 
-  if (_CFLAGS_.GATSBY_MAJOR === `4` && shouldGenerateEngines()) {
+  if (shouldGenerateEngines()) {
     const validateEnginesActivity = report.activityTimer(
       `Validating Rendering Engines`,
       {
@@ -284,11 +284,10 @@ module.exports = async function build(
   const { queryIds } = await calculateDirtyQueries({ store })
 
   // Only run queries with mode SSG
-  if (_CFLAGS_.GATSBY_MAJOR === `4`) {
-    queryIds.pageQueryIds = queryIds.pageQueryIds.filter(
-      query => getPageMode(query) === `SSG`
-    )
-  }
+
+  queryIds.pageQueryIds = queryIds.pageQueryIds.filter(
+    query => getPageMode(query) === `SSG`
+  )
 
   // Start saving page.mode in the main process (while queries run in workers in parallel)
   const waitMaterializePageMode = materializePageMode()
@@ -405,7 +404,7 @@ module.exports = async function build(
   // we need to save it again to make sure our latest state has been saved
   await db.saveState()
 
-  if (_CFLAGS_.GATSBY_MAJOR === `4` && shouldGenerateEngines()) {
+  if (shouldGenerateEngines()) {
     // well, tbf we should just generate this in `.cache` and avoid deleting it :shrug:
     program.keepPageRenderer = true
   }