From c76ce9b73107fcd75cb1eeb3a593516ccb3e1e70 Mon Sep 17 00:00:00 2001 From: Ian Trewella Date: Mon, 22 Jan 2018 16:13:56 -0800 Subject: [PATCH 1/2] Updated travis testing --- .travis.yml | 9 ++------- karma.conf.js | 8 +++++++- package.json | 2 ++ rollup.config.umd.js | 6 ++---- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 42fdb2a1a3..7385245d9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,15 +8,10 @@ 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 @@ -24,7 +19,7 @@ deploy: 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 index 8ea6f83e15..c5cc01ed3e 100644 --- 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 index 834ccd7bbf..ceaa08eb46 100644 --- 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/rollup.config.umd.js b/rollup.config.umd.js index 6b4cc16012..7a2dcbbd7c 100644 --- a/rollup.config.umd.js +++ b/rollup.config.umd.js @@ -48,7 +48,7 @@ const globals = packageNames.reduce((globals, p) => { */ export default { entry: "./src/index.ts", - dest: `./dist/umd/${name.replace("@esri/", "")}.umd.js`, + dest: `./dist/browser/${name.replace("@esri/", "")}.umd.js`, format: "umd", sourceMap: true, context: "window", @@ -58,9 +58,7 @@ export default { plugins: [ typescript(), json(), - resolve({ - browser: true - }), + resolve(), commonjs(), uglify(), filesize() From 29e01897e35c6c4bb02709998afe2c493401d86d Mon Sep 17 00:00:00 2001 From: jgravois Date: Tue, 23 Jan 2018 09:51:45 -0800 Subject: [PATCH 2/2] refactor(package.json files and rollup config): ensure JS build tools can fetch a valid UMD file and remove .umd from built filenames AFFECTS PACKAGES: @esri/arcgis-rest-auth @esri/arcgis-rest-geocoder @esri/arcgis-rest-groups @esri/arcgis-rest-items @esri/arcgis-rest-request ISSUES CLOSED: #101 travis needs sudo to install chrome now i guess leave the filenames be i think its choking on the prepare script another try with the npm@5 guess ensure rollup doesnt use browser bundles dont need sudo anymore --- packages/arcgis-rest-auth/package.json | 2 +- packages/arcgis-rest-geocoder/package.json | 2 +- packages/arcgis-rest-groups/package.json | 2 +- packages/arcgis-rest-items/package.json | 2 +- packages/arcgis-rest-request/package.json | 2 +- rollup.config.umd.js | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/arcgis-rest-auth/package.json b/packages/arcgis-rest-auth/package.json index 5403b6fc99..ba6ece88bf 100644 --- 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 index ae96715340..047c2b1fcd 100644 --- 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 index 211b054005..10cdc9df9f 100644 --- 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 index 648fd8dd83..d28f41e8de 100644 --- 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 index 64a262f36d..fae8dc69be 100644 --- 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 index 7a2dcbbd7c..9b13f46d05 100644 --- a/rollup.config.umd.js +++ b/rollup.config.umd.js @@ -48,7 +48,7 @@ const globals = packageNames.reduce((globals, p) => { */ export default { entry: "./src/index.ts", - dest: `./dist/browser/${name.replace("@esri/", "")}.umd.js`, + dest: `./dist/umd/${name.replace("@esri/", "")}.umd.js`, format: "umd", sourceMap: true, context: "window",