Merge branch 'broccoli_types'

.travis.yml

@@ -3,6 +3,4 @@ node_js:
 - '6'
 - '8'
 - '10'
-env:
-- COVERAGE=true
-- COVERAGE=false
+install: yarn

lerna.json

@@ -3,5 +3,7 @@
     "packages/*"
   ],
   "version": "independent",
-  "lerna": "2.4.0"
+  "lerna": "^3.13.0",
+  "npmClient": "yarn",
+  "useWorkspaces": true
 }

package.json

@@ -5,9 +5,16 @@
     "lerna": "^3.3.0",
     "yarn": "^1.9.4"
   },
+  "workspaces": [
+    "packages/*"
+  ],
   "scripts": {
     "bootstrap": "lerna bootstrap",
     "test": "lerna run test",
     "postinstall": "lerna bootstrap"
+  },
+  "toolchain": {
+    "node": "10.15.1",
+    "yarn": "1.14.0"
   }
-}
+}

packages/broccoli-eyeglass/.eslintignore

@@ -1,8 +1,4 @@
-# compiled output
-/dist/
-/tmp/
-
-# misc
-/coverage/
-!.*
-/examples/
+test
+lib
+src/types
+examples

packages/broccoli-eyeglass/.eslintrc

@@ -0,0 +1,3 @@
+{
+  "extends": "../eyeglass/.eslintrc"
+}

packages/broccoli-eyeglass/.gitignore

@@ -1,4 +1,5 @@
 node_modules
 .DS_Store
 tmp
-
+lib
+examples/*/dist

packages/broccoli-eyeglass/examples/example-1/Brocfile.js

@@ -1,9 +1,8 @@
 var BroccoliEyeglass = require("broccoli-eyeglass");
 
-var options = {
-  cssDir: "css" /* This is the only required option */,
-};
 
-var outputTree = new BroccoliEyeglass(["src"], options);
+var outputTree = new BroccoliEyeglass("src", {
+  cssDir: "css" /* This is the only required option */,
+});
 
 module.exports = outputTree;

packages/broccoli-eyeglass/examples/example-2/Brocfile.js

@@ -1,11 +1,9 @@
 var BroccoliEyeglass = require("broccoli-eyeglass");
 
-var options = {
+var outputTree = new BroccoliEyeglass("src", {
   cssDir: "stylesheets",
   discover: false, // Don't automatically find & convert sass files in the trees
   sourceFiles: ["master.scss"], // Array of files (or glob string) to compile
-};
-
-var outputTree = new BroccoliEyeglass(["src"], options);
+});
 
 module.exports = outputTree;