From 701f55e12a81df6ccca008e4b9fe32af8dc60b6e Mon Sep 17 00:00:00 2001
From: Adi Dahiya <adahiya@palantir.com>
Date: Mon, 15 Jan 2018 14:28:06 -0500
Subject: [PATCH 1/7] Output library assets in /lib/ paths

---
 .gitignore                                    |  1 +
 packages/core/package.json                    | 10 +++++-----
 packages/core/src/docs/variables.md           |  8 +++++++-
 packages/core/src/tsconfig.cjs.json           |  2 +-
 packages/core/src/tsconfig.json               |  2 +-
 packages/core/test/isotest.js                 |  2 +-
 packages/datetime/karma.conf.js               |  4 ++--
 packages/datetime/package.json                | 10 +++++-----
 packages/datetime/src/tsconfig.cjs.json       |  2 +-
 packages/datetime/src/tsconfig.json           |  2 +-
 packages/docs-app/src/blueprint.md            | 19 +++++++++++--------
 .../datetime-examples/timePickerExample.tsx   |  2 +-
 packages/docs-app/src/index.scss              | 16 ++++++++--------
 packages/docs-theme/package.json              | 10 +++++-----
 packages/docs-theme/src/tsconfig.cjs.json     |  2 +-
 packages/docs-theme/src/tsconfig.json         |  2 +-
 packages/icons/package.json                   | 10 +++++-----
 packages/icons/src/_font-imports.scss         |  2 +-
 packages/icons/src/tsconfig.cjs.json          |  2 +-
 packages/icons/src/tsconfig.json              |  2 +-
 packages/labs/karma.conf.js                   |  4 ++--
 packages/labs/package.json                    | 10 +++++-----
 packages/labs/src/tsconfig.cjs.json           |  2 +-
 packages/labs/src/tsconfig.json               |  2 +-
 packages/landing-app/src/_overrides.scss      |  2 +-
 packages/landing-app/src/index.scss           |  2 +-
 .../node-build-scripts/generate-css-variables |  6 +++---
 packages/node-build-scripts/sass-compile      |  2 +-
 packages/select/karma.conf.js                 |  4 ++--
 packages/select/package.json                  | 10 +++++-----
 packages/select/src/tsconfig.cjs.json         |  2 +-
 packages/select/src/tsconfig.json             |  2 +-
 packages/table-dev-app/src/index.scss         |  4 ++--
 packages/table/karma.conf.js                  |  4 ++--
 packages/table/package.json                   | 10 +++++-----
 packages/table/src/tsconfig.cjs.json          |  2 +-
 packages/table/src/tsconfig.json              |  2 +-
 packages/table/test/harness.ts                |  2 +-
 packages/timezone/karma.conf.js               |  4 ++--
 packages/timezone/package.json                | 10 +++++-----
 packages/timezone/src/tsconfig.cjs.json       |  2 +-
 packages/timezone/src/tsconfig.json           |  2 +-
 42 files changed, 105 insertions(+), 95 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5e6513daa3f..eb4ce4de76d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ yarn-error.log
 # Blueprint
 build
 dist
+lib
 generated
 coverage
 /docs
diff --git a/packages/core/package.json b/packages/core/package.json
index a6526df7705..cbb81161144 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -2,17 +2,17 @@
   "name": "@blueprintjs/core",
   "version": "1.35.0",
   "description": "Core styles & components",
-  "main": "dist/index.js",
-  "module": "dist/esm/index.js",
-  "typings": "dist/esm/index.d.ts",
-  "style": "dist/blueprint.css",
+  "main": "lib/cjs/index.js",
+  "module": "lib/esm/index.js",
+  "typings": "lib/esm/index.d.ts",
+  "style": "lib/css/blueprint.css",
   "unpkg": "dist/core.bundle.js",
   "scripts": {
     "compile": "npm-run-all -p 'compile:*'",
     "compile:esm": "tsc -p ./src",
     "compile:cjs": "tsc -p ./src/tsconfig.cjs.json",
     "compile:css": "sass-compile ./src",
-    "clean": "rm -rf dist/*",
+    "clean": "rm -rf dist/* && rm -rf lib/*",
     "dev": "npm-run-all -p 'compile:esm -- --watch' 'compile:css -- --watch'",
     "dist": "npm-run-all -s 'dist:*'",
     "dist:bundle": "NODE_ENV=production webpack",
diff --git a/packages/core/src/docs/variables.md b/packages/core/src/docs/variables.md
index 23058351abe..347db617c31 100644
--- a/packages/core/src/docs/variables.md
+++ b/packages/core/src/docs/variables.md
@@ -3,7 +3,13 @@
 Available for use with Sass and Less.
 
 ```css.scss
-@import "path/to/@blueprintjs/core/dist/variables";
+// Sass
+@import "path/to/@blueprintjs/core/lib/scss/variables";
+```
+
+```css.less
+// Less
+@import "path/to/@blueprintjs/core/lib/less/variables";
 ```
 
 The Sass `$` convention is used in this documentation for consistency with the original source code.
diff --git a/packages/core/src/tsconfig.cjs.json b/packages/core/src/tsconfig.cjs.json
index 89e06b4b44e..54b20e53e7b 100644
--- a/packages/core/src/tsconfig.cjs.json
+++ b/packages/core/src/tsconfig.cjs.json
@@ -2,6 +2,6 @@
     "extends": "./tsconfig",
     "compilerOptions": {
         "module": "commonjs",
-        "outDir": "../dist"
+        "outDir": "../lib/cjs"
     }
 }
diff --git a/packages/core/src/tsconfig.json b/packages/core/src/tsconfig.json
index 1fa5548ec3d..b4fa3674bf5 100644
--- a/packages/core/src/tsconfig.json
+++ b/packages/core/src/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "extends": "../../../config/tsconfig.base",
     "compilerOptions": {
-        "outDir": "../dist/esm"
+        "outDir": "../lib/esm"
     }
 }
diff --git a/packages/core/test/isotest.js b/packages/core/test/isotest.js
index 2356ecc7021..23be3ecda3e 100644
--- a/packages/core/test/isotest.js
+++ b/packages/core/test/isotest.js
@@ -5,7 +5,7 @@
 
 const { generateIsomorphicTests } = require("@blueprintjs/test-commons");
 const React = require("react");
-// TODO: get this to work with require("@std/esm")(module)("../dist/esm")
+// TODO: get this to work with require("@std/esm")(module)("../lib/esm")
 const Core = require("../dist");
 
 const tooltipContent = { content: React.createElement("h1", {}, "content") };
diff --git a/packages/datetime/karma.conf.js b/packages/datetime/karma.conf.js
index e7a4587464d..0e3a8a9c038 100644
--- a/packages/datetime/karma.conf.js
+++ b/packages/datetime/karma.conf.js
@@ -15,8 +15,8 @@ module.exports = function (config) {
             entry: {
                 datetime: [
                     path.resolve(__dirname, "test/index.ts"),
-                    path.resolve(__dirname, "../core/dist/blueprint.css"),
-                    path.resolve(__dirname, "dist/blueprint-datetime.css"),
+                    path.resolve(__dirname, "../core/lib/css/blueprint.css"),
+                    path.resolve(__dirname, "lib/css/blueprint-datetime.css"),
                 ],
             },
         }),
diff --git a/packages/datetime/package.json b/packages/datetime/package.json
index 9274bc7ff10..ede7fb39d11 100644
--- a/packages/datetime/package.json
+++ b/packages/datetime/package.json
@@ -2,17 +2,17 @@
   "name": "@blueprintjs/datetime",
   "version": "1.25.1",
   "description": "Components for interacting with dates and times",
-  "main": "dist/index.js",
-  "module": "dist/esm/index.js",
-  "typings": "dist/esm/index.d.ts",
-  "style": "dist/blueprint-datetime.css",
+  "main": "lib/cjs/index.js",
+  "module": "lib/esm/index.js",
+  "typings": "lib/esm/index.d.ts",
+  "style": "lib/css/blueprint-datetime.css",
   "unpkg": "dist/datetime.bundle.js",
   "scripts": {
     "compile": "npm-run-all -p 'compile:*'",
     "compile:esm": "tsc -p ./src",
     "compile:cjs": "tsc -p ./src/tsconfig.cjs.json",
     "compile:css": "sass-compile ./src",
-    "clean": "rm -rf dist/*",
+    "clean": "rm -rf dist/* && rm -rf lib/*",
     "dev": "npm-run-all -p 'compile:esm -- --watch' 'compile:css -- --watch'",
     "dist": "npm-run-all -s 'dist:*'",
     "dist:bundle": "NODE_ENV=production webpack",
diff --git a/packages/datetime/src/tsconfig.cjs.json b/packages/datetime/src/tsconfig.cjs.json
index 89e06b4b44e..54b20e53e7b 100644
--- a/packages/datetime/src/tsconfig.cjs.json
+++ b/packages/datetime/src/tsconfig.cjs.json
@@ -2,6 +2,6 @@
     "extends": "./tsconfig",
     "compilerOptions": {
         "module": "commonjs",
-        "outDir": "../dist"
+        "outDir": "../lib/cjs"
     }
 }
diff --git a/packages/datetime/src/tsconfig.json b/packages/datetime/src/tsconfig.json
index 1fa5548ec3d..b4fa3674bf5 100644
--- a/packages/datetime/src/tsconfig.json
+++ b/packages/datetime/src/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "extends": "../../../config/tsconfig.base",
     "compilerOptions": {
-        "outDir": "../dist/esm"
+        "outDir": "../lib/esm"
     }
 }
diff --git a/packages/docs-app/src/blueprint.md b/packages/docs-app/src/blueprint.md
index 160cf9437ab..bbc7da9bed8 100644
--- a/packages/docs-app/src/blueprint.md
+++ b/packages/docs-app/src/blueprint.md
@@ -81,7 +81,7 @@ Blueprint as well. Some Blueprint components use the following ES2015 features:
       ...
       <!-- include dependencies manually -->
       <link href="path/to/node_modules/normalize.css/normalize.css" rel="stylesheet" />
-      <link href="path/to/node_modules/@blueprintjs/core/dist/blueprint.css" rel="stylesheet" />
+      <link href="path/to/node_modules/@blueprintjs/core/lib/css/blueprint.css" rel="stylesheet" />
       ...
     </head>
     ...
@@ -101,7 +101,8 @@ Blueprint supports the venerable [unpkg CDN](https://unpkg.com). Each package pr
 library on the `Blueprint` global variable: `Blueprint.Core`, `Blueprint.Datetime`, etc.
 
 These bundles _do not include_ external dependencies; your application will need to ensure that
-`normalize.css`, `React`, `classnames`, and `Tether` are available at runtime.
+`normalize.css`, `react`, `react-dom`, `react-transition-group`, `classnames`, `popper.js`, and
+`react-popper`are available at runtime.
 
 ```html
 <!DOCTYPE html>
@@ -110,16 +111,18 @@ These bundles _do not include_ external dependencies; your application will need
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width">
     <title>Blueprint Starter Kit</title>
-    <link href="https://unpkg.com/normalize.css@^4.1.1" rel="stylesheet" />
-    <link href="https://unpkg.com/@blueprintjs/core@^1.11.0/dist/blueprint.css" rel="stylesheet" />
+    <link href="https://unpkg.com/normalize.css@^7.0.0" rel="stylesheet" />
+    <link href="https://unpkg.com/@blueprintjs/core@^2.0.0/lib/css/blueprint.css" rel="stylesheet" />
   </head>
   <body>
     <script src="https://unpkg.com/classnames@^2.2"></script>
     <script src="https://unpkg.com/dom4@^1.8"></script>
-    <script src="https://unpkg.com/tether@^1.4"></script>
-    <script src="https://unpkg.com/react@^15.3.1/dist/react-with-addons.min.js"></script>
-    <script src="https://unpkg.com/react-dom@^15.3.1/dist/react-dom.min.js"></script>
-    <script src="https://unpkg.com/@blueprintjs/core@^1.11.0"></script>
+    <script src="https://unpkg.com/react@^16.2.0/umd/react.production.min.js"></script>
+    <script src="https://unpkg.com/react-dom@^16.2.0/umd/react-dom.production.min.js"></script>
+    <script src="https://unpkg.com/react-transition-group@^2.2.1/dist/react-transition-group.min.js"></script>
+    <script src="https://unpkg.com/popper.js@^1.12.6/dist/umd/popper.js"></script>
+    <script src="https://unpkg.com/react-popper@~0.7.4/dist/react-popper.min.js"></script>
+    <script src="https://unpkg.com/@blueprintjs/core@^2.0.0"></script>
 
     <div id="btn"></div>
     <script>
diff --git a/packages/docs-app/src/examples/datetime-examples/timePickerExample.tsx b/packages/docs-app/src/examples/datetime-examples/timePickerExample.tsx
index efd89b1e182..545b7d2dba8 100644
--- a/packages/docs-app/src/examples/datetime-examples/timePickerExample.tsx
+++ b/packages/docs-app/src/examples/datetime-examples/timePickerExample.tsx
@@ -11,7 +11,7 @@ import { PrecisionSelect } from "./common/precisionSelect";
 
 import { TimePicker, TimePickerPrecision } from "@blueprintjs/datetime";
 // tslint:disable-next-line:no-submodule-imports
-import { getDefaultMaxTime, getDefaultMinTime } from "@blueprintjs/datetime/dist/esm/timePicker";
+import { getDefaultMaxTime, getDefaultMinTime } from "@blueprintjs/datetime/lib/esm/timePicker";
 
 export interface ITimePickerExampleState {
     precision?: TimePickerPrecision;
diff --git a/packages/docs-app/src/index.scss b/packages/docs-app/src/index.scss
index 02741d30d22..678c6929fe6 100644
--- a/packages/docs-app/src/index.scss
+++ b/packages/docs-app/src/index.scss
@@ -4,16 +4,16 @@
 @import "~normalize.css/normalize.css";
 
 // import these first because they're the base layer
-@import "~@blueprintjs/core/dist/blueprint.css";
-@import "~@blueprintjs/datetime/dist/blueprint-datetime.css";
-@import "~@blueprintjs/icons/dist/blueprint-icons.css";
-@import "~@blueprintjs/labs/dist/blueprint-labs.css";
-@import "~@blueprintjs/select/dist/blueprint-select.css";
-@import "~@blueprintjs/table/dist/table.css";
-@import "~@blueprintjs/timezone/dist/blueprint-timezone.css";
+@import "~@blueprintjs/core/lib/css/blueprint.css";
+@import "~@blueprintjs/datetime/lib/css/blueprint-datetime.css";
+@import "~@blueprintjs/icons/lib/css/blueprint-icons.css";
+@import "~@blueprintjs/labs/lib/css/blueprint-labs.css";
+@import "~@blueprintjs/select/lib/css/blueprint-select.css";
+@import "~@blueprintjs/table/lib/css/table.css";
+@import "~@blueprintjs/timezone/lib/css/blueprint-timezone.css";
 
 // then the docs theme styles
-@import "~@blueprintjs/docs-theme/dist/docs-theme.css";
+@import "~@blueprintjs/docs-theme/lib/css/docs-theme.css";
 @import "~@blueprintjs/docs-theme/src/styles/variables";
 
 // then our own styles
diff --git a/packages/docs-theme/package.json b/packages/docs-theme/package.json
index e6ed8f70635..d33c614df07 100644
--- a/packages/docs-theme/package.json
+++ b/packages/docs-theme/package.json
@@ -2,17 +2,17 @@
   "name": "@blueprintjs/docs-theme",
   "version": "1.3.0",
   "description": "Blueprint theme for documentalist",
-  "main": "dist/index.js",
-  "module": "dist/esm/index.js",
-  "typings": "dist/esm/index.d.ts",
-  "style": "dist/docs-theme.css",
+  "main": "lib/cjs/index.js",
+  "module": "lib/esm/index.js",
+  "typings": "lib/esm/index.d.ts",
+  "style": "lib/css/docs-theme.css",
   "unpkg": "dist/docs-theme.bundle.js",
   "scripts": {
     "compile": "npm-run-all -p 'compile:*'",
     "compile:esm": "tsc -p ./src",
     "compile:cjs": "tsc -p ./src/tsconfig.cjs.json",
     "compile:css": "sass-compile ./src",
-    "clean": "rm -rf dist/*",
+    "clean": "rm -rf dist/* && rm -rf lib/*",
     "dev": "npm-run-all -p 'compile:esm -- --watch' 'compile:css -- --watch'",
     "dist": "npm-run-all -s 'dist:*'",
     "dist:bundle": "NODE_ENV=production webpack",
diff --git a/packages/docs-theme/src/tsconfig.cjs.json b/packages/docs-theme/src/tsconfig.cjs.json
index 89e06b4b44e..54b20e53e7b 100644
--- a/packages/docs-theme/src/tsconfig.cjs.json
+++ b/packages/docs-theme/src/tsconfig.cjs.json
@@ -2,6 +2,6 @@
     "extends": "./tsconfig",
     "compilerOptions": {
         "module": "commonjs",
-        "outDir": "../dist"
+        "outDir": "../lib/cjs"
     }
 }
diff --git a/packages/docs-theme/src/tsconfig.json b/packages/docs-theme/src/tsconfig.json
index 1fa5548ec3d..b4fa3674bf5 100644
--- a/packages/docs-theme/src/tsconfig.json
+++ b/packages/docs-theme/src/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "extends": "../../../config/tsconfig.base",
     "compilerOptions": {
-        "outDir": "../dist/esm"
+        "outDir": "../lib/esm"
     }
 }
diff --git a/packages/icons/package.json b/packages/icons/package.json
index 64a3c11b8c3..0950a7925f3 100644
--- a/packages/icons/package.json
+++ b/packages/icons/package.json
@@ -2,10 +2,10 @@
   "name": "@blueprintjs/icons",
   "version": "1.0.0",
   "description": "Components, fonts, icons, and css files for creating and displaying icons.",
-  "main": "dist/index.js",
-  "module": "dist/esm/index.js",
-  "typings": "dist/esm/index.d.ts",
-  "style": "dist/blueprint-icons.css",
+  "main": "lib/cjs/index.js",
+  "module": "lib/esm/index.js",
+  "typings": "lib/esm/index.d.ts",
+  "style": "lib/css/blueprint-icons.css",
   "unpkg": "dist/icons.bundle.js",
   "scripts": {
     "compile": "npm-run-all -s 'compile:pre' -p 'compile:*'",
@@ -13,7 +13,7 @@
     "compile:esm": "tsc -p ./src",
     "compile:cjs": "tsc -p ./src/tsconfig.cjs.json",
     "compile:css": "sass-compile ./src",
-    "clean": "rm -rf dist/*",
+    "clean": "rm -rf dist/* && rm -rf lib/*",
     "dev": "npm-run-all -p 'compile:esm -- --watch' 'compile:css -- --watch'",
     "dist": "npm-run-all -s 'dist:*'",
     "dist:bundle": "NODE_ENV=production webpack",
diff --git a/packages/icons/src/_font-imports.scss b/packages/icons/src/_font-imports.scss
index f14c52c2698..0161284871e 100644
--- a/packages/icons/src/_font-imports.scss
+++ b/packages/icons/src/_font-imports.scss
@@ -3,7 +3,7 @@
 
 @import "font-face";
 
-$icon-font-path: "../resources/icons" !default;
+$icon-font-path: "../../resources/icons" !default;
 $icon-font-formats: eot woff ttf !default;
 
 @include font-face("Icons16", "#{$icon-font-path}/icons-16", $file-formats: $icon-font-formats);
diff --git a/packages/icons/src/tsconfig.cjs.json b/packages/icons/src/tsconfig.cjs.json
index 89e06b4b44e..54b20e53e7b 100644
--- a/packages/icons/src/tsconfig.cjs.json
+++ b/packages/icons/src/tsconfig.cjs.json
@@ -2,6 +2,6 @@
     "extends": "./tsconfig",
     "compilerOptions": {
         "module": "commonjs",
-        "outDir": "../dist"
+        "outDir": "../lib/cjs"
     }
 }
diff --git a/packages/icons/src/tsconfig.json b/packages/icons/src/tsconfig.json
index 1fa5548ec3d..b4fa3674bf5 100644
--- a/packages/icons/src/tsconfig.json
+++ b/packages/icons/src/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "extends": "../../../config/tsconfig.base",
     "compilerOptions": {
-        "outDir": "../dist/esm"
+        "outDir": "../lib/esm"
     }
 }
diff --git a/packages/labs/karma.conf.js b/packages/labs/karma.conf.js
index d64161daea3..4ff128ffde8 100644
--- a/packages/labs/karma.conf.js
+++ b/packages/labs/karma.conf.js
@@ -19,8 +19,8 @@ module.exports = function (config) {
             entry: {
                 labs: [
                     path.resolve(__dirname, "test/index.ts"),
-                    path.resolve(__dirname, "../core/dist/blueprint.css"),
-                    path.resolve(__dirname, "dist/blueprint-labs.css"),
+                    path.resolve(__dirname, "../core/lib/css/blueprint.css"),
+                    path.resolve(__dirname, "lib/css/blueprint-labs.css"),
                 ],
             },
         }),
diff --git a/packages/labs/package.json b/packages/labs/package.json
index 8378858e950..54725cbf16d 100644
--- a/packages/labs/package.json
+++ b/packages/labs/package.json
@@ -2,17 +2,17 @@
   "name": "@blueprintjs/labs",
   "version": "0.14.3",
   "description": "Incubator for unstable and in-development Blueprint components",
-  "main": "dist/index.js",
-  "module": "dist/esm/index.js",
-  "typings": "dist/esm/index.d.ts",
-  "style": "dist/blueprint-labs.css",
+  "main": "lib/cjs/index.js",
+  "module": "lib/esm/index.js",
+  "typings": "lib/esm/index.d.ts",
+  "style": "lib/css/blueprint-labs.css",
   "unpkg": "dist/labs.bundle.js",
   "scripts": {
     "compile": "npm-run-all -p 'compile:*'",
     "compile:esm": "tsc -p ./src",
     "compile:cjs": "tsc -p ./src/tsconfig.cjs.json",
     "compile:css": "sass-compile ./src",
-    "clean": "rm -rf dist/*",
+    "clean": "rm -rf dist/* && rm -rf lib/*",
     "dev": "npm-run-all -p 'compile:esm -- --watch' 'compile:css -- --watch'",
     "dist": "npm-run-all -s 'dist:*'",
     "dist:bundle": "NODE_ENV=production webpack",
diff --git a/packages/labs/src/tsconfig.cjs.json b/packages/labs/src/tsconfig.cjs.json
index 89e06b4b44e..54b20e53e7b 100644
--- a/packages/labs/src/tsconfig.cjs.json
+++ b/packages/labs/src/tsconfig.cjs.json
@@ -2,6 +2,6 @@
     "extends": "./tsconfig",
     "compilerOptions": {
         "module": "commonjs",
-        "outDir": "../dist"
+        "outDir": "../lib/cjs"
     }
 }
diff --git a/packages/labs/src/tsconfig.json b/packages/labs/src/tsconfig.json
index 1fa5548ec3d..b4fa3674bf5 100644
--- a/packages/labs/src/tsconfig.json
+++ b/packages/labs/src/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "extends": "../../../config/tsconfig.base",
     "compilerOptions": {
-        "outDir": "../dist/esm"
+        "outDir": "../lib/esm"
     }
 }
diff --git a/packages/landing-app/src/_overrides.scss b/packages/landing-app/src/_overrides.scss
index 6b691539e15..3576574c606 100644
--- a/packages/landing-app/src/_overrides.scss
+++ b/packages/landing-app/src/_overrides.scss
@@ -1,4 +1,4 @@
-@import "~@blueprintjs/core/dist/blueprint.css";
+@import "~@blueprintjs/core/lib/css/blueprint.css";
 @import "~@blueprintjs/core/src/common/variables";
 
 body,
diff --git a/packages/landing-app/src/index.scss b/packages/landing-app/src/index.scss
index dc4c562c54a..36e4e40824a 100644
--- a/packages/landing-app/src/index.scss
+++ b/packages/landing-app/src/index.scss
@@ -1,7 +1,7 @@
 // Copyright 2015 Palantir Technologies, Inc. All rights reserved.
 // Licensed under the terms of the LICENSE file distributed with this project.
 
-@import "~@blueprintjs/core/dist/blueprint.css";
+@import "~@blueprintjs/core/lib/css/blueprint.css";
 @import "~@blueprintjs/core/src/common/variables";
 @import "svgs";
 @import "overrides";
diff --git a/packages/node-build-scripts/generate-css-variables b/packages/node-build-scripts/generate-css-variables
index d7f1b436709..2711a950e88 100755
--- a/packages/node-build-scripts/generate-css-variables
+++ b/packages/node-build-scripts/generate-css-variables
@@ -10,7 +10,7 @@ const stripCssComments = require("strip-css-comments");
 const { COPYRIGHT_HEADER } = require("./constants");
 
 const SRC_DIR = path.resolve(process.cwd(), "./src");
-const DIST_DIR = path.resolve(process.cwd(), "./dist");
+const DEST_DIR = path.resolve(process.cwd(), "./lib");
 
 const variablesSources = process.argv.slice(2);
 
@@ -28,7 +28,7 @@ variablesScss = variablesScss
     .replace(/\n{3,}/g, "\n\n");
 variablesScss = COPYRIGHT_HEADER + "\n" + variablesScss;
 
-fs.writeFileSync(`${DIST_DIR}/variables.scss`, variablesScss);
+fs.writeFileSync(`${DEST_DIR}/scss/variables.scss`, variablesScss);
 
 // convert scss to less
 const variablesLess = variablesScss
@@ -36,4 +36,4 @@ const variablesLess = variablesScss
     .replace(/rgba\((\$[\w-]+), (\$[\w-]+)\)/g, (match, color, variable) => `fade(${color}, ${variable} * 100%)`)
     .replace(/\$/g, "@");
 
-fs.writeFileSync(`${DIST_DIR}/variables.less`, variablesLess);
+fs.writeFileSync(`${DEST_DIR}/less/variables.less`, variablesLess);
diff --git a/packages/node-build-scripts/sass-compile b/packages/node-build-scripts/sass-compile
index de82336db95..dd82f7a11fe 100755
--- a/packages/node-build-scripts/sass-compile
+++ b/packages/node-build-scripts/sass-compile
@@ -10,6 +10,6 @@ ROOT_NM=../../node_modules
 
 $ROOT_NM/.bin/node-sass-chokidar \
   --importer $ROOT_NM/node-sass-package-importer/dist/cli.js \
-  --output dist/ \
+  --output lib/css/ \
   --source-map true \
   $@
diff --git a/packages/select/karma.conf.js b/packages/select/karma.conf.js
index d4ce03866ce..162504812a2 100644
--- a/packages/select/karma.conf.js
+++ b/packages/select/karma.conf.js
@@ -17,8 +17,8 @@ module.exports = function (config) {
             entry: {
                 select: [
                     path.resolve(__dirname, "test/index.ts"),
-                    path.resolve(__dirname, "../core/dist/blueprint.css"),
-                    path.resolve(__dirname, "dist/blueprint-select.css"),
+                    path.resolve(__dirname, "../core/lib/css/blueprint.css"),
+                    path.resolve(__dirname, "lib/css/blueprint-select.css"),
                 ],
             },
         }),
diff --git a/packages/select/package.json b/packages/select/package.json
index e2dce0b4656..7abcd034a15 100644
--- a/packages/select/package.json
+++ b/packages/select/package.json
@@ -2,17 +2,17 @@
   "name": "@blueprintjs/select",
   "version": "1.0.0",
   "description": "Components related to selecting items from a list",
-  "main": "dist/index.js",
-  "module": "dist/esm/index.js",
-  "typings": "dist/esm/index.d.ts",
-  "style": "dist/blueprint-select.css",
+  "main": "lib/cjs/index.js",
+  "module": "lib/esm/index.js",
+  "typings": "lib/esm/index.d.ts",
+  "style": "lib/css/blueprint-select.css",
   "unpkg": "dist/select.bundle.js",
   "scripts": {
     "compile": "npm-run-all -p 'compile:*'",
     "compile:esm": "tsc -p ./src",
     "compile:cjs": "tsc -p ./src/tsconfig.cjs.json",
     "compile:css": "sass-compile ./src",
-    "clean": "rm -rf dist/*",
+    "clean": "rm -rf dist/* && rm -rf lib/*",
     "dev": "npm-run-all -p 'compile:esm -- --watch' 'compile:css -- --watch'",
     "dist": "npm-run-all -s 'dist:*'",
     "dist:bundle": "NODE_ENV=production webpack",
diff --git a/packages/select/src/tsconfig.cjs.json b/packages/select/src/tsconfig.cjs.json
index 89e06b4b44e..54b20e53e7b 100644
--- a/packages/select/src/tsconfig.cjs.json
+++ b/packages/select/src/tsconfig.cjs.json
@@ -2,6 +2,6 @@
     "extends": "./tsconfig",
     "compilerOptions": {
         "module": "commonjs",
-        "outDir": "../dist"
+        "outDir": "../lib/cjs"
     }
 }
diff --git a/packages/select/src/tsconfig.json b/packages/select/src/tsconfig.json
index 1fa5548ec3d..b4fa3674bf5 100644
--- a/packages/select/src/tsconfig.json
+++ b/packages/select/src/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "extends": "../../../config/tsconfig.base",
     "compilerOptions": {
-        "outDir": "../dist/esm"
+        "outDir": "../lib/esm"
     }
 }
diff --git a/packages/table-dev-app/src/index.scss b/packages/table-dev-app/src/index.scss
index 4c7ed296822..c3d4788c677 100644
--- a/packages/table-dev-app/src/index.scss
+++ b/packages/table-dev-app/src/index.scss
@@ -2,8 +2,8 @@
 // Licensed under the terms of the LICENSE file distributed with this project.
 
 @import "~normalize.css/normalize.css";
-@import "~@blueprintjs/core/dist/blueprint.css";
-@import "~@blueprintjs/icons/dist/blueprint-icons.css";
+@import "~@blueprintjs/core/lib/css/blueprint.css";
+@import "~@blueprintjs/icons/lib/css/blueprint-icons.css";
 @import "~@blueprintjs/table/src/table";
 
 // TODO: convert below CSS to SCSS
diff --git a/packages/table/karma.conf.js b/packages/table/karma.conf.js
index 7cca0391d91..12418a242b8 100644
--- a/packages/table/karma.conf.js
+++ b/packages/table/karma.conf.js
@@ -28,8 +28,8 @@ module.exports = function (config) {
             entry: {
                 table: [
                     path.resolve(__dirname, "test/index.ts"),
-                    path.resolve(__dirname, "../core/dist/blueprint.css"),
-                    path.resolve(__dirname, "dist/table.css"),
+                    path.resolve(__dirname, "../core/lib/css/blueprint.css"),
+                    path.resolve(__dirname, "lib/css/table.css"),
                 ],
             },
         }),
diff --git a/packages/table/package.json b/packages/table/package.json
index 043d19e3946..073fe8a38e6 100644
--- a/packages/table/package.json
+++ b/packages/table/package.json
@@ -2,17 +2,17 @@
   "name": "@blueprintjs/table",
   "version": "1.31.0",
   "description": "Scalable interactive table component",
-  "main": "dist/index.js",
-  "module": "dist/esm/index.js",
-  "typings": "dist/esm/index.d.ts",
-  "style": "dist/table.css",
+  "main": "lib/cjs/index.js",
+  "module": "lib/esm/index.js",
+  "typings": "lib/esm/index.d.ts",
+  "style": "lib/css/table.css",
   "unpkg": "dist/table.bundle.js",
   "scripts": {
     "compile": "npm-run-all -p 'compile:*'",
     "compile:esm": "tsc -p ./src",
     "compile:cjs": "tsc -p ./src/tsconfig.cjs.json",
     "compile:css": "sass-compile ./src",
-    "clean": "rm -rf dist/*",
+    "clean": "rm -rf dist/* && rm -rf lib/*",
     "dev": "npm-run-all -p 'compile:esm -- --watch' 'compile:css -- --watch'",
     "dist": "npm-run-all -s 'dist:*'",
     "dist:bundle": "NODE_ENV=production webpack",
diff --git a/packages/table/src/tsconfig.cjs.json b/packages/table/src/tsconfig.cjs.json
index 89e06b4b44e..54b20e53e7b 100644
--- a/packages/table/src/tsconfig.cjs.json
+++ b/packages/table/src/tsconfig.cjs.json
@@ -2,6 +2,6 @@
     "extends": "./tsconfig",
     "compilerOptions": {
         "module": "commonjs",
-        "outDir": "../dist"
+        "outDir": "../lib/cjs"
     }
 }
diff --git a/packages/table/src/tsconfig.json b/packages/table/src/tsconfig.json
index 20319caace5..eac6c113770 100644
--- a/packages/table/src/tsconfig.json
+++ b/packages/table/src/tsconfig.json
@@ -2,6 +2,6 @@
     "extends": "../../../config/tsconfig.base",
     "compilerOptions": {
         "lib": ["dom", "es5", "es6"],
-        "outDir": "../dist/esm"
+        "outDir": "../lib/esm"
     }
 }
diff --git a/packages/table/test/harness.ts b/packages/table/test/harness.ts
index 72fd3879403..82d576588d4 100644
--- a/packages/table/test/harness.ts
+++ b/packages/table/test/harness.ts
@@ -7,7 +7,7 @@
 // tslint:disable max-classes-per-file
 
 // tslint:disable-next-line:no-submodule-imports
-import { Browser } from "@blueprintjs/core/dist/esm/compatibility";
+import { Browser } from "@blueprintjs/core/lib/esm/compatibility";
 import * as React from "react";
 import * as ReactDOM from "react-dom";
 
diff --git a/packages/timezone/karma.conf.js b/packages/timezone/karma.conf.js
index 2f6504909f8..f38b97c0047 100644
--- a/packages/timezone/karma.conf.js
+++ b/packages/timezone/karma.conf.js
@@ -17,8 +17,8 @@ module.exports = function (config) {
             entry: {
                 timezone: [
                     path.resolve(__dirname, "test/index.ts"),
-                    path.resolve(__dirname, "../core/dist/blueprint.css"),
-                    path.resolve(__dirname, "dist/blueprint-timezone.css"),
+                    path.resolve(__dirname, "../core/lib/css/blueprint.css"),
+                    path.resolve(__dirname, "lib/css/blueprint-timezone.css"),
                 ],
             },
         }),
diff --git a/packages/timezone/package.json b/packages/timezone/package.json
index 47d6bef87fe..3fce1a2a384 100644
--- a/packages/timezone/package.json
+++ b/packages/timezone/package.json
@@ -2,17 +2,17 @@
   "name": "@blueprintjs/timezone",
   "version": "1.0.0",
   "description": "Components related to timezone selection and UI",
-  "main": "dist/index.js",
-  "module": "dist/esm/index.js",
-  "typings": "dist/esm/index.d.ts",
-  "style": "dist/blueprint-timezone.css",
+  "main": "lib/cjs/index.js",
+  "module": "lib/esm/index.js",
+  "typings": "lib/esm/index.d.ts",
+  "style": "lib/css/blueprint-timezone.css",
   "unpkg": "dist/timezone.bundle.js",
   "scripts": {
     "compile": "npm-run-all -p 'compile:*'",
     "compile:esm": "tsc -p ./src",
     "compile:cjs": "tsc -p ./src/tsconfig.cjs.json",
     "compile:css": "sass-compile ./src",
-    "clean": "rm -rf dist/*",
+    "clean": "rm -rf dist/* && rm -rf lib/*",
     "dev": "npm-run-all -p 'compile:esm -- --watch' 'compile:css -- --watch'",
     "dist": "npm-run-all -s 'dist:*'",
     "dist:bundle": "NODE_ENV=production webpack",
diff --git a/packages/timezone/src/tsconfig.cjs.json b/packages/timezone/src/tsconfig.cjs.json
index 89e06b4b44e..54b20e53e7b 100644
--- a/packages/timezone/src/tsconfig.cjs.json
+++ b/packages/timezone/src/tsconfig.cjs.json
@@ -2,6 +2,6 @@
     "extends": "./tsconfig",
     "compilerOptions": {
         "module": "commonjs",
-        "outDir": "../dist"
+        "outDir": "../lib/cjs"
     }
 }
diff --git a/packages/timezone/src/tsconfig.json b/packages/timezone/src/tsconfig.json
index 1fa5548ec3d..b4fa3674bf5 100644
--- a/packages/timezone/src/tsconfig.json
+++ b/packages/timezone/src/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "extends": "../../../config/tsconfig.base",
     "compilerOptions": {
-        "outDir": "../dist/esm"
+        "outDir": "../lib/esm"
     }
 }

From c1bb505e96994e3d0082f4a0002e50fa6978c70f Mon Sep 17 00:00:00 2001
From: Adi Dahiya <adahiya@palantir.com>
Date: Mon, 15 Jan 2018 14:37:32 -0500
Subject: [PATCH 2/7] Persist /lib/ paths to CI workspace

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3ba8bbd3cec..9aefca2440c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -37,6 +37,7 @@ jobs:
           root: '.'
           paths:
             - packages/*/dist
+            - packages/*/lib
             - packages/*/src/generated
 
   lint:

From a8cdd8fdc334933d4a8b76a894e9ce60d97faa30 Mon Sep 17 00:00:00 2001
From: Adi Dahiya <adahiya@palantir.com>
Date: Mon, 15 Jan 2018 14:48:35 -0500
Subject: [PATCH 3/7] Create file before writing in generate-css-variables

---
 packages/node-build-scripts/generate-css-variables | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/node-build-scripts/generate-css-variables b/packages/node-build-scripts/generate-css-variables
index 2711a950e88..07ef2d7282c 100755
--- a/packages/node-build-scripts/generate-css-variables
+++ b/packages/node-build-scripts/generate-css-variables
@@ -28,6 +28,9 @@ variablesScss = variablesScss
     .replace(/\n{3,}/g, "\n\n");
 variablesScss = COPYRIGHT_HEADER + "\n" + variablesScss;
 
+if (!fs.existsSync(`${DEST_DIR}/scss`)) {
+    fs.mkdirSync(`${DEST_DIR}/scss`);
+}
 fs.writeFileSync(`${DEST_DIR}/scss/variables.scss`, variablesScss);
 
 // convert scss to less
@@ -36,4 +39,7 @@ const variablesLess = variablesScss
     .replace(/rgba\((\$[\w-]+), (\$[\w-]+)\)/g, (match, color, variable) => `fade(${color}, ${variable} * 100%)`)
     .replace(/\$/g, "@");
 
+if (!fs.existsSync(`${DEST_DIR}/less`)) {
+    fs.mkdirSync(`${DEST_DIR}/less`);
+}
 fs.writeFileSync(`${DEST_DIR}/less/variables.less`, variablesLess);

From 7598bd87016331a60eb96f5dcecb80c6309e6354 Mon Sep 17 00:00:00 2001
From: Adi Dahiya <adahiya@palantir.com>
Date: Mon, 15 Jan 2018 14:49:50 -0500
Subject: [PATCH 4/7] Fix lib path in isotests

---
 packages/core/test/isotest.js     | 2 +-
 packages/datetime/test/isotest.js | 2 +-
 packages/icons/test/isotest.js    | 2 +-
 packages/select/test/isotest.js   | 2 +-
 packages/table/test/isotest.js    | 2 +-
 packages/timezone/test/isotest.js | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/core/test/isotest.js b/packages/core/test/isotest.js
index 23be3ecda3e..155b0687c71 100644
--- a/packages/core/test/isotest.js
+++ b/packages/core/test/isotest.js
@@ -6,7 +6,7 @@
 const { generateIsomorphicTests } = require("@blueprintjs/test-commons");
 const React = require("react");
 // TODO: get this to work with require("@std/esm")(module)("../lib/esm")
-const Core = require("../dist");
+const Core = require("../lib/cjs");
 
 const tooltipContent = { content: React.createElement("h1", {}, "content") };
 const customProps = {
diff --git a/packages/datetime/test/isotest.js b/packages/datetime/test/isotest.js
index 1caf8b940b0..1649e09e707 100644
--- a/packages/datetime/test/isotest.js
+++ b/packages/datetime/test/isotest.js
@@ -5,7 +5,7 @@
 
 const { generateIsomorphicTests } = require("@blueprintjs/test-commons");
 const React = require("react");
-const DateTime = require("../dist");
+const DateTime = require("../lib/cjs");
 
 describe("DateTime isomorphic rendering", () => {
     generateIsomorphicTests(
diff --git a/packages/icons/test/isotest.js b/packages/icons/test/isotest.js
index 0ae28727f49..b9d973ffc0b 100644
--- a/packages/icons/test/isotest.js
+++ b/packages/icons/test/isotest.js
@@ -5,7 +5,7 @@
 
 const { generateIsomorphicTests } = require("@blueprintjs/test-commons");
 const React = require("react");
-const Icons = require("../dist");
+const Icons = require("../lib/cjs");
 
 describe("Icons isomorphic rendering", () => {
     generateIsomorphicTests(
diff --git a/packages/select/test/isotest.js b/packages/select/test/isotest.js
index c74e1fe4a0b..4c9876383ec 100644
--- a/packages/select/test/isotest.js
+++ b/packages/select/test/isotest.js
@@ -5,7 +5,7 @@
 
 const { generateIsomorphicTests } = require("@blueprintjs/test-commons");
 const React = require("react");
-const Select = require("../dist");
+const Select = require("../lib/cjs");
 
 const customChildren = {
 };
diff --git a/packages/table/test/isotest.js b/packages/table/test/isotest.js
index b54d3d12488..3a494fd0e1c 100644
--- a/packages/table/test/isotest.js
+++ b/packages/table/test/isotest.js
@@ -5,7 +5,7 @@
 
 const { generateIsomorphicTests } = require("@blueprintjs/test-commons");
 const React = require("react");
-const Table = require("../dist");
+const Table = require("../lib/cjs");
 
 const draggableElement = React.createElement("button");
 const customChildren = {
diff --git a/packages/timezone/test/isotest.js b/packages/timezone/test/isotest.js
index 29712019a75..9d1def184f0 100644
--- a/packages/timezone/test/isotest.js
+++ b/packages/timezone/test/isotest.js
@@ -5,7 +5,7 @@
 
 const { generateIsomorphicTests } = require("@blueprintjs/test-commons");
 const React = require("react");
-const Timezone = require("../dist");
+const Timezone = require("../lib/cjs");
 
 describe("Timezone isomorphic rendering", () => {
     generateIsomorphicTests(

From 669291ed76d67071e699ce7d697c636c17f49e11 Mon Sep 17 00:00:00 2001
From: Adi Dahiya <adahiya@palantir.com>
Date: Mon, 15 Jan 2018 15:05:22 -0500
Subject: [PATCH 5/7] Update karma config to load styles

---
 packages/core/karma.conf.js     | 3 ++-
 packages/datetime/karma.conf.js | 6 ++++--
 packages/labs/karma.conf.js     | 6 ++++--
 packages/select/karma.conf.js   | 6 ++++--
 packages/table/karma.conf.js    | 6 ++++--
 packages/timezone/karma.conf.js | 6 ++++--
 6 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/packages/core/karma.conf.js b/packages/core/karma.conf.js
index 86a1b19822d..f5199c5e9f1 100644
--- a/packages/core/karma.conf.js
+++ b/packages/core/karma.conf.js
@@ -5,6 +5,7 @@
 const { createKarmaConfig } = require("@blueprintjs/karma-build-scripts");
 const fs = require("fs");
 const path = require("path");
+const packageManifest = require("./package.json");
 
 module.exports = function (config) {
     const baseConfig = createKarmaConfig({
@@ -28,7 +29,7 @@ module.exports = function (config) {
             entry: {
                 core: [
                     path.resolve(__dirname, "test/index.ts"),
-                    path.resolve(__dirname, "dist/blueprint.css"),
+                    path.resolve(__dirname, packageManifest.style),
                 ],
             },
         }),
diff --git a/packages/datetime/karma.conf.js b/packages/datetime/karma.conf.js
index 0e3a8a9c038..af140f87483 100644
--- a/packages/datetime/karma.conf.js
+++ b/packages/datetime/karma.conf.js
@@ -4,6 +4,8 @@
 
 const { createKarmaConfig } = require("@blueprintjs/karma-build-scripts");
 const path = require("path");
+const coreManifest = require("../core/package.json");
+const packageManifest = require("./package.json");
 
 module.exports = function (config) {
     const baseConfig = createKarmaConfig({
@@ -15,8 +17,8 @@ module.exports = function (config) {
             entry: {
                 datetime: [
                     path.resolve(__dirname, "test/index.ts"),
-                    path.resolve(__dirname, "../core/lib/css/blueprint.css"),
-                    path.resolve(__dirname, "lib/css/blueprint-datetime.css"),
+                    path.resolve(__dirname, `../core/${coreManifest.style}`),
+                    path.resolve(__dirname, packageManifest.style),
                 ],
             },
         }),
diff --git a/packages/labs/karma.conf.js b/packages/labs/karma.conf.js
index 4ff128ffde8..f5d353c4fb5 100644
--- a/packages/labs/karma.conf.js
+++ b/packages/labs/karma.conf.js
@@ -4,6 +4,8 @@
 
 const { createKarmaConfig } = require("@blueprintjs/karma-build-scripts");
 const path = require("path");
+const coreManifest = require("../core/package.json");
+const packageManifest = require("./package.json");
 
 module.exports = function (config) {
     const baseConfig = createKarmaConfig({
@@ -19,8 +21,8 @@ module.exports = function (config) {
             entry: {
                 labs: [
                     path.resolve(__dirname, "test/index.ts"),
-                    path.resolve(__dirname, "../core/lib/css/blueprint.css"),
-                    path.resolve(__dirname, "lib/css/blueprint-labs.css"),
+                    path.resolve(__dirname, `../core/${coreManifest.style}`),
+                    path.resolve(__dirname, packageManifest.style),
                 ],
             },
         }),
diff --git a/packages/select/karma.conf.js b/packages/select/karma.conf.js
index 162504812a2..c9eff28c069 100644
--- a/packages/select/karma.conf.js
+++ b/packages/select/karma.conf.js
@@ -4,6 +4,8 @@
 
 const { createKarmaConfig } = require("@blueprintjs/karma-build-scripts");
 const path = require("path");
+const coreManifest = require("../core/package.json");
+const packageManifest = require("./package.json");
 
 module.exports = function (config) {
     const baseConfig = createKarmaConfig({
@@ -17,8 +19,8 @@ module.exports = function (config) {
             entry: {
                 select: [
                     path.resolve(__dirname, "test/index.ts"),
-                    path.resolve(__dirname, "../core/lib/css/blueprint.css"),
-                    path.resolve(__dirname, "lib/css/blueprint-select.css"),
+                    path.resolve(__dirname, `../core/${coreManifest.style}`),
+                    path.resolve(__dirname, packageManifest.style),
                 ],
             },
         }),
diff --git a/packages/table/karma.conf.js b/packages/table/karma.conf.js
index 12418a242b8..10baa90b9a0 100644
--- a/packages/table/karma.conf.js
+++ b/packages/table/karma.conf.js
@@ -4,6 +4,8 @@
 
 const { createKarmaConfig } = require("@blueprintjs/karma-build-scripts");
 const path = require("path");
+const coreManifest = require("../core/package.json");
+const packageManifest = require("./package.json");
 
 module.exports = function (config) {
     const baseConfig = createKarmaConfig({
@@ -28,8 +30,8 @@ module.exports = function (config) {
             entry: {
                 table: [
                     path.resolve(__dirname, "test/index.ts"),
-                    path.resolve(__dirname, "../core/lib/css/blueprint.css"),
-                    path.resolve(__dirname, "lib/css/table.css"),
+                    path.resolve(__dirname, `../core/${coreManifest.style}`),
+                    path.resolve(__dirname, packageManifest.style),
                 ],
             },
         }),
diff --git a/packages/timezone/karma.conf.js b/packages/timezone/karma.conf.js
index f38b97c0047..5df471dd9fe 100644
--- a/packages/timezone/karma.conf.js
+++ b/packages/timezone/karma.conf.js
@@ -4,6 +4,8 @@
 
 const { createKarmaConfig } = require("@blueprintjs/karma-build-scripts");
 const path = require("path");
+const coreManifest = require("../core/package.json");
+const packageManifest = require("./package.json");
 
 module.exports = function (config) {
     const baseConfig = createKarmaConfig({
@@ -17,8 +19,8 @@ module.exports = function (config) {
             entry: {
                 timezone: [
                     path.resolve(__dirname, "test/index.ts"),
-                    path.resolve(__dirname, "../core/lib/css/blueprint.css"),
-                    path.resolve(__dirname, "lib/css/blueprint-timezone.css"),
+                    path.resolve(__dirname, `../core/${coreManifest.style}`),
+                    path.resolve(__dirname, packageManifest.style),
                 ],
             },
         }),

From 5948d78481c269f113e5f3d6bf0e4d966415cbbb Mon Sep 17 00:00:00 2001
From: Adi Dahiya <adahiya@palantir.com>
Date: Mon, 15 Jan 2018 15:44:27 -0500
Subject: [PATCH 6/7] Fix karma conf

---
 packages/core/karma.conf.js                       | 12 ++----------
 packages/datetime/karma.conf.js                   | 12 ++----------
 packages/karma-build-scripts/createKarmaConfig.js | 12 ++++++++++--
 packages/labs/karma.conf.js                       | 11 +----------
 packages/select/karma.conf.js                     | 11 +----------
 packages/table/karma.conf.js                      | 12 ++----------
 packages/timezone/karma.conf.js                   | 11 +----------
 7 files changed, 19 insertions(+), 62 deletions(-)

diff --git a/packages/core/karma.conf.js b/packages/core/karma.conf.js
index f5199c5e9f1..c55e707b638 100644
--- a/packages/core/karma.conf.js
+++ b/packages/core/karma.conf.js
@@ -5,7 +5,6 @@
 const { createKarmaConfig } = require("@blueprintjs/karma-build-scripts");
 const fs = require("fs");
 const path = require("path");
-const packageManifest = require("./package.json");
 
 module.exports = function (config) {
     const baseConfig = createKarmaConfig({
@@ -25,13 +24,6 @@ module.exports = function (config) {
     });
     config.set(baseConfig);
     config.set({
-        webpack: Object.assign({}, baseConfig.webpack, {
-            entry: {
-                core: [
-                    path.resolve(__dirname, "test/index.ts"),
-                    path.resolve(__dirname, packageManifest.style),
-                ],
-            },
-        }),
-    })
+        // overrides here
+    });
 };
diff --git a/packages/datetime/karma.conf.js b/packages/datetime/karma.conf.js
index af140f87483..336f4347c5b 100644
--- a/packages/datetime/karma.conf.js
+++ b/packages/datetime/karma.conf.js
@@ -13,14 +13,6 @@ module.exports = function (config) {
     });
     config.set(baseConfig);
     config.set({
-        webpack: Object.assign({}, baseConfig.webpack, {
-            entry: {
-                datetime: [
-                    path.resolve(__dirname, "test/index.ts"),
-                    path.resolve(__dirname, `../core/${coreManifest.style}`),
-                    path.resolve(__dirname, packageManifest.style),
-                ],
-            },
-        }),
-    })
+        // overrides here
+    });
 };
diff --git a/packages/karma-build-scripts/createKarmaConfig.js b/packages/karma-build-scripts/createKarmaConfig.js
index 968c1d9adee..3d7e04630a5 100644
--- a/packages/karma-build-scripts/createKarmaConfig.js
+++ b/packages/karma-build-scripts/createKarmaConfig.js
@@ -4,6 +4,7 @@
 
 const path = require("path");
 const webpack = require("webpack");
+const coreManifest = require("../core/package.json");
 const webpackConfig = require("./webpack.karma.config");
 
 const COVERAGE_PERCENT = 80;
@@ -57,7 +58,8 @@ module.exports = function createKarmaConfig({ dirname, coverageExcludes, coverag
                 pattern: path.join(dirname, "resources/**/*"),
                 watched: false,
             },
-            path.join(dirname, "dist/**/*.css"),
+            path.join(dirname, `../core/${coreManifest.style}`),
+            path.join(dirname, "lib/css/*.css"),
             path.join(dirname, "test/index.ts"),
         ],
         frameworks: ["mocha", "chai", "phantomjs-shim", "sinon"],
@@ -71,7 +73,13 @@ module.exports = function createKarmaConfig({ dirname, coverageExcludes, coverag
         },
         reporters: ["mocha", "coverage"],
         singleRun: true,
-        webpack: webpackConfig,
+        webpack: Object.assign({}, webpackConfig, {
+            entry: {
+                testIndex: [
+                    path.resolve(dirname, "test/index.ts"),
+                ],
+            },
+        }),
         webpackMiddleware: {
             noInfo: true,
             stats: {
diff --git a/packages/labs/karma.conf.js b/packages/labs/karma.conf.js
index f5d353c4fb5..ce9fdacedcf 100644
--- a/packages/labs/karma.conf.js
+++ b/packages/labs/karma.conf.js
@@ -17,14 +17,5 @@ module.exports = function (config) {
         failOnEmptyTestSuite: false,
         // disable coverage reporter
         reporters: ["mocha"],
-        webpack: Object.assign({}, baseConfig.webpack, {
-            entry: {
-                labs: [
-                    path.resolve(__dirname, "test/index.ts"),
-                    path.resolve(__dirname, `../core/${coreManifest.style}`),
-                    path.resolve(__dirname, packageManifest.style),
-                ],
-            },
-        }),
-    })
+    });
 };
diff --git a/packages/select/karma.conf.js b/packages/select/karma.conf.js
index c9eff28c069..856bc2d3e7a 100644
--- a/packages/select/karma.conf.js
+++ b/packages/select/karma.conf.js
@@ -15,14 +15,5 @@ module.exports = function (config) {
     config.set({
         // disable coverage reporter
         reporters: ["mocha"],
-        webpack: Object.assign({}, baseConfig.webpack, {
-            entry: {
-                select: [
-                    path.resolve(__dirname, "test/index.ts"),
-                    path.resolve(__dirname, `../core/${coreManifest.style}`),
-                    path.resolve(__dirname, packageManifest.style),
-                ],
-            },
-        }),
-    })
+    });
 };
diff --git a/packages/table/karma.conf.js b/packages/table/karma.conf.js
index 10baa90b9a0..89073545dfc 100644
--- a/packages/table/karma.conf.js
+++ b/packages/table/karma.conf.js
@@ -26,14 +26,6 @@ module.exports = function (config) {
     });
     config.set(baseConfig);
     config.set({
-        webpack: Object.assign({}, baseConfig.webpack, {
-            entry: {
-                table: [
-                    path.resolve(__dirname, "test/index.ts"),
-                    path.resolve(__dirname, `../core/${coreManifest.style}`),
-                    path.resolve(__dirname, packageManifest.style),
-                ],
-            },
-        }),
-    })
+        // overrides here
+    });
 };
diff --git a/packages/timezone/karma.conf.js b/packages/timezone/karma.conf.js
index 5df471dd9fe..856bc2d3e7a 100644
--- a/packages/timezone/karma.conf.js
+++ b/packages/timezone/karma.conf.js
@@ -15,14 +15,5 @@ module.exports = function (config) {
     config.set({
         // disable coverage reporter
         reporters: ["mocha"],
-        webpack: Object.assign({}, baseConfig.webpack, {
-            entry: {
-                timezone: [
-                    path.resolve(__dirname, "test/index.ts"),
-                    path.resolve(__dirname, `../core/${coreManifest.style}`),
-                    path.resolve(__dirname, packageManifest.style),
-                ],
-            },
-        }),
-    })
+    });
 };

From ac80d6d6aeec5738489cc075e979dce6bbad40d3 Mon Sep 17 00:00:00 2001
From: Adi Dahiya <adahiya@palantir.com>
Date: Mon, 15 Jan 2018 16:03:29 -0500
Subject: [PATCH 7/7] Move karma webpack config to webpack-build-scripts

---
 packages/karma-build-scripts/createKarmaConfig.js      |  8 +++++---
 packages/karma-build-scripts/package.json              |  1 +
 packages/webpack-build-scripts/index.js                |  3 ++-
 .../webpack.config.karma.js}                           | 10 +---------
 4 files changed, 9 insertions(+), 13 deletions(-)
 rename packages/{karma-build-scripts/webpack.karma.config.js => webpack-build-scripts/webpack.config.karma.js} (85%)

diff --git a/packages/karma-build-scripts/createKarmaConfig.js b/packages/karma-build-scripts/createKarmaConfig.js
index 3d7e04630a5..794e50d9d68 100644
--- a/packages/karma-build-scripts/createKarmaConfig.js
+++ b/packages/karma-build-scripts/createKarmaConfig.js
@@ -5,7 +5,7 @@
 const path = require("path");
 const webpack = require("webpack");
 const coreManifest = require("../core/package.json");
-const webpackConfig = require("./webpack.karma.config");
+const webpackBuildScripts = require("@blueprintjs/webpack-build-scripts");
 
 const COVERAGE_PERCENT = 80;
 const COVERAGE_PERCENT_HIGH = 90;
@@ -17,6 +17,8 @@ const KARMA_SERVER_PORT = 9876;
  * @param coverageOverrides { [glob: string]: object }
  */
 module.exports = function createKarmaConfig({ dirname, coverageExcludes, coverageOverrides }) {
+    const packageManifest = require(`${dirname}/package.json`);
+
     return {
         basePath: dirname,
         browserNoActivityTimeout: 100000,
@@ -59,7 +61,7 @@ module.exports = function createKarmaConfig({ dirname, coverageExcludes, coverag
                 watched: false,
             },
             path.join(dirname, `../core/${coreManifest.style}`),
-            path.join(dirname, "lib/css/*.css"),
+            path.join(dirname, packageManifest.style),
             path.join(dirname, "test/index.ts"),
         ],
         frameworks: ["mocha", "chai", "phantomjs-shim", "sinon"],
@@ -73,7 +75,7 @@ module.exports = function createKarmaConfig({ dirname, coverageExcludes, coverag
         },
         reporters: ["mocha", "coverage"],
         singleRun: true,
-        webpack: Object.assign({}, webpackConfig, {
+        webpack: Object.assign({}, webpackBuildScripts.karmaConfig, {
             entry: {
                 testIndex: [
                     path.resolve(dirname, "test/index.ts"),
diff --git a/packages/karma-build-scripts/package.json b/packages/karma-build-scripts/package.json
index 1c3875e2ba9..599adea2f73 100644
--- a/packages/karma-build-scripts/package.json
+++ b/packages/karma-build-scripts/package.json
@@ -6,6 +6,7 @@
     "test": "exit 0"
   },
   "dependencies": {
+    "@blueprintjs/webpack-build-scripts": "^0.3.0",
     "istanbul-instrumenter-loader": "^3.0.0",
     "karma": "^1.7.1",
     "karma-chai": "^0.1.0",
diff --git a/packages/webpack-build-scripts/index.js b/packages/webpack-build-scripts/index.js
index eaa8dc2bf2d..e39389fa646 100644
--- a/packages/webpack-build-scripts/index.js
+++ b/packages/webpack-build-scripts/index.js
@@ -4,10 +4,11 @@
  */
 
 const baseConfig = require("./webpack.config.base");
+const karmaConfig = require("./webpack.config.karma");
 
 module.exports = {
     baseConfig,
-
+    karmaConfig,
     COMMON_EXTERNALS: {
         "@blueprintjs/core": "var Blueprint.Core",
         "@blueprintjs/datetime": "var Blueprint.Datetime",
diff --git a/packages/karma-build-scripts/webpack.karma.config.js b/packages/webpack-build-scripts/webpack.config.karma.js
similarity index 85%
rename from packages/karma-build-scripts/webpack.karma.config.js
rename to packages/webpack-build-scripts/webpack.config.karma.js
index 384c05725de..dd2c6fc8ff4 100644
--- a/packages/karma-build-scripts/webpack.karma.config.js
+++ b/packages/webpack-build-scripts/webpack.config.karma.js
@@ -16,7 +16,7 @@ module.exports = {
     devtool: "inline-source-map",
 
     resolve: {
-        extensions: [".js", ".ts", ".tsx"],
+        extensions: [".css", ".js", ".ts", ".tsx"],
     },
 
     module: {
@@ -39,14 +39,6 @@ module.exports = {
                     require.resolve("css-loader"),
                 ],
             },
-            {
-                test: /\.scss$/,
-                use: [
-                    require.resolve("style-loader"),
-                    require.resolve("css-loader"),
-                    require.resolve("sass-loader"),
-                ],
-            },
             {
                 enforce: "post",
                 test: /src\/.*\.tsx?$/,