Skip to content

Commit 619c772

Browse files
authored
Merge pull request #969 from bertdeblock/update-dev-deps
2 parents 433e7c9 + 1a1a55a commit 619c772

23 files changed

Lines changed: 3609 additions & 2979 deletions

.github/workflows/ci.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ jobs:
1818
runs-on: ubuntu-latest
1919

2020
steps:
21-
- uses: actions/checkout@v3
22-
- uses: actions/setup-node@v3
21+
- uses: actions/checkout@v4
22+
- uses: actions/setup-node@v4
2323
with:
2424
node-version: 18
2525

@@ -31,17 +31,17 @@ jobs:
3131
timeout-minutes: 10
3232

3333
steps:
34-
- uses: actions/checkout@v3
34+
- uses: actions/checkout@v4
3535
- name: Install Node
36-
uses: actions/setup-node@v3
36+
uses: actions/setup-node@v4
3737
with:
3838
node-version: 18
3939
cache: yarn
4040
- name: Install Dependencies
4141
run: yarn install --frozen-lockfile
4242
- name: Run Tests
4343
run: yarn node-test-with-coverage
44-
- uses: codecov/codecov-action@v4
44+
- uses: codecov/codecov-action@v5
4545
with:
4646
fail_ci_if_error: true
4747
token: ${{ secrets.CODECOV_TOKEN }}
@@ -53,8 +53,8 @@ jobs:
5353
timeout-minutes: 10
5454

5555
steps:
56-
- uses: actions/checkout@v3
57-
- uses: actions/setup-node@v3
56+
- uses: actions/checkout@v4
57+
- uses: actions/setup-node@v4
5858
with:
5959
node-version: 18
6060
cache: yarn
@@ -137,8 +137,8 @@ jobs:
137137
- ./node_modules/.bin/ember try:each --config-path='../test/fixtures/dummy-ember-try-config-fs-extra-scenarios.js'
138138

139139
steps:
140-
- uses: actions/checkout@v3
141-
- uses: actions/setup-node@v3
140+
- uses: actions/checkout@v4
141+
- uses: actions/setup-node@v4
142142
with:
143143
node-version: 18
144144

@@ -157,7 +157,7 @@ jobs:
157157
strategy:
158158
fail-fast: false
159159
matrix:
160-
node: [18, 20, 21]
160+
node: [18, 20, 22]
161161

162162
name: Smoke Tests (Node v${{ matrix.node }} with npm)
163163
runs-on: ubuntu-latest
@@ -168,8 +168,8 @@ jobs:
168168
- test
169169

170170
steps:
171-
- uses: actions/checkout@v3
172-
- uses: actions/setup-node@v3
171+
- uses: actions/checkout@v4
172+
- uses: actions/setup-node@v4
173173
with:
174174
node-version: ${{ matrix.node }}
175175

@@ -185,7 +185,7 @@ jobs:
185185
strategy:
186186
fail-fast: false
187187
matrix:
188-
node: [18, 20, 21]
188+
node: [18, 20, 22]
189189

190190
name: Smoke Tests (Node v${{ matrix.node }} with yarn)
191191
runs-on: ubuntu-latest
@@ -196,8 +196,8 @@ jobs:
196196
- test
197197

198198
steps:
199-
- uses: actions/checkout@v3
200-
- uses: actions/setup-node@v3
199+
- uses: actions/checkout@v4
200+
- uses: actions/setup-node@v4
201201
with:
202202
node-version: ${{ matrix.node }}
203203

@@ -219,8 +219,8 @@ jobs:
219219
- test
220220

221221
steps:
222-
- uses: actions/checkout@v3
223-
- uses: actions/setup-node@v3
222+
- uses: actions/checkout@v4
223+
- uses: actions/setup-node@v4
224224
with:
225225
node-version: 18
226226

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@v1
15-
- uses: actions/setup-node@v1
14+
- uses: actions/checkout@v4
15+
- uses: actions/setup-node@v4
1616
with:
1717
registry-url: 'https://registry.npmjs.org'
1818
node-version: 18

lib/commands/try-one.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ module.exports = {
5353
let scenario = findByName(config.scenarios, scenarioName);
5454
if (!scenario) {
5555
throw new Error(
56-
'The `ember try:one` command requires a scenario ' + 'specified in the config.'
56+
'The `ember try:one` command requires a scenario ' + 'specified in the config.',
5757
);
5858
}
5959

lib/dependency-manager-adapters/npm.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ module.exports = CoreObject.extend({
6464
if (fs.statSync(path.join(this.cwd, this.yarnLock)).isFile()) {
6565
ui.writeLine(
6666
chalk.yellow(
67-
'Detected a yarn.lock file. Add `useYarn: true` to your `config/ember-try.js` configuration file if you want to use Yarn to install npm dependencies.'
68-
)
67+
'Detected a yarn.lock file. Add `useYarn: true` to your `config/ember-try.js` configuration file if you want to use Yarn to install npm dependencies.',
68+
),
6969
);
7070
}
7171
} catch (e) {

lib/dependency-manager-adapters/pnpm.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ module.exports = CoreObject.extend({
7979

8080
if (this._isResolutionModeWrong(version, resolutionMode)) {
8181
throw new Error(
82-
'You are using an old version of pnpm that uses wrong resolution mode that violates ember-try expectations. Please either upgrade pnpm or set `resolution-mode` to `highest` in `.npmrc`.'
82+
'You are using an old version of pnpm that uses wrong resolution mode that violates ember-try expectations. Please either upgrade pnpm or set `resolution-mode` to `highest` in `.npmrc`.',
8383
);
8484
}
8585
},

lib/dependency-manager-adapters/workspace.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ module.exports = CoreObject.extend({
1515

1616
if (!this.useYarnCommand) {
1717
throw new Error(
18-
'workspaces are currently only supported by Yarn, you must set `useYarn` to true'
18+
'workspaces are currently only supported by Yarn, you must set `useYarn` to true',
1919
);
2020
}
2121
let packageJSON = JSON.parse(fs.readFileSync(this.packageJSON));
@@ -31,7 +31,7 @@ module.exports = CoreObject.extend({
3131

3232
if (!workspaceGlobs || !workspaceGlobs.length) {
3333
throw new Error(
34-
'you must define the `workspaces` property in package.json with at least one workspace to use workspaces with ember-try'
34+
'you must define the `workspaces` property in package.json with at least one workspace to use workspaces with ember-try',
3535
);
3636
}
3737

lib/tasks/reset.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module.exports = CoreObject.extend({
1414
'DependencyManagerAdapters: %s',
1515
dependencyAdapters.map((item) => {
1616
return item.configKey;
17-
})
17+
}),
1818
);
1919
return new ScenarioManager({ dependencyManagerAdapters: dependencyAdapters }).cleanup();
2020
},

lib/tasks/try-each.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ module.exports = CoreObject.extend({
1919
'DependencyManagerAdapters: %s',
2020
dependencyManagerAdapters.map((item) => {
2121
return item.configKey;
22-
})
22+
}),
2323
);
2424
this.ScenarioManager = new ScenarioManager({
2525
ui: this.ui,

lib/utils/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ async function getBaseConfig(options) {
5454
return await mergeAutoConfigAndConfigFileData(autoConfig, data);
5555
} else {
5656
throw new Error(
57-
'No ember-try configuration found. Please see the README for configuration options'
57+
'No ember-try configuration found. Please see the README for configuration options',
5858
);
5959
}
6060
}

lib/utils/dependency-manager-adapter-factory.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ module.exports = {
3333
managerOptions: config.npmOptions,
3434
useYarnCommand: config.useYarn,
3535
buildManagerOptions: config.buildManagerOptions,
36-
})
36+
}),
3737
);
3838
} else if (config.usePnpm) {
3939
adapters.push(
4040
new PnpmAdapter({
4141
cwd: root,
4242
managerOptions: config.npmOptions,
4343
buildManagerOptions: config.buildManagerOptions,
44-
})
44+
}),
4545
);
4646
} else if (hasNpm) {
4747
adapters.push(
@@ -50,7 +50,7 @@ module.exports = {
5050
managerOptions: config.npmOptions,
5151
useYarnCommand: config.useYarn,
5252
buildManagerOptions: config.buildManagerOptions,
53-
})
53+
}),
5454
);
5555
}
5656

0 commit comments

Comments
 (0)