Autodesk · morrisallison · Apr 18, 2018 · Apr 18, 2018 · Apr 18, 2018 · Apr 18, 2018
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -8,14 +8,18 @@ jobs:
     <<: *defaults
     steps:
       - checkout
+      - run:
+          name: Create dependency hash
+          command: yarn run create-dependency-hash
       - restore_cache:
-          key: hig-dependencies-{{ checksum "yarn.lock" }}
+          key: hig-dependencies-{{ checksum ".dependency-hash" }}
       - run:
           name: Install Dependencies
           command: yarn
       - save_cache:
-          key: hig-dependencies-{{ checksum "yarn.lock" }}
+          key: hig-dependencies-{{ checksum ".dependency-hash" }}
           paths:
+            - .dependency-hash
             - node_modules
             - packages/banner/node_modules
             - packages/eslint-config/node_modules
@@ -31,8 +35,11 @@ jobs:
     <<: *defaults
     steps:
       - checkout
+      - run:
+          name: Create dependency hash
+          command: yarn run create-dependency-hash
       - restore_cache:
-          key: hig-dependencies-{{ checksum "yarn.lock" }}
+          key: hig-dependencies-{{ checksum ".dependency-hash" }}
       - run:
           name: Build all packages
           command: yarn build
@@ -51,8 +58,11 @@ jobs:
     <<: *defaults
     steps:
       - checkout
+      - run:
+          name: Create dependency hash
+          command: yarn run create-dependency-hash
       - restore_cache:
-          key: hig-dependencies-{{ checksum "yarn.lock" }}
+          key: hig-dependencies-{{ checksum ".dependency-hash" }}
       - restore_cache:
           key: package-build-{{ .Revision }}
       - run:
@@ -68,8 +78,11 @@ jobs:
     <<: *defaults
     steps:
       - checkout
+      - run:
+          name: Create dependency hash
+          command: yarn run create-dependency-hash
       - restore_cache:
-          key: hig-dependencies-{{ checksum "yarn.lock" }}
+          key: hig-dependencies-{{ checksum ".dependency-hash" }}
       - restore_cache:
           key: package-build-{{ .Revision }}
       - run:
@@ -96,8 +109,11 @@ jobs:
     <<: *defaults
     steps:
       - checkout
+      - run:
+          name: Create dependency hash
+          command: yarn run create-dependency-hash
       - restore_cache:
-          key: hig-dependencies-{{ checksum "yarn.lock" }}
+          key: hig-dependencies-{{ checksum ".dependency-hash" }}
       - restore_cache:
           key: package-build-{{ .Revision }}
       - run:
@@ -108,8 +124,11 @@ jobs:
     <<: *defaults
     steps:
       - checkout
+      - run:
+          name: Create dependency hash
+          command: yarn run create-dependency-hash
       - restore_cache:
-          key: hig-dependencies-{{ checksum "yarn.lock" }}
+          key: hig-dependencies-{{ checksum ".dependency-hash" }}
       - restore_cache:
           key: package-build-{{ .Revision }}
       - run:
@@ -122,8 +141,11 @@ jobs:
     <<: *defaults
     steps:
       - checkout
+      - run:
+          name: Create dependency hash
+          command: yarn run create-dependency-hash
       - restore_cache:
-          key: hig-dependencies-{{ checksum "yarn.lock" }}
+          key: hig-dependencies-{{ checksum ".dependency-hash" }}
       - restore_cache:
           key: package-build-{{ .Revision }}
       - run:
@@ -134,8 +156,11 @@ jobs:
     <<: *defaults
     steps:
       - checkout
+      - run:
+          name: Create dependency hash
+          command: yarn run create-dependency-hash
       - restore_cache:
-          key: hig-dependencies-{{ checksum "yarn.lock" }}
+          key: hig-dependencies-{{ checksum ".dependency-hash" }}
       - restore_cache:
           key: package-build-{{ .Revision }}
       - run:

diff --git a/.gitignore b/.gitignore
@@ -45,6 +45,9 @@ gemini-report/
 # Files created by CircleCI
 nohup.out
 
+# Files generated during CI
+.dependency-hash
+
 # Environment Variables
 .env
 

diff --git a/package.json b/package.json
@@ -8,6 +8,7 @@
   "version": "1.0.1",
   "scripts": {
     "build": "lerna run build",
+    "create-dependency-hash": "cat yarn.lock > .dependency-hash && ls ./packages >> .dependency-hash",
     "lint": "lerna run lint",
     "publish-canary": "lerna publish --canary --yes --exact",
     "update-packages": "lerna publish --skip-npm"

diff --git a/packages/babel-preset/build.js b/packages/babel-preset/build.js
@@ -0,0 +1,26 @@
+module.exports = function createBuildPreset() {
+  return {
+    exclude: [
+      "**/node_modules/**",
+      "**/*.css",
+      "**/*.scss",
+      "**/*.html",
+      "**/*.svg",
+      "**/*.json"
+    ],
+    presets: [
+      [
+        "env",
+        {
+          modules: false,
+          targets: {
+            browser: ">1%"
+          }
+        }
+      ],
+      "stage-2",
+      "react"
+    ],
+    plugins: ["react-docgen"]
+  };
+};
diff --git a/packages/babel-preset/package.json b/packages/babel-preset/package.json
@@ -0,0 +1,23 @@
+{
+  "private": true,
+  "name": "@hig/babel-preset",
+  "version": "0.1.0",
+  "description": "HIG Babel preset",
+  "author": "Autodesk Inc.",
+  "license": "Apache-2.0",
+  "homepage": "https://hig.autodesk.com",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Autodesk/hig"
+  },
+  "main": "index.js",
+  "dependencies": {
+    "babel-cli": "^6.26.0",
+    "babel-core": "^6.26.0",
+    "babel-loader": "^7.1.4",
+    "babel-plugin-react-docgen": "^1.8.1",
+    "babel-preset-env": "^1.6.1",
+    "babel-preset-react": "^6.24.1",
+    "babel-preset-stage-2": "^6.24.1"
+  }
+}
diff --git a/packages/babel-preset/test.js b/packages/babel-preset/test.js
@@ -0,0 +1,6 @@
+module.exports = function createTestPreset() {
+  return {
+    presets: [["env", { modules: "umd" }], "react", "stage-2"],
+    plugins: ["transform-object-rest-spread", "react-docgen"]
+  };
+};
diff --git a/packages/banner/.babelrc b/packages/banner/.babelrc
@@ -1,15 +1,7 @@
 {
   "env": {
     "test": {
-      "presets": [
-        ["env", { "modules": "umd" }],
-        "react",
-        "stage-2"
-      ],
-      "plugins": [
-        "transform-object-rest-spread",
-        "react-docgen"
-      ]
+      "presets": ["@hig/babel-preset/test"]
     }
   }
 }
diff --git a/packages/banner/package.json b/packages/banner/package.json
@@ -12,6 +12,7 @@
   "style": "build/index.css",
   "files": ["build/*"],
   "devDependencies": {
+    "@hig/babel-preset": "0.1.0",
     "@hig/scripts": "^0.1.0",
     "@hig/styles": "^0.1.0-alpha",
     "@hig/eslint-config": "0.1.0",

diff --git a/packages/icon/.babelrc b/packages/icon/.babelrc
@@ -1,12 +1,7 @@
 {
   "env": {
     "test": {
-      "presets": [
-        ["env", { "modules": "umd" }],
-        "react",
-        "stage-2"
-      ],
-      "plugins": ["react-docgen"]
+      "presets": ["@hig/babel-preset/test"]
     }
   }
 }
diff --git a/packages/icon/package.json b/packages/icon/package.json
@@ -16,6 +16,7 @@
     "@hig/icons": "^0.1.0-alpha"
   },
   "devDependencies": {
+    "@hig/babel-preset": "0.1.0",
     "@hig/scripts": "^0.1.0",
     "@hig/styles": "^0.1.0-alpha"
   },

diff --git a/packages/icons/.babelrc b/packages/icons/.babelrc
@@ -1,12 +1,7 @@
 {
   "env": {
     "test": {
-      "presets": [
-        ["env", { "modules": "umd" }],
-        "react",
-        "stage-2"
-      ],
-      "plugins": ["react-docgen"]
+      "presets": ["@hig/babel-preset/test"]
     }
   }
 }
diff --git a/packages/icons/package.json b/packages/icons/package.json
@@ -12,6 +12,7 @@
   "module": "build/index.es.js",
   "files": ["build/*"],
   "devDependencies": {
+    "@hig/babel-preset": "0.1.0",
     "@hig/scripts": "^0.1.0",
     "@hig/styles": "^0.1.0-alpha"
   },

diff --git a/packages/react/.babelrc b/packages/react/.babelrc
@@ -1,12 +1,7 @@
 {
   "env": {
     "test": {
-      "presets": [
-        ["env", { "modules": "umd" }],
-        "react",
-        "stage-2"
-      ],
-      "plugins": ["react-docgen"]
+      "presets": ["@hig/babel-preset/test"]
     }
   },
   "presets": [

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -42,6 +42,7 @@
     "react-dom": "^15.4.1"
   },
   "devDependencies": {
+    "@hig/babel-preset": "0.1.0",
     "@hig/styles": "^0.1.0-alpha",
     "@types/jest": "^19.2.3",
     "@types/node": "^7.0.21",

diff --git a/packages/scripts/bin/build.js b/packages/scripts/bin/build.js
@@ -9,6 +9,7 @@ const postcss = require("rollup-plugin-postcss");
 const json = require("rollup-plugin-json");
 const postcssFuncitons = require("postcss-functions");
 const postcssImport = require("postcss-import");
+const createBuildPreset = require('@hig/babel-preset/build');
 
 const packageMeta = require(path.resolve(process.cwd(), "package.json"));
 
@@ -33,30 +34,7 @@ const inputOptions = {
     nodeResolve(),
     babel({
       babelrc: false,
-      exclude: [
-        "**/node_modules/**",
-        "**/*.css",
-        "**/*.scss",
-        "**/*.html",
-        "**/*.svg",
-        "**/*.json"
-      ],
-      presets: [
-        [
-          "env",
-          {
-            modules: false,
-            targets: {
-              browser: ">1%"
-            }
-          }
-        ],
-        "stage-2",
-        "react"
-      ],
-      plugins: [
-        "react-docgen"
-      ]
+      ...createBuildPreset()
     }),
     commonjs(),
     json(),

diff --git a/packages/scripts/package.json b/packages/scripts/package.json
@@ -10,6 +10,7 @@
     "hig-scripts-build": "bin/build.js"
   },
   "dependencies": {
+    "@hig/babel-preset": "0.1.0",
     "babel-plugin-external-helpers": "^6.22.0",
     "babel-preset-env": "^1.6.1",
     "babel-preset-react": "^6.24.1",

diff --git a/packages/skeleton-item/.babelrc b/packages/skeleton-item/.babelrc
@@ -1,12 +1,7 @@
 {
   "env": {
     "test": {
-      "presets": [
-        ["env", { "modules": "umd" }],
-        "react",
-        "stage-2"
-      ],
-      "plugins": ["react-docgen"]
+      "presets": ["@hig/babel-preset/test"]
     }
   }
 }
diff --git a/packages/skeleton-item/package.json b/packages/skeleton-item/package.json
@@ -16,6 +16,7 @@
     "@hig/themes": "^0.1.0-alpha"
   },
   "devDependencies": {
+    "@hig/babel-preset": "0.1.0",
     "@hig/scripts": "^0.1.0",
     "@hig/styles": "^0.1.0-alpha"
   },

diff --git a/packages/storybook/jest.config.js b/packages/storybook/jest.config.js
@@ -27,6 +27,6 @@ module.exports = {
   rootDir: "../../",
   setupFiles: ["raf/polyfill"],
   setupTestFrameworkScriptFile: "<rootDir>/packages/storybook/support/jest/setupTests.js",
-  testPathIgnorePatterns: ["<rootDir>/packages/vanilla"],
+  testPathIgnorePatterns: ["<rootDir>/packages/vanilla", "<rootDir>/packages/babel-preset"],
   unmockedModulePathPatterns: ["node_modules"]
 };
diff --git a/packages/themes/.babelrc b/packages/themes/.babelrc
@@ -1,15 +1,7 @@
 {
   "env": {
     "test": {
-      "presets": [
-        ["env", { "modules": "umd" }],
-        "react",
-        "stage-2"
-      ],
-      "plugins": [
-        "transform-object-rest-spread",
-        "react-docgen"
-      ]
+      "presets": ["@hig/babel-preset/test"]
     }
   }
 }
diff --git a/packages/themes/package.json b/packages/themes/package.json
@@ -11,6 +11,7 @@
   "main": "build/index.js",
   "module": "build/index.es.js",
   "devDependencies": {
+    "@hig/babel-preset": "0.1.0",
     "@hig/scripts": "^0.1.0",
     "@hig/styles": "^0.1.0-alpha"
   },

diff --git a/packages/typography/.babelrc b/packages/typography/.babelrc
@@ -1,12 +1,7 @@
 {
   "env": {
     "test": {
-      "presets": [
-        ["env", { "modules": "umd" }],
-        "react",
-        "stage-2"
-      ],
-      "plugins": ["react-docgen"]
+      "presets": ["@hig/babel-preset/test"]
     }
   }
 }