From 840112b4722ee93be6fe567149c45bdf75a849d6 Mon Sep 17 00:00:00 2001 From: Dave Laird Date: Wed, 27 Mar 2019 12:11:08 -0700 Subject: [PATCH 1/8] Run tests againt ember-data@3.8.0 --- lib/utilities/pristine.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/utilities/pristine.js b/lib/utilities/pristine.js index cfac567..160c66a 100644 --- a/lib/utilities/pristine.js +++ b/lib/utilities/pristine.js @@ -95,7 +95,7 @@ function installPristineApp(appName, options) { hasBowerComponents, skipNpm, emberVersion: options.emberVersion || 'canary', - emberDataVersion: options.emberDataVersion || 'emberjs/data#master' + emberDataVersion: options.emberDataVersion || 'emberjs/data#v3.8.0' }; promise = promise From 6495fefc34f8b86f69aa36ea9a528584c56f4634 Mon Sep 17 00:00:00 2001 From: Dave Laird Date: Fri, 5 Apr 2019 11:29:44 -0700 Subject: [PATCH 2/8] Use ember-data version from npm --- lib/utilities/pristine.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/utilities/pristine.js b/lib/utilities/pristine.js index 160c66a..d5f971e 100644 --- a/lib/utilities/pristine.js +++ b/lib/utilities/pristine.js @@ -95,7 +95,7 @@ function installPristineApp(appName, options) { hasBowerComponents, skipNpm, emberVersion: options.emberVersion || 'canary', - emberDataVersion: options.emberDataVersion || 'emberjs/data#v3.8.0' + emberDataVersion: options.emberDataVersion || '^3.6.0' }; promise = promise diff --git a/package.json b/package.json index e4e5215..a648473 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "devDependencies": { "chai": "^4.0.2", "cross-env": "^5.0.0", - "ember-cli": "~2.17.1", + "ember-cli": "~3.8.0", "ember-cli-fastboot": "^1.0.0", "eslint-config-sane": "^0.6.0", "eslint-plugin-prefer-let": "^1.0.1", From e690de977c5923d8a0ff854f4743ad5662432828 Mon Sep 17 00:00:00 2001 From: Dave Laird Date: Sat, 6 Apr 2019 09:58:40 -0700 Subject: [PATCH 3/8] Remove the npm3 requirement in CI --- .travis.yml | 3 +-- lib/utilities/pristine.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e642e86..d8cea31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ node_js: - "10" before_install: - - if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi - - npm config set spin false + - if [[ `npm -v` != 6* ]]; then npm i -g npm@6; fi - npm install -g bower - bower --version diff --git a/lib/utilities/pristine.js b/lib/utilities/pristine.js index d5f971e..b543ad0 100644 --- a/lib/utilities/pristine.js +++ b/lib/utilities/pristine.js @@ -95,7 +95,7 @@ function installPristineApp(appName, options) { hasBowerComponents, skipNpm, emberVersion: options.emberVersion || 'canary', - emberDataVersion: options.emberDataVersion || '^3.6.0' + emberDataVersion: options.emberDataVersion || '^3.8.0' }; promise = promise From f8a2a7de3df0c144bb21d0a6ded90cf2912292c1 Mon Sep 17 00:00:00 2001 From: Dave Laird Date: Sat, 6 Apr 2019 10:23:57 -0700 Subject: [PATCH 4/8] Force npm 6 or higher --- .travis.yml | 5 ++++- appveyor.yml | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d8cea31..a6716c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,9 @@ node_js: - "10" before_install: - - if [[ `npm -v` != 6* ]]; then npm i -g npm@6; fi + + # TODO: remove when we stop testing against node 6 + - if [[ `npm -v` < 6* ]]; then npm i -g npm@6; fi + - npm install -g bower - bower --version diff --git a/appveyor.yml b/appveyor.yml index 8743f97..9ce2e3f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,8 +12,7 @@ init: # Install scripts. (runs after repo cloning) install: - ps: Install-Product node $env:nodejs_version - - npm i -g npm@^3 - - npm config set spin false + - npm i -g npm@^6 - npm install -g bower - npm install From 167f47108026132b52ddc2171f208993bc74d7e8 Mon Sep 17 00:00:00 2001 From: Dave Laird Date: Sat, 6 Apr 2019 12:47:31 -0700 Subject: [PATCH 5/8] drop node 4 from appveyor test metrix --- appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 9ce2e3f..62fd91b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,5 @@ environment: matrix: - - nodejs_version: "4" - nodejs_version: "6" - nodejs_version: "8" - nodejs_version: "10" From 738ef5f5f8a7029f40310b84da202100cd7f31fe Mon Sep 17 00:00:00 2001 From: Dave Laird Date: Mon, 8 Apr 2019 09:28:03 -0700 Subject: [PATCH 6/8] Use emberjs/data#v3.8.0 for ember-data version --- appveyor.yml | 3 ++- lib/utilities/pristine.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 62fd91b..4f81b83 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,8 @@ init: # Install scripts. (runs after repo cloning) install: - ps: Install-Product node $env:nodejs_version - - npm i -g npm@^6 + - npm i -g npm@^3 + - npm config set spin false - npm install -g bower - npm install diff --git a/lib/utilities/pristine.js b/lib/utilities/pristine.js index b543ad0..160c66a 100644 --- a/lib/utilities/pristine.js +++ b/lib/utilities/pristine.js @@ -95,7 +95,7 @@ function installPristineApp(appName, options) { hasBowerComponents, skipNpm, emberVersion: options.emberVersion || 'canary', - emberDataVersion: options.emberDataVersion || '^3.8.0' + emberDataVersion: options.emberDataVersion || 'emberjs/data#v3.8.0' }; promise = promise From f5bd028f6bcefe6a2909010bd056a9a8c33f94c6 Mon Sep 17 00:00:00 2001 From: Dave Laird Date: Wed, 10 Apr 2019 08:17:08 -0700 Subject: [PATCH 7/8] use npm 6 in appveyor --- appveyor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 4f81b83..62fd91b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,8 +11,7 @@ init: # Install scripts. (runs after repo cloning) install: - ps: Install-Product node $env:nodejs_version - - npm i -g npm@^3 - - npm config set spin false + - npm i -g npm@^6 - npm install -g bower - npm install From a2899fd2649d858e97c0ac35cbb1366011385213 Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Thu, 11 Apr 2019 13:48:39 -0400 Subject: [PATCH 8/8] Use ember-data@3.8 from NPM, not github. --- lib/utilities/pristine.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/utilities/pristine.js b/lib/utilities/pristine.js index 160c66a..da564b1 100644 --- a/lib/utilities/pristine.js +++ b/lib/utilities/pristine.js @@ -95,7 +95,7 @@ function installPristineApp(appName, options) { hasBowerComponents, skipNpm, emberVersion: options.emberVersion || 'canary', - emberDataVersion: options.emberDataVersion || 'emberjs/data#v3.8.0' + emberDataVersion: options.emberDataVersion || '~3.8.0' }; promise = promise