Skip to content

Commit

Permalink
Merge pull request #969 from bertdeblock/update-dev-deps
Browse files Browse the repository at this point in the history
  • Loading branch information
kategengler authored Dec 6, 2024
2 parents 433e7c9 + 1a1a55a commit 619c772
Show file tree
Hide file tree
Showing 23 changed files with 3,609 additions and 2,979 deletions.
34 changes: 17 additions & 17 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 18

Expand All @@ -31,17 +31,17 @@ jobs:
timeout-minutes: 10

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
cache: yarn
- name: Install Dependencies
run: yarn install --frozen-lockfile
- name: Run Tests
run: yarn node-test-with-coverage
- uses: codecov/codecov-action@v4
- uses: codecov/codecov-action@v5
with:
fail_ci_if_error: true
token: ${{ secrets.CODECOV_TOKEN }}
Expand All @@ -53,8 +53,8 @@ jobs:
timeout-minutes: 10

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 18
cache: yarn
Expand Down Expand Up @@ -137,8 +137,8 @@ jobs:
- ./node_modules/.bin/ember try:each --config-path='../test/fixtures/dummy-ember-try-config-fs-extra-scenarios.js'

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 18

Expand All @@ -157,7 +157,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [18, 20, 21]
node: [18, 20, 22]

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

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}

Expand All @@ -185,7 +185,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [18, 20, 21]
node: [18, 20, 22]

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

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}

Expand All @@ -219,8 +219,8 @@ jobs:
- test

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 18

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
registry-url: 'https://registry.npmjs.org'
node-version: 18
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/try-one.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ module.exports = {
let scenario = findByName(config.scenarios, scenarioName);
if (!scenario) {
throw new Error(
'The `ember try:one` command requires a scenario ' + 'specified in the config.'
'The `ember try:one` command requires a scenario ' + 'specified in the config.',
);
}

Expand Down
4 changes: 2 additions & 2 deletions lib/dependency-manager-adapters/npm.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ module.exports = CoreObject.extend({
if (fs.statSync(path.join(this.cwd, this.yarnLock)).isFile()) {
ui.writeLine(
chalk.yellow(
'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.'
)
'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.',
),
);
}
} catch (e) {
Expand Down
2 changes: 1 addition & 1 deletion lib/dependency-manager-adapters/pnpm.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ module.exports = CoreObject.extend({

if (this._isResolutionModeWrong(version, resolutionMode)) {
throw new Error(
'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`.'
'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`.',
);
}
},
Expand Down
4 changes: 2 additions & 2 deletions lib/dependency-manager-adapters/workspace.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module.exports = CoreObject.extend({

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

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

Expand Down
2 changes: 1 addition & 1 deletion lib/tasks/reset.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module.exports = CoreObject.extend({
'DependencyManagerAdapters: %s',
dependencyAdapters.map((item) => {
return item.configKey;
})
}),
);
return new ScenarioManager({ dependencyManagerAdapters: dependencyAdapters }).cleanup();
},
Expand Down
2 changes: 1 addition & 1 deletion lib/tasks/try-each.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ module.exports = CoreObject.extend({
'DependencyManagerAdapters: %s',
dependencyManagerAdapters.map((item) => {
return item.configKey;
})
}),
);
this.ScenarioManager = new ScenarioManager({
ui: this.ui,
Expand Down
2 changes: 1 addition & 1 deletion lib/utils/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ async function getBaseConfig(options) {
return await mergeAutoConfigAndConfigFileData(autoConfig, data);
} else {
throw new Error(
'No ember-try configuration found. Please see the README for configuration options'
'No ember-try configuration found. Please see the README for configuration options',
);
}
}
Expand Down
6 changes: 3 additions & 3 deletions lib/utils/dependency-manager-adapter-factory.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ module.exports = {
managerOptions: config.npmOptions,
useYarnCommand: config.useYarn,
buildManagerOptions: config.buildManagerOptions,
})
}),
);
} else if (config.usePnpm) {
adapters.push(
new PnpmAdapter({
cwd: root,
managerOptions: config.npmOptions,
buildManagerOptions: config.buildManagerOptions,
})
}),
);
} else if (hasNpm) {
adapters.push(
Expand All @@ -50,7 +50,7 @@ module.exports = {
managerOptions: config.npmOptions,
useYarnCommand: config.useYarn,
buildManagerOptions: config.buildManagerOptions,
})
}),
);
}

Expand Down
2 changes: 1 addition & 1 deletion lib/utils/scenario-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module.exports = CoreObject.extend({
for (let depManager of this.dependencyManagerAdapters) {
if (scenario[depManager.configKey]) {
let depManagerResults = await depManager.changeToDependencySet(
scenario[depManager.configKey]
scenario[depManager.configKey],
);
results.push(...depManagerResults);
}
Expand Down
26 changes: 12 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,24 +43,22 @@
"walk-sync": "^2.2.0"
},
"devDependencies": {
"chai": "^4.3.4",
"@release-it-plugins/lerna-changelog": "^7.0.0",
"chai": "^4.4.1",
"chai-as-promised": "^7.1.1",
"codecov": "^3.8.3",
"ember-cli": "~3.22.0",
"eslint": "^7.31.0",
"eslint-config-prettier": "^6.15.0",
"ember-cli": "~5.12.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.1.4",
"glob": "^7.2.0",
"json": "^10.0.0",
"mocha": "^8.2.1",
"eslint-plugin-prettier": "^5.2.1",
"mocha": "^10.8.2",
"mockery": "^2.1.0",
"nyc": "^15.1.0",
"prettier": "^2.4.1",
"release-it": "^14.11.6",
"release-it-lerna-changelog": "^3.1.0",
"nyc": "^17.1.0",
"prettier": "^3.3.3",
"release-it": "^17.10.0",
"rsvp": "^4.7.0",
"sinon": "^15.2.0",
"sinon": "^19.0.2",
"tmp-sync": "^1.1.0"
},
"engines": {
Expand All @@ -74,7 +72,7 @@
},
"release-it": {
"plugins": {
"release-it-lerna-changelog": {
"@release-it-plugins/lerna-changelog": {
"infile": "CHANGELOG.md",
"launchEditor": true
}
Expand Down
2 changes: 1 addition & 1 deletion test/commands/try-one-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ async function testCommandSetsTheseAsCommandArgs(command, expectedArgs) {
TryOneCommand._commandLineArguments = function () {
return [].concat(
['/usr/local/Cellar/node/5.3.0/bin/node', '/usr/local/bin/ember'],
additionalArgs
additionalArgs,
);
};

Expand Down
14 changes: 7 additions & 7 deletions test/dependency-manager-adapters/npm-adapter-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ describe('npmAdapter', () => {
},
},
],
{ allowPassthrough: false }
{ allowPassthrough: false },
);

let adapter = new NpmAdapter({
Expand All @@ -90,7 +90,7 @@ describe('npmAdapter', () => {
},
},
],
{ allowPassthrough: false }
{ allowPassthrough: false },
);

let adapter = new NpmAdapter({
Expand All @@ -116,7 +116,7 @@ describe('npmAdapter', () => {
},
},
],
{ allowPassthrough: false }
{ allowPassthrough: false },
);

let adapter = new NpmAdapter({
Expand Down Expand Up @@ -166,7 +166,7 @@ describe('npmAdapter', () => {
},
},
],
{ allowPassthrough: false }
{ allowPassthrough: false },
);

let adapter = new NpmAdapter({
Expand All @@ -192,7 +192,7 @@ describe('npmAdapter', () => {
},
},
],
{ allowPassthrough: false }
{ allowPassthrough: false },
);

let adapter = new NpmAdapter({
Expand All @@ -219,7 +219,7 @@ describe('npmAdapter', () => {
},
},
],
{ allowPassthrough: false }
{ allowPassthrough: false },
);

let adapter = new NpmAdapter({
Expand Down Expand Up @@ -297,7 +297,7 @@ describe('npmAdapter', () => {
},
},
],
{ allowPassthrough: false }
{ allowPassthrough: false },
);

let adapter = new NpmAdapter({
Expand Down
Loading

0 comments on commit 619c772

Please sign in to comment.