Simplify node babel and move cache-dir (gatsbyjs#1757)

* Simplify node babel and move cache-dir * ignore tests in build * fix tests * add back lock file * Add missing .gitignore * Also delete index.js * Format
caoyonghao · Aug 11, 2017 · 5728c6b · 5728c6b
1 parent 6eddf77
commit 5728c6b
Show file tree

Hide file tree

Showing 58 changed files with 471 additions and 583 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,30 +1,6 @@
 {
   "sourceMaps": true,
-  // "env": {
-  //   "development": {
-  //     "sourceMaps": "inline"
-  //   },
-  //   "production": {
-  //     "sourceMaps": false
-  //   }
-  // },
   "presets": [
-    [
-      "env",
-      {
-        "targets": {
-          "node": 4.0,
-          "uglify": true,
-        }
-      }
-    ],
-    "react",
-    "flow"
-  ],
-  "plugins": [
-    "transform-runtime",
-    "transform-object-rest-spread",
-    "transform-async-to-generator",
-    "transform-flow-strip-types"
+    "./.babelrc.js"
   ]
 }
diff --git a/.babelrc.js b/.babelrc.js
@@ -0,0 +1,37 @@
+const r = m => require.resolve(m)
+
+function preset(_, options = {}) {
+  const PRODUCTION = process.env.NODE_ENV === "production"
+
+  return {
+    presets: [
+      [
+        r("babel-preset-env"),
+        {
+          loose: true,
+          debug: !!options.debug,
+          modules: "commonjs",
+          targets: {
+            node: PRODUCTION ? 4.0 : "current",
+            uglify: PRODUCTION ? true : false,
+          },
+        },
+      ],
+      r("babel-preset-react"),
+      r("babel-preset-flow"),
+    ],
+    plugins: [
+      r("babel-plugin-transform-object-rest-spread"),
+      [
+        r("babel-plugin-transform-runtime"),
+        {
+          polyfill: false,
+          regenerator: false,
+        },
+      ],
+      r(`babel-plugin-transform-flow-strip-types`),
+    ],
+  }
+}
+
+module.exports = preset
diff --git a/package.json b/package.json
@@ -15,6 +15,7 @@
     "babel-register": "^6.24.1",
     "babel-runtime": "^6.23.0",
     "create-react-class": "^15.6.0",
+    "cross-env": "^5.0.5",
     "eslint": "^4.2.0",
     "eslint-config-google": "^0.9.1",
     "eslint-config-prettier": "^2.3.0",
@@ -42,25 +43,25 @@
   },
   "private": true,
   "scripts": {
-    "build": "lerna run build",
+    "build": "cross-env NODE_ENV=production lerna run build",
+    "check-versions": "babel-node scripts/check-versions.js",
     "format": "npm run format-packages && npm run format-www && npm run format-examples && npm run format-scripts",
     "format-examples": "prettier-eslint --write \"examples/**/gatsby-node.js\" \"examples/**/src/**/*.js\"",
     "format-packages": "prettier-eslint --write \"packages/*/src/**/*.js\"",
     "format-scripts": "prettier-eslint --write \"scripts/**/*.js\"",
     "format-www": "prettier-eslint --write \"www/*.js\" \"www/src/**/*.js\"",
     "lerna": "lerna",
-    "check-versions": "babel-node scripts/check-versions.js",
     "lint": "npm run check-versions && eslint --ext .js,.jsx --ignore-path .gitignore .",
     "lint:flow": "babel-node scripts/flow-check.js",
     "plop": "plop",
     "postinstall": "npm run check-versions && lerna bootstrap",
+    "publish": "npm run build && lerna publish",
     "publish-canary": "lerna run build && lerna publish --canary --yes",
     "publish-next": "lerna run build && lerna publish --npm-tag=next",
-    "publish": "lerna run build && lerna publish",
     "remotedev": "remotedev --hostname=localhost --port=19999",
     "test": "jest",
-    "test:watch": "jest --watch",
     "test:update": "jest --updateSnapshot",
+    "test:watch": "jest --watch",
     "test_bkup": "npm run lint && npm run test-node && npm run test-integration",
     "watch": "lerna run watch --no-sort --stream --concurrency 999"
   }

diff --git a/packages/gatsby-dev-cli/src/watch.js b/packages/gatsby-dev-cli/src/watch.js
@@ -54,10 +54,10 @@ function watch(root, packages, { scanOnce, quiet }) {
           copyPath(path, newPath, quiet)
 
           // If this is from "cache-dir" also copy it into the site's .cache
-          if (_.includes(path, `dist/cache-dir`)) {
+          if (_.includes(path, `cache-dir`)) {
             const newCachePath = syspath.join(
               `.cache/`,
-              syspath.relative(syspath.join(prefix, `dist`, `cache-dir`), path)
+              syspath.relative(syspath.join(prefix, `cache-dir`), path)
             )
             copyPath(path, newCachePath, quiet)
           }

diff --git a/packages/gatsby-link/package.json b/packages/gatsby-link/package.json
@@ -5,8 +5,8 @@
   "main": "index.js",
   "types": "index.d.ts",
   "scripts": {
-    "build": "babel src --out-dir .",
-    "watch": "babel -w src --out-dir ."
+    "build": "babel src --out-dir . --ignore __tests__",
+    "watch": "babel -w src --out-dir . --ignore __tests__"
   },
   "keywords": [
     "gatsby",

diff --git a/packages/gatsby-plugin-catch-links/package.json b/packages/gatsby-plugin-catch-links/package.json
@@ -4,8 +4,8 @@
   "description": "Intercepts local links from markdown and other non-react pages and does a client-side pushState to avoid the browser having to refresh the page.",
   "main": "index.js",
   "scripts": {
-    "build": "babel src --out-dir .",
-    "watch": "babel -w src --out-dir ."
+    "build": "babel src --out-dir . --ignore __tests__",
+    "watch": "babel -w src --out-dir . --ignore __tests__"
   },
   "keywords": [
     "gatsby",

diff --git a/packages/gatsby-plugin-coffeescript/package.json b/packages/gatsby-plugin-coffeescript/package.json
@@ -21,7 +21,7 @@
   "main": "index.js",
   "readme": "README.md",
   "scripts": {
-    "build": "babel src --out-dir .",
-    "watch": "babel -w src --out-dir ."
+    "build": "babel src --out-dir . --ignore __tests__",
+    "watch": "babel -w src --out-dir . --ignore __tests__"
   }
 }
diff --git a/packages/gatsby-plugin-feed/package.json b/packages/gatsby-plugin-feed/package.json
@@ -4,8 +4,8 @@
   "description": "Creates an RSS feed for your Gatsby site.",
   "main": "index.js",
   "scripts": {
-    "build": "babel src --out-dir .",
-    "watch": "babel -w src --out-dir ."
+    "build": "babel src --out-dir . --ignore __tests__",
+    "watch": "babel -w src --out-dir . --ignore __tests__"
   },
   "keywords": [
     "gatsby",

diff --git a/packages/gatsby-plugin-glamor/package.json b/packages/gatsby-plugin-glamor/package.json
@@ -17,7 +17,7 @@
   "license": "MIT",
   "main": "index.js",
   "scripts": {
-    "build": "babel src --out-dir .",
-    "watch": "babel -w src --out-dir ."
+    "build": "babel src --out-dir . --ignore __tests__",
+    "watch": "babel -w src --out-dir . --ignore __tests__"
   }
 }
diff --git a/packages/gatsby-plugin-google-analytics/package.json b/packages/gatsby-plugin-google-analytics/package.json
@@ -14,7 +14,7 @@
   "license": "MIT",
   "main": "index.js",
   "scripts": {
-    "build": "babel src --out-dir .",
-    "watch": "babel -w src --out-dir ."
+    "build": "babel src --out-dir . --ignore __tests__",
+    "watch": "babel -w src --out-dir . --ignore __tests__"
   }
 }
diff --git a/packages/gatsby-plugin-google-tagmanager/package.json b/packages/gatsby-plugin-google-tagmanager/package.json
@@ -15,7 +15,7 @@
   "license": "MIT",
   "main": "index.js",
   "scripts": {
-    "build": "babel src --out-dir .",
-    "watch": "babel -w src --out-dir ."
+    "build": "babel src --out-dir . --ignore __tests__",
+    "watch": "babel -w src --out-dir . --ignore __tests__"
   }
 }
diff --git a/packages/gatsby-plugin-manifest/package.json b/packages/gatsby-plugin-manifest/package.json
@@ -4,8 +4,8 @@
   "description": "Gatsby plugin which adds a manifest.json to make sites progressive web apps",
   "main": "index.js",
   "scripts": {
-    "build": "babel src --out-dir .",
-    "watch": "babel -w src --out-dir ."
+    "build": "babel src --out-dir . --ignore __tests__",
+    "watch": "babel -w src --out-dir . --ignore __tests__"
   },
   "keywords": [
     "gatsby",

diff --git a/packages/gatsby-plugin-offline/package.json b/packages/gatsby-plugin-offline/package.json
@@ -16,8 +16,8 @@
   "license": "MIT",
   "main": "index.js",
   "scripts": {
-    "build": "babel src --out-dir .",
-    "watch": "babel -w src --out-dir ."
+    "build": "babel src --out-dir . --ignore __tests__",
+    "watch": "babel -w src --out-dir . --ignore __tests__"
   },
   "dependencies": {
     "sw-precache": "^5.0.0"

diff --git a/packages/gatsby-plugin-postcss-sass/package.json b/packages/gatsby-plugin-postcss-sass/package.json
@@ -22,7 +22,7 @@
   "main": "index.js",
   "readme": "README.md",
   "scripts": {
-    "build": "babel src --out-dir .",
-    "watch": "babel -w src --out-dir ."
+    "build": "babel src --out-dir . --ignore __tests__",
+    "watch": "babel -w src --out-dir . --ignore __tests__"
   }
 }
diff --git a/packages/gatsby-plugin-preact/package.json b/packages/gatsby-plugin-preact/package.json
@@ -4,8 +4,8 @@
   "description": "A Gatsby plugin which replaces React with Preact",
   "main": "index.js",
   "scripts": {
-    "build": "babel src --out-dir .",
-    "watch": "babel -w src --out-dir ."
+    "build": "babel src --out-dir . --ignore __tests__",
+    "watch": "babel -w src --out-dir . --ignore __tests__"
   },
   "keywords": [
     "gatsby",

diff --git a/packages/gatsby-plugin-sass/package.json b/packages/gatsby-plugin-sass/package.json
@@ -21,7 +21,7 @@
   "main": "index.js",
   "readme": "README.md",
   "scripts": {
-    "build": "babel src --out-dir .",
-    "watch": "babel -w src --out-dir ."
+    "build": "babel src --out-dir . --ignore __tests__",
+    "watch": "babel -w src --out-dir . --ignore __tests__"
   }
 }
diff --git a/packages/gatsby-plugin-sharp/package.json b/packages/gatsby-plugin-sharp/package.json
@@ -24,7 +24,7 @@
   "license": "MIT",
   "main": "index.js",
   "scripts": {
-    "build": "babel src --out-dir .",
-    "watch": "babel -w src --out-dir ."
+    "build": "babel src --out-dir . --ignore __tests__",
+    "watch": "babel -w src --out-dir . --ignore __tests__"
   }
 }
diff --git a/packages/gatsby-plugin-stylus/package.json b/packages/gatsby-plugin-stylus/package.json
@@ -18,7 +18,7 @@
   "main": "./gatsby-node.js",
   "readme": "README.md",
   "scripts": {
-    "build": "babel src --out-dir .",
-    "watch": "babel -w src --out-dir ."
+    "build": "babel src --out-dir . --ignore __tests__",
+    "watch": "babel -w src --out-dir . --ignore __tests__"
   }
 }
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 .",
-    "watch": "babel -w src --out-dir ."
+    "build": "babel src --out-dir . --ignore __tests__",
+    "watch": "babel -w src --out-dir . --ignore __tests__"
   }
 }
diff --git a/packages/gatsby-remark-autolink-headers/package.json b/packages/gatsby-remark-autolink-headers/package.json
@@ -19,7 +19,7 @@
   "license": "MIT",
   "main": "index.js",
   "scripts": {
-    "build": "babel src --out-dir .",
-    "watch": "babel -w src --out-dir ."
+    "build": "babel src --out-dir . --ignore __tests__",
+    "watch": "babel -w src --out-dir . --ignore __tests__"
   }
 }
diff --git a/packages/gatsby-remark-copy-linked-files/package.json b/packages/gatsby-remark-copy-linked-files/package.json
@@ -22,7 +22,7 @@
   "license": "MIT",
   "main": "index.js",
   "scripts": {
-    "build": "babel src --out-dir .",
-    "watch": "babel -w src --out-dir ."
+    "build": "babel src --out-dir . --ignore __tests__",
+    "watch": "babel -w src --out-dir . --ignore __tests__"
   }
 }
diff --git a/packages/gatsby-remark-images/package.json b/packages/gatsby-remark-images/package.json
@@ -28,7 +28,7 @@
     "gatsby-plugin-sharp": "^1.6.0"
   },
   "scripts": {
-    "build": "babel src --out-dir .",
-    "watch": "babel -w src --out-dir ."
+    "build": "babel src --out-dir . --ignore __tests__",
+    "watch": "babel -w src --out-dir . --ignore __tests__"
   }
 }
diff --git a/packages/gatsby-remark-katex/.gitignore b/packages/gatsby-remark-katex/.gitignore
@@ -0,0 +1,3 @@
+/index.js
+/__tests__/*
+tests
diff --git a/packages/gatsby-remark-responsive-iframe/package.json b/packages/gatsby-remark-responsive-iframe/package.json
@@ -4,8 +4,8 @@
   "description": "Make iframes in Markdown processed by Remark responsive",
   "main": "index.js",
   "scripts": {
-    "build": "babel src --out-dir .",
-    "watch": "babel -w src --out-dir ."
+    "build": "babel src --out-dir . --ignore __tests__",
+    "watch": "babel -w src --out-dir . --ignore __tests__"
   },
   "keywords": [
     "gatsby",

diff --git a/packages/gatsby-remark-smartypants/package.json b/packages/gatsby-remark-smartypants/package.json
@@ -4,8 +4,8 @@
   "description": "Use retext-smartypants to auto-enhance typography of markdown",
   "main": "index.js",
   "scripts": {
-    "build": "babel src --out-dir .",
-    "watch": "babel -w src --out-dir ."
+    "build": "babel src --out-dir . --ignore __tests__",
+    "watch": "babel -w src --out-dir . --ignore __tests__"
   },
   "keywords": [
     "gatsby",

diff --git a/packages/gatsby-source-contentful/src/__tests__/__snapshots__/normalize.js.snap b/packages/gatsby-source-contentful/src/__tests__/__snapshots__/normalize.js.snap
@@ -1599,7 +1599,7 @@ Object {
 `;
 
 exports[`Process contentful data builds list of resolvable data 1`] = `
-Array [
+Set {
   "c7LAnCobuuWYSqks6wAwY2a",
   "c24DPGBDeGEaYy8ms4Y8QMQ",
   "c651CQ8rLoIYCeY6G0QG22q",
@@ -1620,7 +1620,7 @@ Array [
   "wtrHxeu3zEoEce2MokCSi",
   "c10TkaLheGeQG6qQGqWYqUI",
   "c6s3iG2OVmoUcosmA8ocqsG",
-]
+}
 `;
 
 exports[`Process contentful data creates nodes for each asset 1`] = `

diff --git a/packages/gatsby-source-drupal/package.json b/packages/gatsby-source-drupal/package.json
@@ -3,8 +3,8 @@
   "version": "1.3.0",
   "description": "Gatsby source plugin for building websites using the Drupal CMS as a data source",
   "scripts": {
-    "build": "babel src --out-dir .",
-    "watch": "babel -w src --out-dir ."
+    "build": "babel src --out-dir . --ignore __tests__",
+    "watch": "babel -w src --out-dir . --ignore __tests__"
   },
   "keywords": [
     "gatsby",

diff --git a/packages/gatsby-source-filesystem/package.json b/packages/gatsby-source-filesystem/package.json
@@ -3,8 +3,8 @@
   "version": "1.4.1",
   "description": "Gatsby plugin which parses files within a directory for further parsing by other plugins",
   "scripts": {
-    "build": "babel src --out-dir .",
-    "watch": "babel -w src --out-dir ."
+    "build": "babel src --out-dir . --ignore __tests__",
+    "watch": "babel -w src --out-dir . --ignore __tests__"
   },
   "keywords": [
     "gatsby",

diff --git a/packages/gatsby-source-hacker-news/package.json b/packages/gatsby-source-hacker-news/package.json
@@ -3,8 +3,8 @@
   "version": "1.0.1",
   "description": "Gatsby source plugin for building websites using Hacker News as a data source",
   "scripts": {
-    "build": "babel src --out-dir .",
-    "watch": "babel -w src --out-dir ."
+    "build": "babel src --out-dir . --ignore __tests__",
+    "watch": "babel -w src --out-dir . --ignore __tests__"
   },
   "keywords": [
     "gatsby",

diff --git a/packages/gatsby-source-wordpress/package.json b/packages/gatsby-source-wordpress/package.json
@@ -18,8 +18,8 @@
   "license": "MIT",
   "name": "gatsby-source-wordpress",
   "scripts": {
-    "build": "babel src --out-dir .",
-    "watch": "babel -w src --out-dir ."
+    "build": "babel src --out-dir . --ignore __tests__",
+    "watch": "babel -w src --out-dir . --ignore __tests__"
   },
   "version": "1.7.2"
 }