From b396692e42b25be2fe7dc6041e8577cb4c9f846c Mon Sep 17 00:00:00 2001 From: Jonathan Chen Date: Mon, 27 Feb 2017 22:04:37 -0500 Subject: [PATCH 01/13] Added travis.yml --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..2b9b12b --- /dev/null +++ b/.travis.yml @@ -0,0 +1,3 @@ +language: node_js +node_js: + - "6" \ No newline at end of file From b5bcedc3b9ca3ccae22f60b00496dc6005ec5eb7 Mon Sep 17 00:00:00 2001 From: Jonathan Chen Date: Mon, 27 Feb 2017 22:50:17 -0500 Subject: [PATCH 02/13] Modified travis.yml --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2b9b12b..e78cef2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ language: node_js node_js: - - "6" \ No newline at end of file + - "6" +before_script: + - jspm install \ No newline at end of file From 55f397b149fde054ec99266b3a1687bafc2d0468 Mon Sep 17 00:00:00 2001 From: Jonathan Chen Date: Mon, 27 Feb 2017 23:02:59 -0500 Subject: [PATCH 03/13] Running single test --- test/test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test.ts b/test/test.ts index f60100b..3435b61 100644 --- a/test/test.ts +++ b/test/test.ts @@ -26,7 +26,7 @@ describe('Argon', () => { expect(app.vuforia).to.exist; }); }) - +/* describe('new ArgonSystem()', () => { it('should create an ArgonSystem with Role=Role.MANAGER', () => { const manager = Argon.init(null, { role: Argon.Role.REALITY_MANAGER }); @@ -601,5 +601,5 @@ describe('Utils', () => { expect(CesiumMath.equalsEpsilon(frustum.yOffset, result.yOffset, CesiumMath.EPSILON10)).to.be.true; }); }) - +*/ }) \ No newline at end of file From e99514e05ad24d05a9721f887a79add3ee6d4d58 Mon Sep 17 00:00:00 2001 From: Jonathan Chen Date: Tue, 28 Feb 2017 14:03:37 -0500 Subject: [PATCH 04/13] Updating state of progress Remove the comments in runner.js to attempt to run the tests through Node --- .travis.yml | 2 -- package.json | 1 + test/runner.js | 3 +++ test/test.ts | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index e78cef2..0ec00be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,3 @@ language: node_js node_js: - "6" -before_script: - - jspm install \ No newline at end of file diff --git a/package.json b/package.json index 2fc53d9..f9704ef 100644 --- a/package.json +++ b/package.json @@ -223,6 +223,7 @@ "derequire": "^2.0.3", "jspm": "^0.17.0-beta.29", "node-static": "^0.7.7", + "systemjs": "^0.20.9", "tsconfig-glob": "^0.2.1", "typedoc": "^0.5.5", "typescript": "^2.1.4", diff --git a/test/runner.js b/test/runner.js index 7a841fe..ca979ea 100644 --- a/test/runner.js +++ b/test/runner.js @@ -1,4 +1,7 @@ var Mocha = require('mocha') +// global.SystemJS = require('systemjs') +// require('../jspm.config') +// require('../jspm.browser') var runner = new Mocha({ ui: 'bdd', diff --git a/test/test.ts b/test/test.ts index 3435b61..f60100b 100644 --- a/test/test.ts +++ b/test/test.ts @@ -26,7 +26,7 @@ describe('Argon', () => { expect(app.vuforia).to.exist; }); }) -/* + describe('new ArgonSystem()', () => { it('should create an ArgonSystem with Role=Role.MANAGER', () => { const manager = Argon.init(null, { role: Argon.Role.REALITY_MANAGER }); @@ -601,5 +601,5 @@ describe('Utils', () => { expect(CesiumMath.equalsEpsilon(frustum.yOffset, result.yOffset, CesiumMath.EPSILON10)).to.be.true; }); }) -*/ + }) \ No newline at end of file From 59e8c21bfd816e906cad3e8fa39d5c9c73818821 Mon Sep 17 00:00:00 2001 From: Jonathan Chen Date: Tue, 7 Mar 2017 12:35:30 -0500 Subject: [PATCH 05/13] Testing with older node version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0ec00be..dd1d9e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,3 @@ language: node_js node_js: - - "6" + - "6.2" From a24dec1e644c7ad466af180f55f086b1e37730de Mon Sep 17 00:00:00 2001 From: Jonathan Chen Date: Tue, 7 Mar 2017 12:39:10 -0500 Subject: [PATCH 06/13] Updated test script --- .travis.yml | 2 ++ package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index dd1d9e2..6f4d8ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ language: node_js node_js: - "6.2" +before_script: + - jspm install diff --git a/package.json b/package.json index f9704ef..c03025d 100644 --- a/package.json +++ b/package.json @@ -202,7 +202,7 @@ "prebuild": "npm run build:core && npm run build:browser", "build": "uglifyjs dist/argon.js -m -c warnings=false -o dist/argon.min.js", "browser-sync": "browser-sync start --server --directory --startPath \"index.html\" --files \"src/**\"", - "test": "jspm run test/runner.js", + "test": "node --max_old_size_space=4096 ./node_modules/jspm/jspm.js run test/runner.js", "static": "static -p 3000", "typedoc": "typedoc --tsconfig tsconfig.build.json --out docs --mode file --gaID UA-63191442-2 --name argon.js --readme src/README.md --target ES6 --module commonjs --moduleResolution node --experimentalDecorators --includeDeclarations --excludeNotExported --excludeExternals --ignoreCompilerErrors src", "postinstall": "npm install types/cesium types/mobile-detect", From a007e82d32c05f61e3ecdbec48f409ee3daaa091 Mon Sep 17 00:00:00 2001 From: Jonathan Chen Date: Tue, 7 Mar 2017 12:42:37 -0500 Subject: [PATCH 07/13] Removed memory increase --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c03025d..e778a24 100644 --- a/package.json +++ b/package.json @@ -202,7 +202,7 @@ "prebuild": "npm run build:core && npm run build:browser", "build": "uglifyjs dist/argon.js -m -c warnings=false -o dist/argon.min.js", "browser-sync": "browser-sync start --server --directory --startPath \"index.html\" --files \"src/**\"", - "test": "node --max_old_size_space=4096 ./node_modules/jspm/jspm.js run test/runner.js", + "test": "node ./node_modules/jspm/jspm.js run test/runner.js", "static": "static -p 3000", "typedoc": "typedoc --tsconfig tsconfig.build.json --out docs --mode file --gaID UA-63191442-2 --name argon.js --readme src/README.md --target ES6 --module commonjs --moduleResolution node --experimentalDecorators --includeDeclarations --excludeNotExported --excludeExternals --ignoreCompilerErrors src", "postinstall": "npm install types/cesium types/mobile-detect", From 02b497ad8ab8f92f382bc1a9f48848f43ae8e171 Mon Sep 17 00:00:00 2001 From: Jonathan Chen Date: Tue, 7 Mar 2017 12:50:49 -0500 Subject: [PATCH 08/13] Re-added memory increase --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e778a24..d6aac36 100644 --- a/package.json +++ b/package.json @@ -202,7 +202,7 @@ "prebuild": "npm run build:core && npm run build:browser", "build": "uglifyjs dist/argon.js -m -c warnings=false -o dist/argon.min.js", "browser-sync": "browser-sync start --server --directory --startPath \"index.html\" --files \"src/**\"", - "test": "node ./node_modules/jspm/jspm.js run test/runner.js", + "test": "node --max_old_space_size=4096 ./node_modules/jspm/jspm.js run test/runner.js", "static": "static -p 3000", "typedoc": "typedoc --tsconfig tsconfig.build.json --out docs --mode file --gaID UA-63191442-2 --name argon.js --readme src/README.md --target ES6 --module commonjs --moduleResolution node --experimentalDecorators --includeDeclarations --excludeNotExported --excludeExternals --ignoreCompilerErrors src", "postinstall": "npm install types/cesium types/mobile-detect", From 6f6a0159ae5a4ae79d3d358ec104cabbf879f443 Mon Sep 17 00:00:00 2001 From: Jonathan Chen Date: Mon, 1 May 2017 16:31:28 -0400 Subject: [PATCH 09/13] Added feature detection minus package --- jspm.config.js | 4 ++++ src/utils.ts | 1 + src/utils/platform-properties.ts | 4 ++++ 3 files changed, 9 insertions(+) create mode 100644 src/utils/platform-properties.ts diff --git a/jspm.config.js b/jspm.config.js index 7b4bfd0..7325135 100644 --- a/jspm.config.js +++ b/jspm.config.js @@ -21,6 +21,9 @@ SystemJS.config({ 'map': { './webvr': { '~browser': '@empty' + }, + './utils/platform-properties': { + '~browser': '@empty' } } }, @@ -358,6 +361,7 @@ SystemJS.config({ 'aurelia-polyfills': 'npm:aurelia-polyfills@1.0.0-beta.1.0.0', 'cesium': 'github:aelatgt/cesium@referenceFrames', 'googlevr/webvr-polyfill': 'github:googlevr/webvr-polyfill@0.9.3', + 'webvr-feature-detector': 'github:webvr-feature-detector', 'mobile-detect': 'npm:mobile-detect@1.3.2' }, packages: {} diff --git a/src/utils.ts b/src/utils.ts index 3384e8d..586fd5c 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -20,6 +20,7 @@ export * from './utils/event'; export * from './utils/message-channel'; export {default as synthesizeEvent} from './utils/ui-event-synthesizer'; export {default as createEventForwarder} from './utils/ui-event-forwarder'; +export * from './utils/platform-properties'; /** * Get array of ancestor reference frames of a Cesium Entity, ordered from diff --git a/src/utils/platform-properties.ts b/src/utils/platform-properties.ts new file mode 100644 index 0000000..909732f --- /dev/null +++ b/src/utils/platform-properties.ts @@ -0,0 +1,4 @@ +import 'webvr-feature-detector/webvr-feature-detector'; + +let PlatformProperties = WebVRFeatureDetector +export {PlatformProperties} \ No newline at end of file From 5d09811daf89955aea4ec639158b0d55108acf43 Mon Sep 17 00:00:00 2001 From: Jonathan Chen Date: Fri, 5 May 2017 04:05:59 -0400 Subject: [PATCH 10/13] Added reference to Github repo containing webvr-feature-detector polyfill --- jspm.config.js | 4 ++-- package.json | 2 ++ src/utils/platform-properties.ts | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/jspm.config.js b/jspm.config.js index 7325135..397e0d0 100644 --- a/jspm.config.js +++ b/jspm.config.js @@ -361,8 +361,8 @@ SystemJS.config({ 'aurelia-polyfills': 'npm:aurelia-polyfills@1.0.0-beta.1.0.0', 'cesium': 'github:aelatgt/cesium@referenceFrames', 'googlevr/webvr-polyfill': 'github:googlevr/webvr-polyfill@0.9.3', - 'webvr-feature-detector': 'github:webvr-feature-detector', - 'mobile-detect': 'npm:mobile-detect@1.3.2' + 'mobile-detect': 'npm:mobile-detect@1.3.2', + 'webvr-feature-detector': 'github:pindiespace/webvr-feature-detector@master' }, packages: {} }); diff --git a/package.json b/package.json index b0c404b..56ff7b2 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "aurelia-dependency-injection": "npm:aurelia-dependency-injection@^1.2.0", "aurelia-polyfills": "npm:aurelia-polyfills@^1.0.0-beta.1.0.0", "googlevr/webvr-polyfill": "github:googlevr/webvr-polyfill@0.9.3", + "webvr-feature-detector": "github:pindiespace/webvr-feature-detector@^1.0.0", "json": "github:systemjs/plugin-json@^0.2.3", "mobile-detect": "npm:mobile-detect@^1.3.2", "object-assign": "npm:object-assign@^4.1.0" @@ -256,3 +257,4 @@ "standard-version": "^4.0.0" } } + diff --git a/src/utils/platform-properties.ts b/src/utils/platform-properties.ts index 909732f..b7705f5 100644 --- a/src/utils/platform-properties.ts +++ b/src/utils/platform-properties.ts @@ -1,4 +1,4 @@ -import 'webvr-feature-detector/webvr-feature-detector'; +import 'webvr-feature-detector/src/webvr-feature-detector'; let PlatformProperties = WebVRFeatureDetector -export {PlatformProperties} \ No newline at end of file +export {PlatformProperties} From f416e1e5474fac8802e1efafa70e68922b0acf3a Mon Sep 17 00:00:00 2001 From: Jonathan Chen Date: Mon, 8 May 2017 22:55:51 -0400 Subject: [PATCH 11/13] Removed unnecessary changes --- .travis.yml | 2 +- jspm.config.js | 1 - package.json | 3 +-- test/runner.js | 3 --- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8f370b2..e5e6afa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,4 +10,4 @@ cache: before_install: - npm install - - jspm install + \ No newline at end of file diff --git a/jspm.config.js b/jspm.config.js index 397e0d0..90aa924 100644 --- a/jspm.config.js +++ b/jspm.config.js @@ -361,7 +361,6 @@ SystemJS.config({ 'aurelia-polyfills': 'npm:aurelia-polyfills@1.0.0-beta.1.0.0', 'cesium': 'github:aelatgt/cesium@referenceFrames', 'googlevr/webvr-polyfill': 'github:googlevr/webvr-polyfill@0.9.3', - 'mobile-detect': 'npm:mobile-detect@1.3.2', 'webvr-feature-detector': 'github:pindiespace/webvr-feature-detector@master' }, packages: {} diff --git a/package.json b/package.json index cf342c7..b63e8b7 100644 --- a/package.json +++ b/package.json @@ -223,7 +223,7 @@ "prebuild": "npm run build:core && npm run build:browser", "build": "uglifyjs dist/argon.js -m -c warnings=false -o dist/argon.min.js", "browser-sync": "browser-sync start --server --directory --startPath \"index.html\" --files \"src/**\"", - "test": "node --max_old_space_size=4096 ./node_modules/jspm/jspm.js run test/runner.js", + "test": "jspm run test/runner.js", "static": "static -p 3000", "typedoc": "typedoc --tsconfig tsconfig.build.json --out docs --mode file --gaID UA-63191442-2 --name argon.js --readme src/README.md --target ES6 --module commonjs --moduleResolution node --experimentalDecorators --includeDeclarations --excludeNotExported --excludeExternals --ignoreCompilerErrors src", "postinstall": "npm install types/cesium types/mobile-detect", @@ -248,7 +248,6 @@ "derequire": "^2.0.3", "jspm": "0.17.0-beta.32", "node-static": "^0.7.7", - "systemjs": "^0.20.9", "tsconfig-glob": "^0.2.1", "typedoc": "^0.5.7", "typescript": "^2.2.1", diff --git a/test/runner.js b/test/runner.js index ca979ea..7a841fe 100644 --- a/test/runner.js +++ b/test/runner.js @@ -1,7 +1,4 @@ var Mocha = require('mocha') -// global.SystemJS = require('systemjs') -// require('../jspm.config') -// require('../jspm.browser') var runner = new Mocha({ ui: 'bdd', From 662913bdb728012569beda532048cbd5f028ff4d Mon Sep 17 00:00:00 2001 From: Jonathan Chen Date: Mon, 8 May 2017 22:58:22 -0400 Subject: [PATCH 12/13] Travis testing fix --- .travis.yml | 1 + package.json | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e5e6afa..df12284 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,4 +10,5 @@ cache: before_install: - npm install + - jspm install \ No newline at end of file diff --git a/package.json b/package.json index b63e8b7..b8927ab 100644 --- a/package.json +++ b/package.json @@ -256,4 +256,3 @@ "standard-version": "^4.0.0" } } - From 72d9598c2c2b785f9b5b308d284889fa05eb46c6 Mon Sep 17 00:00:00 2001 From: Jonathan Chen Date: Mon, 8 May 2017 23:08:42 -0400 Subject: [PATCH 13/13] More fixing --- .travis.yml | 1 - package.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index df12284..8f370b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,4 +11,3 @@ cache: before_install: - npm install - jspm install - \ No newline at end of file diff --git a/package.json b/package.json index b8927ab..8dd1346 100644 --- a/package.json +++ b/package.json @@ -248,6 +248,7 @@ "derequire": "^2.0.3", "jspm": "0.17.0-beta.32", "node-static": "^0.7.7", + "systemjs": "^0.20.9", "tsconfig-glob": "^0.2.1", "typedoc": "^0.5.7", "typescript": "^2.2.1",