Skip to content

Commit fdfb39e

Browse files
authored
Merge pull request #821 from ember-learn/upgrades
Upgrade dependencies
2 parents 6d62f83 + a1d43b1 commit fdfb39e

File tree

5 files changed

+3117
-2771
lines changed

5 files changed

+3117
-2771
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@ jobs:
2020
- name: Check out a copy of the repo
2121
uses: actions/checkout@v2
2222

23-
- name: Use Node.js ${{ env.NODE_VERSION }}
24-
uses: actions/setup-node@v2-beta
25-
with:
26-
node-version: ${{ env.NODE_VERSION }}
23+
- name: Use Node.js 14
24+
uses: volta-cli/action@v4
2725

2826
- name: Get Yarn cache path
2927
id: yarn-cache-dir-path
@@ -55,10 +53,8 @@ jobs:
5553
- name: Check out a copy of the repo
5654
uses: actions/checkout@v2
5755

58-
- name: Use Node.js ${{ env.NODE_VERSION }}
59-
uses: actions/setup-node@v2-beta
60-
with:
61-
node-version: ${{ env.NODE_VERSION }}
56+
- name: Use Node.js 14
57+
uses: volta-cli/action@v4
6258

6359
- name: Get Yarn cache path
6460
id: yarn-cache-dir-path
@@ -71,8 +67,8 @@ jobs:
7167
path: |
7268
${{ steps.yarn-cache-dir-path.outputs.dir }}
7369
node_modules
74-
key: ${{ runner.os }}-${{ env.NODE_VERSION }}-${{ hashFiles('**/yarn.lock') }}
75-
restore-keys: ${{ runner.os }}-${{ env.NODE_VERSION }}-
70+
key: ${{ runner.os }}-14-${{ hashFiles('**/yarn.lock') }}
71+
restore-keys: ${{ runner.os }}-14-
7672

7773
- name: Install dependencies
7874
run: yarn install --frozen-lockfile

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ terraform.tfstate.backup
3232
public/json-docs/
3333
public/rev-index/
3434

35-
package-lock.json
36-
3735

3836
browserstack-local.pid
3937
local.log

config/targets.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ if (isCI || isProduction) {
1616

1717
module.exports = {
1818
browsers,
19+
node: 'current',
1920
};

package.json

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@
5555
"ember-cli-deploy-gzip": "^1.0.0",
5656
"ember-cli-deprecation-workflow": "^1.0.1",
5757
"ember-cli-document-title-northm": "^1.0.3",
58-
"ember-cli-fastboot": "^2.0.0",
58+
"ember-cli-fastboot": "^3.3.2",
5959
"ember-cli-htmlbars": "^5.7.1",
6060
"ember-cli-inject-live-reload": "^2.0.2",
6161
"ember-cli-meta-tags": "^5.1.0",
6262
"ember-cli-sass": "^10.0.1",
6363
"ember-cli-shims": "^1.2.0",
6464
"ember-cli-terser": "^4.0.1",
6565
"ember-composable-helpers": "^3.1.1",
66-
"ember-concurrency": "^1.1.6",
66+
"ember-concurrency": "^2.3.7",
6767
"ember-data": "~3.26.0",
6868
"ember-data-fastboot": "https://codeload.github.com/gaurav0/ember-data-fastboot/tar.gz/a681c9f3d3e550cc97520abd88272691170e4094",
6969
"ember-exam": "^1.0.0",
@@ -94,7 +94,7 @@
9494
"eslint-plugin-node": "^11.1.0",
9595
"eslint-plugin-prettier": "^3.3.1",
9696
"express-sslify": "^1.2.0",
97-
"fastboot-app-server": "^2.0.0",
97+
"fastboot-app-server": "^3.3.2",
9898
"lint-to-the-future": "^0.6.1",
9999
"lint-to-the-future-ember-template": "^0.3.5",
100100
"lint-to-the-future-eslint": "^0.2.1",
@@ -112,15 +112,14 @@
112112
"qunit": "^2.16.0",
113113
"qunit-dom": "^1.6.0",
114114
"sanitize-html": "^2.3.2",
115-
"sass": "^1.25.0",
115+
"sass": "^1.54.4",
116116
"semver-compare": "^1.0.0",
117117
"spawndamnit": "2.0.0",
118118
"testem": "^2.14.0"
119119
},
120120
"engines": {
121-
"node": "10.* || 12.* || 14.*",
122-
"npm": "7",
123-
"yarn": "1.22.*"
121+
"node": "14.* || 16.* || 18.*",
122+
"npm": "8"
124123
},
125124
"cacheDirectories": [
126125
"node_modules"
@@ -136,6 +135,6 @@
136135
],
137136
"volta": {
138137
"node": "14.17.0",
139-
"yarn": "1.22.11"
138+
"yarn": "1.22.19"
140139
}
141140
}

0 commit comments

Comments
 (0)