Merge pull request #102 from Esri/patch101

ensure JS build tools can fetch a valid UMD file
Esri · Jan 24, 2018 · f12822c · f12822c
2 parents 94edc2a + 29e0189
commit f12822c
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,23 +8,18 @@ node_js:
 cache:
   directories: # Cache dependencies
     - node_modules
-before_install:
-  - google-chrome-stable --headless --disable-gpu
 before_script:
   - npm run bootstrap
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
-  - sleep 3 # give xvfb some time to start
 script:
-  - npm run test:all
+  - npm run test:ci
 deploy:
   provider: pages
   skip_cleanup: true
   github_token: $GITHUB_TOKEN # Set in travis-ci.org dashboard
   on:
     branch: master
   local-dir: docs/build
-  target_branch: gh-pages # default
+  target_branch: gh-pages
 before_deploy:
  - npm run docs:build
 env:

diff --git a/karma.conf.js b/karma.conf.js
@@ -88,6 +88,12 @@ module.exports = function(config) {
 
     // Concurrency level
     // how many browsers should be started simultaneously
-    concurrency: Infinity
+    concurrency: Infinity,
+    customLaunchers: {
+      ChromeHeadlessCI: {
+        base: 'ChromeHeadless',
+        flags: ['--no-sandbox']
+      }
+    },
   });
 };
diff --git a/package.json b/package.json
@@ -78,9 +78,11 @@
     "test": "npm run test:node && npm run test:chrome",
     "test:chrome:debug": "karma start --auto-watch --no-single-run --browsers=Chrome",
     "test:chrome": "karma start --single-run --browsers=Chrome",
+    "test:chrome:ci": "karma start --single-run --browsers ChromeHeadlessCI karma.conf.js",
     "test:firefox": "karma start --single-run --browsers=Firefox",
     "test:node": "jasmine --config=jasmine.json",
     "test:node:debug": "inspect jasmine --config=jasmine.json",
+    "test:ci":  "npm run test:node && npm run test:chrome:ci && npm run test:firefox",
     "test:all": "npm run test:node && npm run test:firefox && npm run test:chrome",
     "docs:build": "rimraf docs/build && npm run docs:typedoc && npm run docs:build:acetate && npm run docs:build:sass && npm run docs:build:images",
     "docs:build:acetate": "ENV=prod acetate build --config docs/acetate.config.js",

diff --git a/packages/arcgis-rest-auth/package.json b/packages/arcgis-rest-auth/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.2",
   "description": "Authentication helpers for @esri/arcgis-rest-*.",
   "main": "dist/node/index.js",
-  "browser": "dist/browser/arcgis-rest-auth.umd.js",
+  "browser": "dist/umd/arcgis-rest-auth.umd.js",
   "module": "dist/esm/index.js",
   "js:next": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",

diff --git a/packages/arcgis-rest-geocoder/package.json b/packages/arcgis-rest-geocoder/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.2",
   "description": "Geocoding helpers for @esri/arcgis-rest-request",
   "main": "dist/node/index.js",
-  "browser": "dist/browser/arcgis-rest-geocoder.umd.js",
+  "browser": "dist/umd/arcgis-rest-geocoder.umd.js",
   "module": "dist/esm/index.js",
   "js:next": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",

diff --git a/packages/arcgis-rest-groups/package.json b/packages/arcgis-rest-groups/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.2",
   "description": "Portal Group helpers for @esri/arcgis-rest-request",
   "main": "dist/node/index.js",
-  "browser": "dist/browser/arcgis-rest-groups.umd.js",
+  "browser": "dist/umd/arcgis-rest-groups.umd.js",
   "module": "dist/esm/index.js",
   "js:next": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",

diff --git a/packages/arcgis-rest-items/package.json b/packages/arcgis-rest-items/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.2",
   "description": "Portal Item helpers for @esri/arcgis-rest-request",
   "main": "dist/node/index.js",
-  "browser": "dist/browser/arcgis-rest-items.umd.js",
+  "browser": "dist/umd/arcgis-rest-items.umd.js",
   "module": "dist/esm/index.js",
   "js:next": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",

diff --git a/packages/arcgis-rest-request/package.json b/packages/arcgis-rest-request/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.2",
   "description": "Common methods and utilities for @esri/arcgis-rest-* packages.",
   "main": "dist/node/index.js",
-  "browser": "dist/browser/arcgis-rest-request.umd.js",
+  "browser": "dist/umd/arcgis-rest-request.umd.js",
   "module": "dist/esm/index.js",
   "js:next": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",

diff --git a/rollup.config.umd.js b/rollup.config.umd.js
@@ -58,9 +58,7 @@ export default {
   plugins: [
     typescript(),
     json(),
-    resolve({
-      browser: true
-    }),
+    resolve(),
     commonjs(),
     uglify(),
     filesize()