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
24 changes: 20 additions & 4 deletions public/assets/JavaScript/composerHelper.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,26 @@ const bundlePackages = function(allComposerPackages) {
if (!e.target.matches('.js-composer-helper-toggle-packages')) return;
const packages = JSON.parse(e.target.dataset.packages);
uncheckAll(allComposerPackages);
Object.keys(packages).forEach(index => {
const input = document.querySelectorAll('input[name="form[' + packages[index] + ']"]')[0];
input.checked = true;
input.parentElement.classList.add('active');

const versionSelect = document.querySelector('[data-composer-helper-version="true"]');
let majorVersion = null;
if (versionSelect && versionSelect.value) {
const match = versionSelect.value.match(/^\^(\d+)/);
if (match) {
majorVersion = parseInt(match[1], 10);
}
}

Object.keys(packages).forEach(packageName => {
const versions = packages[packageName];
if (Array.isArray(versions) && majorVersion !== null && !versions.includes(majorVersion)) {
return;
}
const input = document.querySelectorAll('input[name="form[' + packageName + ']"]')[0];
if (input) {
input.checked = true;
input.parentElement.classList.add('active');
}
});
});
};
Expand Down
206 changes: 106 additions & 100 deletions src/Service/ComposerPackagesService.php
Original file line number Diff line number Diff line change
Expand Up @@ -664,110 +664,113 @@ final class ComposerPackagesService
];

/**
* @var array<string, array<string>>
* Maps bundle names to their packages. Values are either true (always included)
* or an array of major version integers (only included for those versions).
*
* @var array<string, array<string, true|int[]>>
*/
private const BUNDLES = [
'typo3/full' => [
'typo3/cms-about',
'typo3/cms-adminpanel',
'typo3/cms-backend',
'typo3/cms-belog',
'typo3/cms-beuser',
'typo3/cms-context-help',
'typo3/cms-core',
'typo3/cms-cshmanual',
'typo3/cms-css-styled-content',
'typo3/cms-documentation',
'typo3/cms-dashboard',
'typo3/cms-extbase',
'typo3/cms-extensionmanager',
'typo3/cms-feedit',
'typo3/cms-felogin',
'typo3/cms-filelist',
'typo3/cms-filemetadata',
'typo3/cms-fluid',
'typo3/cms-fluid-styled-content',
'typo3/cms-form',
'typo3/cms-frontend',
'typo3/cms-func',
'typo3/cms-impexp',
'typo3/cms-indexed-search',
'typo3/cms-info',
'typo3/cms-info-pagetsconfig',
'typo3/cms-install',
'typo3/cms-lang',
'typo3/cms-linkvalidator',
'typo3/cms-lowlevel',
'typo3/cms-opendocs',
'typo3/cms-reactions',
'typo3/cms-recordlist',
'typo3/cms-recycler',
'typo3/cms-redirects',
'typo3/cms-reports',
'typo3/cms-rsaauth',
'typo3/cms-rte-ckeditor',
'typo3/cms-saltedpasswords',
'typo3/cms-scheduler',
'typo3/cms-seo',
'typo3/cms-setup',
'typo3/cms-sv',
'typo3/cms-sys-action',
'typo3/cms-sys-note',
'typo3/cms-t3editor',
'typo3/cms-taskcenter',
'typo3/cms-tstemplate',
'typo3/cms-version',
'typo3/cms-viewpage',
'typo3/cms-webhooks',
'typo3/cms-wizard-crpages',
'typo3/cms-wizard-sortpages',
'typo3/cms-workspaces',
'typo3/minimal',
'typo3/theme-camino',
'typo3/cms-about' => true,
'typo3/cms-adminpanel' => true,
'typo3/cms-backend' => true,
'typo3/cms-belog' => true,
'typo3/cms-beuser' => true,
'typo3/cms-context-help' => true,
'typo3/cms-core' => true,
'typo3/cms-cshmanual' => true,
'typo3/cms-css-styled-content' => true,
'typo3/cms-documentation' => true,
'typo3/cms-dashboard' => true,
'typo3/cms-extbase' => true,
'typo3/cms-extensionmanager' => true,
'typo3/cms-feedit' => true,
'typo3/cms-felogin' => true,
'typo3/cms-filelist' => true,
'typo3/cms-filemetadata' => true,
'typo3/cms-fluid' => true,
'typo3/cms-fluid-styled-content' => true,
'typo3/cms-form' => true,
'typo3/cms-frontend' => true,
'typo3/cms-func' => true,
'typo3/cms-impexp' => true,
'typo3/cms-indexed-search' => true,
'typo3/cms-info' => true,
'typo3/cms-info-pagetsconfig' => true,
'typo3/cms-install' => true,
'typo3/cms-lang' => true,
'typo3/cms-linkvalidator' => true,
'typo3/cms-lowlevel' => true,
'typo3/cms-opendocs' => true,
'typo3/cms-reactions' => true,
'typo3/cms-recordlist' => true,
'typo3/cms-recycler' => true,
'typo3/cms-redirects' => true,
'typo3/cms-reports' => true,
'typo3/cms-rsaauth' => true,
'typo3/cms-rte-ckeditor' => true,
'typo3/cms-saltedpasswords' => true,
'typo3/cms-scheduler' => true,
'typo3/cms-seo' => true,
'typo3/cms-setup' => true,
'typo3/cms-sv' => true,
'typo3/cms-sys-action' => true,
'typo3/cms-sys-note' => true,
'typo3/cms-t3editor' => true,
'typo3/cms-taskcenter' => true,
'typo3/cms-tstemplate' => true,
'typo3/cms-version' => true,
'typo3/cms-viewpage' => true,
'typo3/cms-webhooks' => true,
'typo3/cms-wizard-crpages' => true,
'typo3/cms-wizard-sortpages' => true,
'typo3/cms-workspaces' => true,
'typo3/minimal' => true,
'typo3/theme-camino' => true,
],
'typo3/minimal' => [
'typo3/cms-backend',
'typo3/cms-core',
'typo3/cms-extbase',
'typo3/cms-extensionmanager',
'typo3/cms-filelist',
'typo3/cms-fluid',
'typo3/cms-frontend',
'typo3/cms-install',
'typo3/cms-recordlist',
'typo3/minimal',
'typo3/cms-backend' => true,
'typo3/cms-core' => true,
'typo3/cms-extbase' => true,
'typo3/cms-extensionmanager' => [8, 9, 10, 11, 12],
'typo3/cms-filelist' => true,
'typo3/cms-fluid' => true,
'typo3/cms-frontend' => true,
'typo3/cms-install' => [8, 9, 10, 11, 12],
'typo3/cms-recordlist' => true,
'typo3/minimal' => true,
],
'typo3/default' => [
'typo3/cms-about',
'typo3/cms-adminpanel',
'typo3/cms-backend',
'typo3/cms-belog',
'typo3/cms-beuser',
'typo3/cms-core',
'typo3/cms-dashboard',
'typo3/cms-extbase',
'typo3/cms-extensionmanager',
'typo3/cms-filelist',
'typo3/cms-fluid',
'typo3/cms-fluid-styled-content',
'typo3/cms-form',
'typo3/cms-frontend',
'typo3/cms-impexp',
'typo3/cms-info',
'typo3/cms-install',
'typo3/cms-lowlevel',
'typo3/cms-opendocs',
'typo3/cms-recordlist',
'typo3/cms-recycler',
'typo3/cms-redirects',
'typo3/cms-reports',
'typo3/cms-rte-ckeditor',
'typo3/cms-scheduler',
'typo3/cms-seo',
'typo3/cms-setup',
'typo3/cms-tstemplate',
'typo3/cms-viewpage',
'typo3/minimal',
'typo3/cms-about' => true,
'typo3/cms-adminpanel' => true,
'typo3/cms-backend' => true,
'typo3/cms-belog' => true,
'typo3/cms-beuser' => true,
'typo3/cms-core' => true,
'typo3/cms-dashboard' => true,
'typo3/cms-extbase' => true,
'typo3/cms-extensionmanager' => true,
'typo3/cms-filelist' => true,
'typo3/cms-fluid' => true,
'typo3/cms-fluid-styled-content' => true,
'typo3/cms-form' => true,
'typo3/cms-frontend' => true,
'typo3/cms-impexp' => true,
'typo3/cms-info' => true,
'typo3/cms-install' => true,
'typo3/cms-lowlevel' => true,
'typo3/cms-opendocs' => true,
'typo3/cms-recordlist' => true,
'typo3/cms-recycler' => true,
'typo3/cms-redirects' => true,
'typo3/cms-reports' => true,
'typo3/cms-rte-ckeditor' => true,
'typo3/cms-scheduler' => true,
'typo3/cms-seo' => true,
'typo3/cms-setup' => true,
'typo3/cms-tstemplate' => true,
'typo3/cms-viewpage' => true,
'typo3/minimal' => true,
],
];

Expand Down Expand Up @@ -883,9 +886,12 @@ public function getBundles(): array
{
$sanitizedBundles = [];
foreach (self::BUNDLES as $bundleName => $packages) {
$sanitizedBundles[$bundleName] = Utils::jsonEncode(
array_map(static fn($name): string => str_replace('/', '-', $name), $packages)
);
$bundleData = [];
foreach ($packages as $packageName => $constraint) {
$sanitizedName = str_replace('/', '-', $packageName);
$bundleData[$sanitizedName] = $constraint === true ? null : $constraint;
}
$sanitizedBundles[$bundleName] = Utils::jsonEncode($bundleData);
}

return $sanitizedBundles;
Expand Down
Loading