Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ember-try scenario for ember v4 #940

Merged
merged 8 commits into from
Feb 24, 2022
Merged

Add ember-try scenario for ember v4 #940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
aa0cc62
Add ember-try scenario for ember v4
DanMonroe Feb 15, 2022
edcf49b
Add ember-4.0 to ci.yml
DanMonroe Feb 15, 2022
9538831
resolving v4 dependancies
DanMonroe Feb 15, 2022
682aa9f
Reverse dependency resolutions for ember-classy-page-object in ember-try
DanMonroe Feb 16, 2022
38560d6
Use ember-classy-page-object v0.8.0-beta
DanMonroe Feb 23, 2022
4f9498b
Fixed ember-try scenarios 3.24 and below
DanMonroe Feb 23, 2022
7a72d1a
Moved explanation of ember-classy-page-object resolution with <= 3.24
DanMonroe Feb 23, 2022
f5a8449
Re-enabled ember-try release scenario
DanMonroe Feb 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
ember-lts-3.20,
ember-lts-3.24,
ember-lts-3.28,
# ember-release,
ember-release,
# ember-production,
ember-default-docs
]
Expand Down
3 changes: 3 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ For older platforms, the final release of Ember Table 2.x (2.2.3) supports:
```bash
ember install ember-table
```
### Using ember-table with Ember <= 3.24
Use resolutions in your package.json to pin down `ember-classy-page-object` to version `0.7.0`.
Newer versions are used to support Ember >= 3.28

## Features

Expand Down
39 changes: 39 additions & 0 deletions config/ember-try.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ module.exports = function() {
'ember-source': '~2.18.0',
qunit: null,
},
resolutions: {
'ember-classy-page-object': '0.7.0',
},
},
},
{
Expand All @@ -30,6 +33,12 @@ module.exports = function() {
devDependencies: {
'ember-source': '~3.4.0',
},
dependencies: {
'ember-classy-page-object': '0.7.0',
},
resolutions: {
'ember-classy-page-object': '0.7.0',
},
},
},
{
Expand All @@ -38,6 +47,12 @@ module.exports = function() {
devDependencies: {
'ember-source': '~3.8.0',
},
dependencies: {
'ember-classy-page-object': '0.7.0',
},
resolutions: {
'ember-classy-page-object': '0.7.0',
},
},
},
{
Expand All @@ -46,6 +61,12 @@ module.exports = function() {
devDependencies: {
'ember-source': '~3.12.0',
},
dependencies: {
'ember-classy-page-object': '0.7.0',
},
resolutions: {
'ember-classy-page-object': '0.7.0',
},
},
},
{
Expand All @@ -54,6 +75,12 @@ module.exports = function() {
devDependencies: {
'ember-source': '~3.16.0',
},
dependencies: {
'ember-classy-page-object': '0.7.0',
},
resolutions: {
'ember-classy-page-object': '0.7.0',
},
},
},
{
Expand All @@ -62,6 +89,12 @@ module.exports = function() {
devDependencies: {
'ember-source': '~3.20.0',
},
dependencies: {
'ember-classy-page-object': '0.7.0',
},
resolutions: {
'ember-classy-page-object': '0.7.0',
},
},
},
{
Expand All @@ -70,6 +103,12 @@ module.exports = function() {
devDependencies: {
'ember-source': '~3.24.0',
},
dependencies: {
'ember-classy-page-object': '0.7.0',
},
resolutions: {
'ember-classy-page-object': '0.7.0',
},
},
},
{
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@html-next/vertical-collection": "3.0.0-0",
"broccoli-string-replace": "^0.1.2",
"css-element-queries": "^0.4.0",
"ember-classy-page-object": "^0.7.0",
"ember-classy-page-object": "^0.8.0-beta",
"ember-cli-babel": "^7.12.0",
"ember-cli-htmlbars": "^5.0.1",
"ember-cli-node-assets": "^0.2.2",
Expand Down
18 changes: 0 additions & 18 deletions tests/unit/-private/column-tree-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { A as emberA } from '@ember/array';
import { get, set } from '@ember/object';
import { run } from '@ember/runloop';
import ColumnTree from 'ember-table/-private/column-tree';
Expand All @@ -7,22 +6,6 @@ import { module, test } from 'qunit';

let columnMetaCache, tree;

function generateTree(seq) {
let children = emberA();

seq.forEach(item => {
if (Array.isArray(item)) {
let lastNode = children[children.length - 1];

lastNode.children = generateTree(item);
} else {
children.pushObject({ value: item });
}
});

return children;
}

module('Unit | Private | ColumnTree', function(hooks) {
hooks.beforeEach(function() {
columnMetaCache = new MetaCache();
Expand Down Expand Up @@ -50,7 +33,6 @@ module('Unit | Private | ColumnTree', function(hooks) {
tree = ColumnTree.create({
columns,
columnMetaCache,
rows: generateTree([0, [1, [2, 3], 4, [5, 6]]]),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was causing some sort of error, but seems irrelevant to the test, right? A bit of explanation in a comment would be helpful for review.

enableTree: true,
});

Expand Down
91 changes: 57 additions & 34 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,15 @@
jsesc "^2.5.1"
source-map "^0.5.0"

"@babel/generator@^7.17.3":
version "7.17.3"
resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.17.3.tgz#a2c30b0c4f89858cb87050c3ffdfd36bdf443200"
integrity sha512-+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg==
dependencies:
"@babel/types" "^7.17.0"
jsesc "^2.5.1"
source-map "^0.5.0"

"@babel/helper-annotate-as-pure@^7.16.7":
version "7.16.7"
resolved "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
Expand Down Expand Up @@ -376,11 +385,16 @@
resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.16.8.tgz#61c243a3875f7d0b0962b0543a33ece6ff2f1f17"
integrity sha512-i7jDUfrVBWc+7OKcBzEe5n7fbv3i2fWtxKzzCvOjnzSxMfWMigAhtfJ7qzZNGFNMsCCd67+uz553dYKWXPvCKw==

"@babel/parser@^7.17.0", "@babel/parser@^7.4.5":
"@babel/parser@^7.17.0":
version "7.17.0"
resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.17.0.tgz#f0ac33eddbe214e4105363bb17c3341c5ffcc43c"
integrity sha512-VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw==

"@babel/parser@^7.17.3", "@babel/parser@^7.4.5":
version "7.17.3"
resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.17.3.tgz#b07702b982990bf6fdc1da5049a23fece4c5c3d0"
integrity sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA==

"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7":
version "7.16.7"
resolved "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050"
Expand Down Expand Up @@ -1046,7 +1060,7 @@
core-js-compat "^3.20.2"
semver "^6.3.0"

"@babel/preset-env@^7.16.7":
"@babel/preset-env@^7.12.11", "@babel/preset-env@^7.16.7":
version "7.16.11"
resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.11.tgz#5dd88fd885fae36f88fd7c8342475c9f0abe2982"
integrity sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==
Expand Down Expand Up @@ -1176,7 +1190,7 @@
debug "^4.1.0"
globals "^11.1.0"

"@babel/traverse@^7.17.0", "@babel/traverse@^7.4.5":
"@babel/traverse@^7.17.0":
version "7.17.0"
resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.0.tgz#3143e5066796408ccc880a33ecd3184f3e75cd30"
integrity sha512-fpFIXvqD6kC7c7PUNnZ0Z8cQXlarCLtCUpt2S1Dx7PjoRtCFffvOkHHSom+m5HIxMZn5bIBVb71lhabcmjEsqg==
Expand All @@ -1192,6 +1206,22 @@
debug "^4.1.0"
globals "^11.1.0"

"@babel/traverse@^7.4.5":
version "7.17.3"
resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57"
integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==
dependencies:
"@babel/code-frame" "^7.16.7"
"@babel/generator" "^7.17.3"
"@babel/helper-environment-visitor" "^7.16.7"
"@babel/helper-function-name" "^7.16.7"
"@babel/helper-hoist-variables" "^7.16.7"
"@babel/helper-split-export-declaration" "^7.16.7"
"@babel/parser" "^7.17.3"
"@babel/types" "^7.17.0"
debug "^4.1.0"
globals "^11.1.0"

"@babel/types@^7.1.6", "@babel/types@^7.17.0", "@babel/types@^7.7.2":
version "7.17.0"
resolved "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b"
Expand Down Expand Up @@ -1473,6 +1503,11 @@
dependencies:
"@octokit/openapi-types" "^11.2.0"

"@ro0gr/ceibo@^2.2.0":
version "2.2.0"
resolved "https://registry.npmjs.org/@ro0gr/ceibo/-/ceibo-2.2.0.tgz#01c4f3c8e6bfab98136d5863f55ac24e64c74539"
integrity sha512-4gSXPwwr99zUWxnTllN5L4QlfgFDloYKOsenoPvx46LE75x3wvLgGUhxUxhIMxJbqOZ0w9pzrugjQR7St0/PQg==

"@samverschueren/stream-to-observable@^0.3.0":
version "0.3.1"
resolved "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz#a21117b19ee9be70c379ec1877537ef2e1c63301"
Expand Down Expand Up @@ -3531,7 +3566,7 @@ broccoli-funnel-reducer@^1.0.0:
resolved "https://registry.npmjs.org/broccoli-funnel-reducer/-/broccoli-funnel-reducer-1.0.0.tgz#11365b2a785aec9b17972a36df87eef24c5cc0ea"
integrity sha1-ETZbKnha7JsXlyo234fu8kxcwOo=

broccoli-funnel@^1.0.1, broccoli-funnel@^1.1.0:
broccoli-funnel@^1.0.1:
version "1.2.0"
resolved "https://registry.npmjs.org/broccoli-funnel/-/broccoli-funnel-1.2.0.tgz#cddc3afc5ff1685a8023488fff74ce6fb5a51296"
integrity sha1-zdw6/F/xaFqAI0iP/3TOb7WlEpY=
Expand Down Expand Up @@ -4209,11 +4244,6 @@ cardinal@^1.0.0:
ansicolors "~0.2.1"
redeyed "~1.0.0"

ceibo@~2.0.0:
version "2.0.0"
resolved "https://registry.npmjs.org/ceibo/-/ceibo-2.0.0.tgz#9a61eb054a91c09934588d4e45d9dd2c3bf04eee"
integrity sha1-mmHrBUqRwJk0WI1ORdndLDvwTu4=

chalk@3.0.0, chalk@^3.0.0:
version "3.0.0"
resolved "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
Expand Down Expand Up @@ -5315,7 +5345,7 @@ ember-auto-import@^2.0.0:
typescript-memoize "^1.0.0-alpha.3"
walk-sync "^0.3.3"

ember-auto-import@^2.2.4:
ember-auto-import@^2.2.4, ember-auto-import@^2.4.0:
version "2.4.0"
resolved "https://registry.npmjs.org/ember-auto-import/-/ember-auto-import-2.4.0.tgz#91c4797f08315728086e35af954cb60bd23c14bc"
integrity sha512-BwF6iTaoSmT2vJ9NEHEGRBCh2+qp+Nlaz/Q7roqNSxl5oL5iMRwenPnHhOoBPTYZvPhcV/KgXR5e+pBQ107plQ==
Expand Down Expand Up @@ -5351,21 +5381,21 @@ ember-auto-import@^2.2.4:
typescript-memoize "^1.0.0-alpha.3"
walk-sync "^3.0.0"

ember-classy-page-object@^0.7.0:
version "0.7.0"
resolved "https://registry.npmjs.org/ember-classy-page-object/-/ember-classy-page-object-0.7.0.tgz#6da6700ba94090a9e6da70e6754ce55c555f40c9"
integrity sha512-J/2nkhi6PtZ3CQ1B9MwQM+FcvbdqWNaFVldMskBFCTKjCjoWNvsSzSjKgGKdOI51R71zaETYMwbJ3i/LJRx6yQ==
ember-classy-page-object@^0.8.0-beta:
version "0.8.0-beta"
resolved "https://registry.npmjs.org/ember-classy-page-object/-/ember-classy-page-object-0.8.0-beta.tgz#1e388e90e5205c617f48450fae764c6f90c38217"
integrity sha512-jO6t7KJWnSSBy/gbOtO0lXEnh/7tm/tNJB0KC6ZZOT9ich67rY46N+6Ras5uqeU0rPdyuiPBeKYSCxtEdcsacQ==
dependencies:
broccoli-funnel "^2.0.1"
ember-cli-babel "^7.12.0"
ember-cli-page-object "^1.17.6"
ember-cli-page-object "~v2.0.0-beta.3"

ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.1:
version "1.1.1"
resolved "https://registry.npmjs.org/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==

ember-cli-babel@^6.11.0, ember-cli-babel@^6.16.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.2, ember-cli-babel@^6.9.2:
ember-cli-babel@^6.11.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.2, ember-cli-babel@^6.9.2:
version "6.18.0"
resolved "https://registry.npmjs.org/ember-cli-babel/-/ember-cli-babel-6.18.0.tgz#3f6435fd275172edeff2b634ee7b29ce74318957"
integrity sha512-7ceC8joNYxY2wES16iIBlbPSxwKDBhYwC8drU3ZEvuPDMwVv1KzxCNu1fvxyFEBWhwaRNTUxSCsEVoTd9nosGA==
Expand All @@ -5384,7 +5414,7 @@ ember-cli-babel@^6.11.0, ember-cli-babel@^6.16.0, ember-cli-babel@^6.6.0, ember-
ember-cli-version-checker "^2.1.2"
semver "^5.5.0"

ember-cli-babel@^7.0.0, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.20.5, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.26.4, ember-cli-babel@^7.26.6, ember-cli-babel@^7.26.8, ember-cli-babel@^7.7.3:
ember-cli-babel@^7.0.0, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.20.5, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.24.0, ember-cli-babel@^7.26.4, ember-cli-babel@^7.26.6, ember-cli-babel@^7.26.8, ember-cli-babel@^7.7.3:
version "7.26.11"
resolved "https://registry.npmjs.org/ember-cli-babel/-/ember-cli-babel-7.26.11.tgz#50da0fe4dcd99aada499843940fec75076249a9f"
integrity sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA==
Expand Down Expand Up @@ -5583,17 +5613,18 @@ ember-cli-normalize-entity-name@^1.0.0:
dependencies:
silent-error "^1.0.0"

ember-cli-page-object@^1.17.6:
version "1.17.9"
resolved "https://registry.npmjs.org/ember-cli-page-object/-/ember-cli-page-object-1.17.9.tgz#d5d730661755083987db599732d24145b9f25521"
integrity sha512-c2pMCuPRM0x/eO8Ot3NDesebdJGlNPwwOWAtXsXH339j/TDeh2DIz2sGJNnmZkFqEsdTqgVq2rkmGzmd7i1xeg==
ember-cli-page-object@~v2.0.0-beta.3:
version "2.0.0-beta.3"
resolved "https://registry.npmjs.org/ember-cli-page-object/-/ember-cli-page-object-2.0.0-beta.3.tgz#49ecc2239f061d801ad208d6a933db1d3906c088"
integrity sha512-swUbl4HnHEK3H6s+ivhEN+RBNgznIxHt3AHT4qQqSIQFrUdEck/s1/Z5lDl1rPOxuWvz5nnKt+W4GOu27muTMA==
dependencies:
"@babel/preset-env" "^7.12.11"
"@ro0gr/ceibo" "^2.2.0"
broccoli-file-creator "^2.1.1"
broccoli-merge-trees "^2.0.0"
ceibo "~2.0.0"
ember-cli-babel "^6.16.0"
ember-cli-node-assets "^0.2.2"
ember-native-dom-helpers "^0.7.0"
ember-auto-import "^2.4.0"
ember-cli-babel "^7.24.0"
ember-cli-typescript "^4.1.0"
jquery "^3.4.1"
rsvp "^4.7.0"

Expand Down Expand Up @@ -5666,7 +5697,7 @@ ember-cli-typescript@^2.0.2:
stagehand "^1.0.0"
walk-sync "^1.0.0"

ember-cli-typescript@^4.2.1:
ember-cli-typescript@^4.1.0, ember-cli-typescript@^4.2.1:
version "4.2.1"
resolved "https://registry.npmjs.org/ember-cli-typescript/-/ember-cli-typescript-4.2.1.tgz#54d08fc90318cc986f3ea562f93ce58a6cc4c24d"
integrity sha512-0iKTZ+/wH6UB/VTWKvGuXlmwiE8HSIGcxHamwNhEC5x1mN3z8RfvsFZdQWYUzIWFN2Tek0gmepGRPTwWdBYl/A==
Expand Down Expand Up @@ -5898,14 +5929,6 @@ ember-math-helpers@~2.11.3:
ember-cli-babel "^7.7.3"
ember-cli-htmlbars "^3.0.1"

ember-native-dom-helpers@^0.7.0:
version "0.7.0"
resolved "https://registry.npmjs.org/ember-native-dom-helpers/-/ember-native-dom-helpers-0.7.0.tgz#98a87c11a391cec5c12382a4857e59ea2fb4b00a"
integrity sha512-ySJRGRhwYIWUAZKilB8xEcIatP9wKfEBX6JFG8bG4Ck7GvA0eau265hTGZz/+ntZuwcY4HrzSNkwimlHx4cM/A==
dependencies:
broccoli-funnel "^1.1.0"
ember-cli-babel "^6.6.0"

ember-qunit@^5.0.0:
version "5.1.5"
resolved "https://registry.npmjs.org/ember-qunit/-/ember-qunit-5.1.5.tgz#24a7850f052be24189ff597dfc31b923e684c444"
Expand Down