Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 boilerplate/skeleton/extension/js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dependencies": {
},
"devDependencies": {
"@flarum/jest-config": "^1.0.1",
"@flarum/jest-config": "^2.0.0",
"@flarum/prettier-config": "^1.0.0",
"flarum-tsconfig": "^2.0.0",
"flarum-webpack-config": "^3.0.0",
Expand Down
1 change: 0 additions & 1 deletion boilerplate/skeleton/extension/phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ parameters:
- src
excludePaths:
- *.blade.php
checkMissingIterableValueType: false
databaseMigrationsPath: ['migrations']
12 changes: 9 additions & 3 deletions src/steps/upgrade/twopointoh/dependencies.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export default class Dependencies extends BaseUpgradeStep {
});

if (key === 'flarum/core') {
composer.require[key] = '^2.0.0-beta';
composer.require[key] = '^2.0.0';
} else if (key.startsWith('flarum/') && value !== '*') {
composer.require[key] = '*';
}
Expand All @@ -74,16 +74,22 @@ export default class Dependencies extends BaseUpgradeStep {
});

if (['flarum/core', 'flarum/testing', 'flarum/phpstan'].includes(key)) {
composer['require-dev'][key] = '^2.0.0-beta';
composer['require-dev'][key] = '^2.0.0';
} else if (key.startsWith('flarum/') && (value as string).startsWith('^1')) {
composer['require-dev'][key] = '*';
}
}

if (composer.require.php) {
composer.require.php = '^8.2';
composer.require.php = '^8.3';
}

// 2.0 constraints resolve to prereleases while the line is in RC, so the
// extension has to accept them — with stable preferred wherever one
// exists, so only Flarum itself comes from the beta channel.
composer['minimum-stability'] = 'beta';
composer['prefer-stable'] = true;

if (composer.require['fof/extend']) {
composer.require['fof/extend'] = '^2.0.0';
}
Expand Down
Loading