Skip to content

Commit 59a3c29

Browse files
rhoerrfballiano
rhoerr
and
fballiano
authored
Add mage-os/theme-adminhtml-m137 as a bundled package (#207)
* Add mage-os/theme-adminhtml-m137 as a bundled package * wip: allow inclusion of independently released Mage-OS packages * Build the M137 admin theme with Mage-OS release * Exclude theme from the built release packages --------- Co-authored-by: Fabrizio Balliano <[email protected]>
1 parent 9a2ae50 commit 59a3c29

File tree

5 files changed

+216
-3
lines changed

5 files changed

+216
-3
lines changed

‎resource/composer-templates/mage-os/product-community-edition/dependencies-template.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
{
22
"dependencies": {
33
"creatuity/magento2-interceptors": "https://github.com/creatuity/magento2-interceptors.git",
4-
"mage-os/security-package": "https://github.com/mage-os/mageos-security-package.git",
54
"mage-os/inventory-metapackage": "https://github.com/mage-os/mageos-inventory.git",
6-
"mage-os/page-builder": "https://github.com/mage-os/mageos-magento2-page-builder"
5+
"mage-os/page-builder": "https://github.com/mage-os/mageos-magento2-page-builder.git",
6+
"mage-os/security-package": "https://github.com/mage-os/mageos-security-package.git",
7+
"mage-os/theme-adminhtml-m137": "https://github.com/mage-os-lab/theme-adminhtml-m137.git"
78
}
89
}

‎src/build-config/mageos-release-build-config.js‎

Lines changed: 208 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,214 @@ const releaseBuildConfig = {
114114
ref: 'release/1.x',
115115
fromTag: '1.0.0',
116116
},
117+
// 'theme-adminhtml-m137': {
118+
// repoUrl: 'https://github.com/mage-os-lab/theme-adminhtml-m137.git',
119+
// ref: 'main',
120+
// fromTag: '1.0.0',
121+
// packageDirs: [],
122+
// packageIndividual: [
123+
// {
124+
// label: 'theme-adminhtml-m137',
125+
// dir: ''
126+
// }
127+
// ],
128+
// packageMetaFromDirs: [],
129+
// },
130+
// 'module-theme-adminhtml-switcher': {
131+
// repoUrl: 'https://github.com/mage-os-lab/module-theme-adminhtml-switcher.git',
132+
// ref: 'main',
133+
// fromTag: '1.0.0',
134+
// packageDirs: [],
135+
// packageIndividual: [
136+
// {
137+
// label: 'module-theme-adminhtml-switcher',
138+
// dir: ''
139+
// }
140+
// ],
141+
// packageMetaFromDirs: [],
142+
// },
143+
// 'mageos-async-events-sinks': {
144+
// repoUrl: 'https://github.com/mage-os/mageos-async-events-sinks.git',
145+
// ref: 'main',
146+
// fromTag: '1.0.0',
147+
// packageDirs: [],
148+
// packageIndividual: [
149+
// {
150+
// label: 'mageos-async-events-sinks',
151+
// dir: ''
152+
// }
153+
// ],
154+
// packageMetaFromDirs: [],
155+
// },
156+
// 'mageos-async-events-admin-ui': {
157+
// repoUrl: 'https://github.com/mage-os/mageos-async-events-admin-ui.git',
158+
// ref: 'main',
159+
// fromTag: '1.0.0',
160+
// packageDirs: [],
161+
// packageIndividual: [
162+
// {
163+
// label: 'mageos-async-events-admin-ui',
164+
// dir: ''
165+
// }
166+
// ],
167+
// packageMetaFromDirs: [],
168+
// },
169+
// // 'mageos-async-events-azure': {
170+
// // repoUrl: 'https://github.com/mage-os/mageos-async-events-azure.git',
171+
// // ref: 'main',
172+
// // fromTag: '1.0.0',
173+
// // packageDirs: [],
174+
// // packageIndividual: [
175+
// // {
176+
// // label: 'mageos-async-events-azure',
177+
// // dir: ''
178+
// // }
179+
// // ],
180+
// // packageMetaFromDirs: [],
181+
// // },
182+
// 'mageos-async-events': {
183+
// repoUrl: 'https://github.com/mage-os/mageos-async-events.git',
184+
// ref: '4.x',
185+
// fromTag: '1.0.0',
186+
// packageDirs: [],
187+
// packageIndividual: [
188+
// {
189+
// label: 'mageos-async-events',
190+
// dir: ''
191+
// }
192+
// ],
193+
// packageMetaFromDirs: [],
194+
// },
195+
// 'mageos-async-events-aws': {
196+
// repoUrl: 'https://github.com/mage-os/mageos-async-events-aws.git',
197+
// ref: 'main',
198+
// fromTag: '1.0.0',
199+
// packageDirs: [],
200+
// packageIndividual: [
201+
// {
202+
// label: 'mageos-async-events-aws',
203+
// dir: ''
204+
// }
205+
// ],
206+
// packageMetaFromDirs: [],
207+
// },
208+
// 'mageos-async-events-gcp': {
209+
// repoUrl: 'https://github.com/mage-os/mageos-async-events-gcp.git',
210+
// ref: 'main',
211+
// fromTag: '1.0.0',
212+
// packageDirs: [],
213+
// packageIndividual: [
214+
// {
215+
// label: 'mageos-async-events-gcp',
216+
// dir: ''
217+
// }
218+
// ],
219+
// packageMetaFromDirs: [],
220+
// },
221+
// 'mageos-common-async-events': {
222+
// repoUrl: 'https://github.com/mage-os/mageos-common-async-events.git',
223+
// ref: 'main',
224+
// fromTag: '1.0.0',
225+
// packageDirs: [],
226+
// packageIndividual: [
227+
// {
228+
// label: 'mageos-common-async-events',
229+
// dir: ''
230+
// }
231+
// ],
232+
// packageMetaFromDirs: [],
233+
// },
234+
// 'module-inventory-reservations-grid': {
235+
// repoUrl: 'https://github.com/mage-os-lab/module-inventory-reservations-grid.git',
236+
// ref: 'main',
237+
// fromTag: '1.0.0',
238+
// packageDirs: [],
239+
// packageIndividual: [
240+
// {
241+
// label: 'module-inventory-reservations-grid',
242+
// dir: ''
243+
// }
244+
// ],
245+
// packageMetaFromDirs: [],
246+
// },
247+
// 'module-automatic-translation': {
248+
// repoUrl: 'https://github.com/mage-os-lab/module-automatic-translation.git',
249+
// ref: 'main',
250+
// fromTag: '1.0.0',
251+
// packageDirs: [],
252+
// packageIndividual: [
253+
// {
254+
// label: 'module-automatic-translation',
255+
// dir: ''
256+
// }
257+
// ],
258+
// packageMetaFromDirs: [],
259+
// },
260+
// 'web-installer': {
261+
// repoUrl: 'https://github.com/mage-os-lab/web-installer.git',
262+
// ref: 'main',
263+
// fromTag: '1.0.0',
264+
// packageDirs: [],
265+
// packageIndividual: [
266+
// {
267+
// label: 'web-installer',
268+
// dir: ''
269+
// }
270+
// ],
271+
// packageMetaFromDirs: [],
272+
// },
273+
// 'module-meta-robots-tag': {
274+
// repoUrl: 'https://github.com/mage-os-lab/module-meta-robots-tag.git',
275+
// ref: 'main',
276+
// fromTag: '1.0.0',
277+
// packageDirs: [],
278+
// packageIndividual: [
279+
// {
280+
// label: 'module-meta-robots-tag',
281+
// dir: ''
282+
// }
283+
// ],
284+
// packageMetaFromDirs: [],
285+
// },
286+
// 'module-catalog-data-ai': {
287+
// repoUrl: 'https://github.com/mage-os-lab/module-catalog-data-ai.git',
288+
// ref: 'main',
289+
// fromTag: '1.0.0',
290+
// packageDirs: [],
291+
// packageIndividual: [
292+
// {
293+
// label: 'module-catalog-data-ai',
294+
// dir: ''
295+
// }
296+
// ],
297+
// packageMetaFromDirs: [],
298+
// },
299+
// 'module-pagebuilder-template-import-export': {
300+
// repoUrl: 'https://github.com/mage-os-lab/module-pagebuilder-template-import-export.git',
301+
// ref: 'master',
302+
// fromTag: '1.0.0',
303+
// packageDirs: [],
304+
// packageIndividual: [
305+
// {
306+
// label: 'module-pagebuilder-template-import-export',
307+
// dir: ''
308+
// }
309+
// ],
310+
// packageMetaFromDirs: [],
311+
// },
312+
// 'module-admin-assistant': {
313+
// repoUrl: 'https://github.com/mage-os-lab/module-admin-assistant.git',
314+
// ref: 'main',
315+
// fromTag: '1.0.0',
316+
// packageDirs: [],
317+
// packageIndividual: [
318+
// {
319+
// label: 'module-admin-assistant',
320+
// dir: ''
321+
// }
322+
// ],
323+
// packageMetaFromDirs: [],
324+
// },
117325
};
118326

119327
module.exports = {

‎src/package-modules.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ function chooseNameAndVersion(magentoName, composerJson, ref, givenVersion) {
120120
function setDependencyVersions(composerConfig, dependencyVersions, vendor) {
121121
for (const dependencyType of ['require', 'require-dev', 'suggest']) {
122122
for (const dep in (composerConfig[dependencyType] || {})) {
123+
// @TODO: Allow vendor packages to be flagged as independently packaged. In that case, use the latest tagged version, not the current release or fallback version.
123124
if (dependencyVersions[dep] || (vendor && dep.startsWith(vendor) && dependencyVersions['*'])) {
124125
// The "Sample Data version:" prefix is used by sampledata:deploy to identify packages to require.
125126
// See \Magento\SampleData\Model\Dependency::getSampleDataPackages
@@ -268,6 +269,7 @@ async function createPackageForRef(url, moduleDir, ref, options) {
268269
* dependencyVersions: set as {'*': releaseVersion}
269270
* => use dependencyVersions
270271
*/
272+
// @TODO: Change mageos release version handling for independently packaged packages
271273
({
272274
name,
273275
version

‎src/release-build-tools.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ function setMageOsDependencyVersion(obj, dependencyType, releaseVersion, vendor)
139139
const packageNames = Object.keys(obj)
140140
packageNames.forEach(packageName => {
141141
if (packageName.match(mageOsPackage)) {
142+
// @TODO: Allow vendor packages to be flagged as independently packaged. In that case, use the latest tagged version, not the current release or fallback version.
142143
obj[packageName] = dependencyType === 'suggest' && packageName.endsWith('-sample-data')
143144
? `Sample Data version: ${releaseVersion}`
144145
: releaseVersion;

‎src/utils.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,11 @@ function mergeBuildConfigs(a, b) {
4343
repoInstruction[type].map(bx => {
4444
const idField = bx.dir ? 'dir' : 'label'
4545
const targetIdx = (a[key]?.[type] || []).findIndex(ax => ax[idField] === bx[idField])
46+
a[key] = a[key] || {};
4647
if (targetIdx > -1) {
4748
a[key][type][targetIdx] = Object.assign(a[key][type][targetIdx], bx)
4849
} else {
49-
a[key][type].push(bx)
50+
a[key][type] = (a[key]?.[type] || []).concat([bx])
5051
}
5152
})
5253
delete b[key][type];

0 commit comments

Comments
 (0)