Skip to content

Commit

Permalink
Use new VC and ember-table betas (emberjs#1829)
Browse files Browse the repository at this point in the history
* Use new VC and ember-table betas

* Bump to node 14

* Force ember-test-selectors 6
  • Loading branch information
RobbieTheWagner authored and patricklx committed Sep 19, 2022
1 parent 6c2e2d1 commit b7ec739
Show file tree
Hide file tree
Showing 3 changed files with 1,153 additions and 127 deletions.
10 changes: 0 additions & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ jobs:
echo "GIT_BRANCH=${GIT_BRANCH}" >> $GITHUB_ENV
- name: Set up Volta
uses: volta-cli/action@v1
with:
node-version: 12.x
- name: Install dependencies (yarn)
run: yarn install
- name: Lint (hbs)
Expand Down Expand Up @@ -99,8 +97,6 @@ jobs:
uses: actions/checkout@v1
- name: Set up Volta
uses: volta-cli/action@v1
with:
node-version: 12.x
- name: Install dependencies (yarn)
run: yarn install
- name: Set NO_EXTEND_PROTOTYPES
Expand All @@ -125,8 +121,6 @@ jobs:
uses: actions/checkout@v1
- name: Set up Volta
uses: volta-cli/action@v1
with:
node-version: 12.x
- name: Install dependencies (yarn)
run: yarn install
- name: Download panes
Expand Down Expand Up @@ -296,8 +290,6 @@ jobs:
steps:
- name: Set up Volta
uses: volta-cli/action@v1
with:
node-version: 12.x
- name: Install dependencies (web-ext)
run: |
volta install web-ext
Expand Down Expand Up @@ -328,8 +320,6 @@ jobs:
steps:
- name: Set up Volta
uses: volta-cli/action@v1
with:
node-version: 12.x
- name: Set up NPM
run: |
echo "//registry.npmjs.org/:_authToken=${NPM_AUTH_TOKEN}"> ~/.npmrc
Expand Down
15 changes: 8 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@ember/test-helpers": "^2.5.0",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"@html-next/vertical-collection": "html-next/vertical-collection#79e7b1aa31b3e292db06df79d845cb5a6a0c1b40",
"@html-next/vertical-collection": "3.0.0-0",
"amd-name-resolver": "^1.3.1",
"aws-sdk": "^2.978.0",
"babel-eslint": "^10.1.0",
Expand Down Expand Up @@ -86,11 +86,11 @@
"ember-source": "~3.28.0",
"ember-source-channel-url": "^3.0.0",
"ember-svg-jar": "^2.3.3",
"ember-table": "rwwagner90/ember-table#42607a07cad1c247f6e6d1617d33119d325cbce5",
"ember-table": "4.0.0-beta.0",
"ember-template-lint": "^3.6.0",
"ember-test-selectors": "^6.0.0",
"ember-truth-helpers": "^3.0.0",
"ember-try": "^2.0.0",
"ember-try": "^1.4.0",
"ensure-posix-path": "^1.1.1",
"eslint": "^8.2.0",
"eslint-config-prettier": "^8.3.0",
Expand Down Expand Up @@ -119,10 +119,11 @@
"yauzl": "^2.10.0"
},
"resolutions": {
"**/ember-auto-import": "^2.2.4"
"**/ember-auto-import": "^2.2.4",
"**/ember-test-selectors": "^6.0.0"
},
"engines": {
"node": "12.* || 14.* || >= 16"
"node": "14.* || >= 16"
},
"publishConfig": {
"registry": "https://registry.npmjs.org"
Expand Down Expand Up @@ -162,7 +163,7 @@
}
},
"volta": {
"node": "12.22.5",
"node": "14.18.1",
"yarn": "1.22.11"
}
}
}
Loading

0 comments on commit b7ec739

Please sign in to comment.