feat(gatsby): Expose typescript transpiler to default site in plugin …

…list (#26452)
gatsbyjs · Sep 22, 2020 · a8ce6e6 · a8ce6e6
1 parent 1a7a446
commit a8ce6e6
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 39 deletions.
diff --git a/packages/gatsby/src/bootstrap/load-plugins/__tests__/__snapshots__/load-plugins.ts.snap b/packages/gatsby/src/bootstrap/load-plugins/__tests__/__snapshots__/load-plugins.ts.snap
@@ -200,8 +200,12 @@ Array [
   Object {
     "browserAPIs": Array [],
     "id": "",
-    "name": "default-site-plugin",
-    "nodeAPIs": Array [],
+    "name": "gatsby-plugin-typescript",
+    "nodeAPIs": Array [
+      "resolvableExtensions",
+      "onCreateBabelConfig",
+      "onCreateWebpackConfig",
+    ],
     "pluginOptions": Object {
       "plugins": Array [],
     },
@@ -212,12 +216,8 @@ Array [
   Object {
     "browserAPIs": Array [],
     "id": "",
-    "name": "gatsby-plugin-typescript",
-    "nodeAPIs": Array [
-      "resolvableExtensions",
-      "onCreateBabelConfig",
-      "onCreateWebpackConfig",
-    ],
+    "name": "default-site-plugin",
+    "nodeAPIs": Array [],
     "pluginOptions": Object {
       "plugins": Array [],
     },
@@ -476,8 +476,12 @@ Array [
   Object {
     "browserAPIs": Array [],
     "id": "",
-    "name": "default-site-plugin",
-    "nodeAPIs": Array [],
+    "name": "gatsby-plugin-typescript",
+    "nodeAPIs": Array [
+      "resolvableExtensions",
+      "onCreateBabelConfig",
+      "onCreateWebpackConfig",
+    ],
     "pluginOptions": Object {
       "plugins": Array [],
     },
@@ -488,12 +492,8 @@ Array [
   Object {
     "browserAPIs": Array [],
     "id": "",
-    "name": "gatsby-plugin-typescript",
-    "nodeAPIs": Array [
-      "resolvableExtensions",
-      "onCreateBabelConfig",
-      "onCreateWebpackConfig",
-    ],
+    "name": "default-site-plugin",
+    "nodeAPIs": Array [],
     "pluginOptions": Object {
       "plugins": Array [],
     },
@@ -760,8 +760,12 @@ Array [
   Object {
     "browserAPIs": Array [],
     "id": "",
-    "name": "default-site-plugin",
-    "nodeAPIs": Array [],
+    "name": "gatsby-plugin-typescript",
+    "nodeAPIs": Array [
+      "resolvableExtensions",
+      "onCreateBabelConfig",
+      "onCreateWebpackConfig",
+    ],
     "pluginOptions": Object {
       "plugins": Array [],
     },
@@ -772,12 +776,8 @@ Array [
   Object {
     "browserAPIs": Array [],
     "id": "",
-    "name": "gatsby-plugin-typescript",
-    "nodeAPIs": Array [
-      "resolvableExtensions",
-      "onCreateBabelConfig",
-      "onCreateWebpackConfig",
-    ],
+    "name": "default-site-plugin",
+    "nodeAPIs": Array [],
     "pluginOptions": Object {
       "plugins": Array [],
     },

diff --git a/packages/gatsby/src/bootstrap/load-plugins/load.ts b/packages/gatsby/src/bootstrap/load-plugins/load.ts
@@ -231,6 +231,21 @@ export function loadPlugins(
     )
   })
 
+  // TypeScript support by default! use the user-provided one if it exists
+  const typescriptPlugin = (config.plugins || []).find(
+    plugin =>
+      (plugin as IPluginRefObject).resolve === `gatsby-plugin-typescript` ||
+      plugin === `gatsby-plugin-typescript`
+  )
+
+  if (typescriptPlugin === undefined) {
+    plugins.push(
+      processPlugin({
+        resolve: require.resolve(`gatsby-plugin-typescript`),
+      })
+    )
+  }
+
   // Add the site's default "plugin" i.e. gatsby-x files in root of site.
   plugins.push({
     resolve: slash(process.cwd()),
@@ -264,21 +279,6 @@ export function loadPlugins(
     }
   }
 
-  // TypeScript support by default! use the user-provided one if it exists
-  const typescriptPlugin = (config.plugins || []).find(
-    plugin =>
-      (plugin as IPluginRefObject).resolve === `gatsby-plugin-typescript` ||
-      plugin === `gatsby-plugin-typescript`
-  )
-
-  if (typescriptPlugin === undefined) {
-    plugins.push(
-      processPlugin({
-        resolve: require.resolve(`gatsby-plugin-typescript`),
-      })
-    )
-  }
-
   plugins.push(
     processPlugin({
       resolve: require.resolve(`gatsby-plugin-page-creator`),