Skip to content

Commit f02b359

Browse files
committed
Allow proper local modifications to themes.js
* themes.js is no longer published with the project. So it will not be overwritten on composer updates of the Magento framework * Original themes.js becomes an example/template * themes.js is managed to app/etc - just like env.php
1 parent 12955b1 commit f02b359

File tree

3 files changed

+66
-47
lines changed

3 files changed

+66
-47
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ atlassian*
1111
/app/config_sandbox
1212
/app/etc/config.php
1313
/app/etc/env.php
14+
/app/etc/themes.js
1415
/app/code/Magento/TestModule*
1516
/lib/internal/flex/uploader/.actionScriptProperties
1617
/lib/internal/flex/uploader/.flexProperties

app/etc/themes.template.js

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/**
2+
* Copyright © 2015 Magento. All rights reserved.
3+
* See COPYING.txt for license details.
4+
*/
5+
6+
'use strict';
7+
8+
/**
9+
* Define Themes
10+
*
11+
* If you are working with grunt for frontend development,
12+
* copy this file to themes.js and configure your custom themes.
13+
*
14+
* If grunt is not used, you can ignore this file.
15+
*
16+
* area: area, one of (frontend|adminhtml|doc),
17+
* name: theme name in format Vendor/theme-name,
18+
* locale: locale,
19+
* files: [
20+
* 'css/styles-m',
21+
* 'css/styles-l'
22+
* ],
23+
* dsl: dynamic stylesheet language (less|sass)
24+
*
25+
*/
26+
module.exports = {
27+
blank: {
28+
area: 'frontend',
29+
name: 'Magento/blank',
30+
locale: 'en_US',
31+
files: [
32+
'css/styles-m',
33+
'css/styles-l',
34+
'css/email',
35+
'css/email-inline'
36+
],
37+
dsl: 'less'
38+
},
39+
luma: {
40+
area: 'frontend',
41+
name: 'Magento/luma',
42+
locale: 'en_US',
43+
files: [
44+
'css/styles-m',
45+
'css/styles-l'
46+
],
47+
dsl: 'less'
48+
},
49+
backend: {
50+
area: 'adminhtml',
51+
name: 'Magento/backend',
52+
locale: 'en_US',
53+
files: [
54+
'css/styles-old',
55+
'css/styles'
56+
],
57+
dsl: 'less'
58+
}
59+
};

dev/tools/grunt/configs/themes.js

Lines changed: 6 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -5,50 +5,9 @@
55

66
'use strict';
77

8-
/**
9-
* Define Themes
10-
*
11-
* area: area, one of (frontend|adminhtml|doc),
12-
* name: theme name in format Vendor/theme-name,
13-
* locale: locale,
14-
* files: [
15-
* 'css/styles-m',
16-
* 'css/styles-l'
17-
* ],
18-
* dsl: dynamic stylesheet language (less|sass)
19-
*
20-
*/
21-
module.exports = {
22-
blank: {
23-
area: 'frontend',
24-
name: 'Magento/blank',
25-
locale: 'en_US',
26-
files: [
27-
'css/styles-m',
28-
'css/styles-l',
29-
'css/email',
30-
'css/email-inline'
31-
],
32-
dsl: 'less'
33-
},
34-
luma: {
35-
area: 'frontend',
36-
name: 'Magento/luma',
37-
locale: 'en_US',
38-
files: [
39-
'css/styles-m',
40-
'css/styles-l'
41-
],
42-
dsl: 'less'
43-
},
44-
backend: {
45-
area: 'adminhtml',
46-
name: 'Magento/backend',
47-
locale: 'en_US',
48-
files: [
49-
'css/styles-old',
50-
'css/styles'
51-
],
52-
dsl: 'less'
53-
}
54-
};
8+
try {
9+
module.exports = require('../../../../app/etc/themes');
10+
} catch(err){
11+
var e=new Error("Please configure your themes in app/etc/themes.js - start with copying themes.template.js");
12+
throw e;
13+
}

0 commit comments

Comments
 (0)