Merge pull request #212 from rollup/external-from-commonjs

Handle options.external correctly
rollup · Aug 3, 2017 · 60846f5 · 60846f5
2 parents 61157df + 5309d9b
commit 60846f5
Show file tree

Hide file tree

Showing 13 changed files with 1,856 additions and 15 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -20,7 +20,7 @@
   },
   "extends": "eslint:recommended",
   "parserOptions": {
-    "ecmaVersion": 6,
+    "ecmaVersion": 8,
     "sourceType": "module"
   }
 }
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,7 @@
 sudo: false
 language: node_js
 node_js:
-  - "4"
-  - "6"
+  - "node"
 env:
   global:
     - BUILD_TIMEOUT=10000

diff --git a/appveyor.yml b/appveyor.yml
@@ -10,8 +10,7 @@ init:
 environment:
   matrix:
     # node.js
-    - nodejs_version: 4
-    - nodejs_version: 6
+    - nodejs_version: 8
 
 install:
   - ps: Install-Product node $env:nodejs_version