Clean up package compilation (gatsbyjs#1776)

vladpasculescu · Aug 11, 2017 · 5a2e035 · 5a2e035
1 parent 562d58e
commit 5a2e035
Show file tree

Hide file tree

Showing 23 changed files with 177 additions and 73 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,5 +1,6 @@
 {
   "sourceMaps": true,
+  "ignore": ["__tests__", "dist"],
   "presets": [
     "./.babelrc.js"
   ]

diff --git a/.babelrc.js b/.babelrc.js
@@ -1,22 +1,41 @@
 const r = m => require.resolve(m)
 
-function preset(_, options = {}) {
-  const PRODUCTION = process.env.NODE_ENV === "production"
+function preset(context, options = {}) {
+  const { browser = false, debug = false } = options
+  const { NODE_ENV, BABEL_ENV } = process.env;
+
+  const PRODUCTION = (BABEL_ENV || NODE_ENV) === "production"
+
+  const browserConfig = {
+    useBuiltIns: false,
+    targets: {
+      browsers: PRODUCTION
+        ? [`last 4 versions`, `safari >= 7`, 'ie >= 9']
+        : [`last 2 versions`, `not ie <= 11`, `not android 4.4.3`],
+      uglify: PRODUCTION,
+    },
+  }
+
+  const nodeConfig = {
+    targets: {
+      node: PRODUCTION ? 4.0 : "current",
+    },
+  }
 
   return {
     presets: [
       [
         r("babel-preset-env"),
-        {
-          loose: true,
-          debug: !!options.debug,
-          modules: "commonjs",
-          useBuiltIns: true,
-          targets: {
-            node: PRODUCTION ? 4.0 : "current",
-            uglify: PRODUCTION ? true : false,
+          Object.assign({
+            loose: true,
+            debug: !!debug,
+            useBuiltIns: true,
+            modules: "commonjs",
           },
-        },
+          browser ?
+            browserConfig :
+            nodeConfig
+        )
       ],
       r("babel-preset-react"),
       r("babel-preset-flow"),
@@ -26,7 +45,9 @@ function preset(_, options = {}) {
       [
         r("babel-plugin-transform-runtime"),
         {
-          polyfill: false,
+          // we are only polyfilling the node environment
+          // so we need to enable the runtime replacements for the browser preset
+          polyfill: !!browser,
         },
       ],
       r(`babel-plugin-transform-flow-strip-types`),

diff --git a/packages/gatsby-link/.babelrc b/packages/gatsby-link/.babelrc
@@ -1,14 +1,6 @@
 {
   "presets": [
-    ["env", {
-      "targets": {
-        "browsers": ["last 2 versions", "safari >= 7"]
-      }
-    }],
-    "react"
-  ],
-  "plugins": [
-    "transform-object-rest-spread",
-    "transform-flow-strip-types"
+    ["../../.babelrc.js", { "browser": true }]
   ]
 }
+
diff --git a/packages/gatsby-plugin-canonical-urls/.babelrc b/packages/gatsby-plugin-canonical-urls/.babelrc
@@ -0,0 +1,6 @@
+{
+  "presets": [
+    ["../../.babelrc.js", { "browser": true }]
+  ]
+}
+
diff --git a/packages/gatsby-plugin-catch-links/.babelrc b/packages/gatsby-plugin-catch-links/.babelrc
@@ -0,0 +1,6 @@
+{
+  "presets": [
+    ["../../.babelrc.js", { "browser": true }]
+  ]
+}
+
diff --git a/packages/gatsby-plugin-emotion/.babelrc b/packages/gatsby-plugin-emotion/.babelrc
@@ -0,0 +1,6 @@
+{
+  "presets": [
+    ["../../.babelrc.js", { "browser": true }]
+  ]
+}
+
diff --git a/packages/gatsby-plugin-feed/.babelrc b/packages/gatsby-plugin-feed/.babelrc
@@ -0,0 +1,6 @@
+{
+  "presets": [
+    ["../../.babelrc.js", { "browser": true }]
+  ]
+}
+
diff --git a/packages/gatsby-plugin-glamor/.babelrc b/packages/gatsby-plugin-glamor/.babelrc
@@ -0,0 +1,6 @@
+{
+  "presets": [
+    ["../../.babelrc.js", { "browser": true }]
+  ]
+}
+
diff --git a/packages/gatsby-plugin-google-analytics/.babelrc b/packages/gatsby-plugin-google-analytics/.babelrc
@@ -1,14 +1,6 @@
 {
   "presets": [
-    ["env", {
-      "targets": {
-        "browsers": ["last 2 versions", "safari >= 7"]
-      }
-    }],
-    "react"
-  ],
-  "plugins": [
-    "transform-object-rest-spread",
-    "transform-flow-strip-types"
+    ["../../.babelrc.js", { "browser": true }]
   ]
 }
+
diff --git a/packages/gatsby-plugin-google-tagmanager/.babelrc b/packages/gatsby-plugin-google-tagmanager/.babelrc
@@ -1,14 +1,6 @@
 {
   "presets": [
-    ["env", {
-      "targets": {
-        "browsers": ["last 2 versions", "safari >= 7"]
-      }
-    }],
-    "react"
-  ],
-  "plugins": [
-    "transform-object-rest-spread",
-    "transform-flow-strip-types"
+    ["../../.babelrc.js", { "browser": true }]
   ]
 }
+
diff --git a/packages/gatsby-plugin-jss/.babelrc b/packages/gatsby-plugin-jss/.babelrc
@@ -0,0 +1,6 @@
+{
+  "presets": [
+    ["../../.babelrc.js", { "browser": true }]
+  ]
+}
+
diff --git a/packages/gatsby-plugin-manifest/.babelrc b/packages/gatsby-plugin-manifest/.babelrc
@@ -0,0 +1,6 @@
+{
+  "presets": [
+    ["../../.babelrc.js", { "browser": true }]
+  ]
+}
+
diff --git a/packages/gatsby-plugin-nprogress/.babelrc b/packages/gatsby-plugin-nprogress/.babelrc
@@ -0,0 +1,6 @@
+{
+  "presets": [
+    ["../../.babelrc.js", { "browser": true }]
+  ]
+}
+
diff --git a/packages/gatsby-plugin-offline/.babelrc b/packages/gatsby-plugin-offline/.babelrc
@@ -0,0 +1,6 @@
+{
+  "presets": [
+    ["../../.babelrc.js", { "browser": true }]
+  ]
+}
+
diff --git a/packages/gatsby-plugin-react-helmet/.babelrc b/packages/gatsby-plugin-react-helmet/.babelrc
@@ -0,0 +1,6 @@
+{
+  "presets": [
+    ["../../.babelrc.js", { "browser": true }]
+  ]
+}
+
diff --git a/packages/gatsby-plugin-sitemap/.babelrc b/packages/gatsby-plugin-sitemap/.babelrc
@@ -0,0 +1,6 @@
+{
+  "presets": [
+    ["../../.babelrc.js", { "browser": true }]
+  ]
+}
+
diff --git a/packages/gatsby-plugin-styled-components/.babelrc b/packages/gatsby-plugin-styled-components/.babelrc
@@ -0,0 +1,6 @@
+{
+  "presets": [
+    ["../../.babelrc.js", { "browser": true }]
+  ]
+}
+
diff --git a/packages/gatsby-plugin-twitter/.babelrc b/packages/gatsby-plugin-twitter/.babelrc
@@ -0,0 +1,6 @@
+{
+  "presets": [
+    ["../../.babelrc.js", { "browser": true }]
+  ]
+}
+
diff --git a/packages/gatsby-plugin-typescript/package.json b/packages/gatsby-plugin-typescript/package.json
@@ -20,7 +20,7 @@
   "license": "MIT",
   "main": "index.js",
   "scripts": {
-    "build": "babel src --out-dir . --ignore __tests__",
-    "watch": "babel -w src --out-dir . --ignore __tests__"
+    "build": "babel src --out-dir .",
+    "watch": "babel -w src --out-dir ."
   }
 }
diff --git a/packages/gatsby-plugin-typography/.babelrc b/packages/gatsby-plugin-typography/.babelrc
@@ -0,0 +1,6 @@
+{
+  "presets": [
+    ["../../.babelrc.js", { "browser": true }]
+  ]
+}
+
diff --git a/packages/gatsby-remark-autolink-headers/.babelrc b/packages/gatsby-remark-autolink-headers/.babelrc
@@ -0,0 +1,6 @@
+{
+  "presets": [
+    ["../../.babelrc.js", { "browser": true }]
+  ]
+}
+
diff --git a/plop-templates/package/.babelrc.hbs b/plop-templates/package/.babelrc.hbs
@@ -0,0 +1,5 @@
+{
+  "presets": [
+    ["../../.babelrc.js", { "browser": true }]
+  ]
+}
diff --git a/plopfile.js b/plopfile.js
@@ -13,38 +13,49 @@ module.exports = function(plop) {
         name: `author`,
         message: `Your name/email for putting in the package.json of the new package`,
       },
-    ],
-    actions: [
-      {
-        type: `add`,
-        path: `packages/{{kebabCase name}}/package.json`,
-        templateFile: `plop-templates/package/package.json.hbs`,
-      },
-      {
-        type: `add`,
-        path: `packages/{{kebabCase name}}/index.js`,
-        templateFile: `plop-templates/package/index.js.hbs`,
-      },
-      {
-        type: `add`,
-        path: `packages/{{kebabCase name}}/README.md`,
-        templateFile: `plop-templates/package/README.md.hbs`,
-      },
-      {
-        type: `add`,
-        path: `packages/{{kebabCase name}}/.gitignore`,
-        templateFile: `plop-templates/package/.gitignore.hbs`,
-      },
       {
-        type: `add`,
-        path: `packages/{{kebabCase name}}/.npmignore`,
-        templateFile: `plop-templates/package/.npmignore.hbs`,
-      },
-      {
-        type: `add`,
-        path: `packages/{{kebabCase name}}/src/.gitkeep`,
+        type: `confirm`,
+        name: `isBrowser`,
+        message: `Will this package contain code that runs in a browser, e.g. have a gatsby-browser.js or gatsby-ssr.js file?`,
       },
     ],
+    actions: (data) =>
+      [
+        {
+          type: `add`,
+          path: `packages/{{kebabCase name}}/package.json`,
+          templateFile: `plop-templates/package/package.json.hbs`,
+        },
+        {
+          type: `add`,
+          path: `packages/{{kebabCase name}}/index.js`,
+          templateFile: `plop-templates/package/index.js.hbs`,
+        },
+        {
+          type: `add`,
+          path: `packages/{{kebabCase name}}/README.md`,
+          templateFile: `plop-templates/package/README.md.hbs`,
+        },
+        data.isBrowser && {
+          type: `add`,
+          path: `packages/{{kebabCase name}}/.babelrc`,
+          templateFile: `plop-templates/package/.babelrc.hbs`,
+        },
+        {
+          type: `add`,
+          path: `packages/{{kebabCase name}}/.gitignore`,
+          templateFile: `plop-templates/package/.gitignore.hbs`,
+        },
+        {
+          type: `add`,
+          path: `packages/{{kebabCase name}}/.npmignore`,
+          templateFile: `plop-templates/package/.npmignore.hbs`,
+        },
+        {
+          type: `add`,
+          path: `packages/{{kebabCase name}}/src/.gitkeep`,
+        },
+      ].filter(Boolean),
   })
   // Add new example site
   plop.setGenerator(`example`, {