Merge branch 'master' into export-star-as-ns

tc39 · Oct 5, 2018 · ec319d4 · ec319d4
2 parents 5999e11 + 8af0023
commit ec319d4
Show file tree

Hide file tree

Showing 6 changed files with 1,986 additions and 2,962 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,7 @@ node_modules/
 out/
 test*.js
 
+# Only apps should have lockfiles
+npm-shrinkwrap.json
+package-lock.json
+yarn.lock
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,6 @@ env:
 language: node_js
 
 node_js:
-  - "8"
+  - "10"
 
 sudo: false
diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
   "license": "SEE LICENSE IN https://tc39.github.io/ecma262/#sec-copyright-and-software-license",
   "homepage": "https://tc39.github.io/ecma262/",
   "dependencies": {
-    "ecmarkup": "^3.12.0"
+    "ecmarkup": "^3.16.0"
   },
   "devDependencies": {
     "@alrra/travis-scripts": "^2.0.0"