diff --git a/boilerplate/skeleton/extension/js/package.json b/boilerplate/skeleton/extension/js/package.json index 2005fa4..0136bc0 100644 --- a/boilerplate/skeleton/extension/js/package.json +++ b/boilerplate/skeleton/extension/js/package.json @@ -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", diff --git a/boilerplate/skeleton/extension/phpstan.neon b/boilerplate/skeleton/extension/phpstan.neon index c324402..ec3c9d5 100644 --- a/boilerplate/skeleton/extension/phpstan.neon +++ b/boilerplate/skeleton/extension/phpstan.neon @@ -8,5 +8,4 @@ parameters: - src excludePaths: - *.blade.php - checkMissingIterableValueType: false databaseMigrationsPath: ['migrations'] diff --git a/src/steps/upgrade/twopointoh/dependencies.ts b/src/steps/upgrade/twopointoh/dependencies.ts index 6c5591a..397f514 100644 --- a/src/steps/upgrade/twopointoh/dependencies.ts +++ b/src/steps/upgrade/twopointoh/dependencies.ts @@ -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] = '*'; } @@ -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'; }