Merge 3ad8b5f into d263763

mozilla · Jan 5, 2020 · 1d9e53b · 1d9e53b
2 parents d263763 + 3ad8b5f
commit 1d9e53b
Show file tree

Hide file tree

Showing 180 changed files with 20,619 additions and 3,601 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,3 +1 @@
-node_modules/*
-test/coverage/*
-
+node_modules
diff --git a/.eslintrc b/.eslintrc
@@ -23,7 +23,7 @@ rules:
   no-path-concat: 2
 
   # Presentation
-  indent: [2, 2]
+  indent: [2, 2, { "SwitchCase": 1 }]
   quotes: [2, single, avoid-escape]
   new-cap: 2
   camelcase: 0

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 *~
-/node_modules
+node_modules
 npm-debug.log
-/test/coverage
+packages/convict/test/coverage
diff --git a/.istanbul.yml b/.istanbul.yml
diff --git a/.travis.yml b/.travis.yml
@@ -2,9 +2,16 @@ language: node_js
 
 sudo: false
 
+cache:
+  directories:
+    - node_modules
+
 node_js:
   - "stable"
   - "lts/*"
 
+install:
+  - npm run bootstrap:ci
+
 script:
   - npm run test:ci
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [6.0.0] - 2019-XX-XX
 ### Changed
 
-- Remove json5 dependency and make it an optional parser #326 (A-312)
+- [BREAKING] Multi-packages split #327 (A-312)
+- [BREAKING] Remove json5 dependency and make it an optional parser #326 (A-312)
 
 ## [5.2.0] - 2019-10-12
 ### Added