Skip to content

Commit 13f7ec7

Browse files
magento-engcom-teammagento-engcom-team
committed
ENGCOM-8219: Feature/formatting json yaml #30062
- Merge Pull Request #30062 from GrimLink/magento2:feature/formatting-json-yaml - Merged commits: 1. b70851d 2. f7f5dce 3. 9ef8d9d 4. 93d79b8 5. 0533f2e 6. 5b47647 7. 9d8a772 8. 5f704db 9. c722790
2 parents d31cd74 + c722790 commit 13f7ec7

11 files changed

+142
-141
lines changed

‎.editorconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,9 @@ trim_trailing_whitespace = true
1010

1111
[*.md]
1212
trim_trailing_whitespace = false
13+
14+
[*.{yml,yaml,json}]
15+
indent_size = 2
16+
17+
[{composer, auth}.json]
18+
indent_size = 4

‎dev/tests/acceptance/staticRuleset.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"tests": [
3-
"actionGroupArguments",
4-
"deprecatedEntityUsage",
5-
"annotations",
6-
"pauseActionUsage"
7-
]
2+
"tests": [
3+
"actionGroupArguments",
4+
"deprecatedEntityUsage",
5+
"annotations",
6+
"pauseActionUsage"
7+
]
88
}

‎dev/tools/grunt/configs/autoprefixer.json

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
{
2-
"options": {
3-
"browsers": [
4-
"last 2 versions",
5-
"ie 11"
6-
]
7-
},
8-
"setup": {
9-
"src": "<%= path.css.setup %>/setup.css"
10-
},
11-
"updater": {
12-
"src": "<%= path.css.updater %>/updater.css"
13-
}
14-
}
2+
"options": {
3+
"browsers": ["last 2 versions", "ie 11"]
4+
},
5+
"setup": {
6+
"src": "<%= path.css.setup %>/setup.css"
7+
},
8+
"updater": {
9+
"src": "<%= path.css.updater %>/updater.css"
10+
}
11+
}

‎dev/tools/grunt/configs/concat.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"options": {
3-
"stripBanners": true,
4-
"banner": "/**\n * Copyright © <%= grunt.template.today(\"yyyy\") %> Magento. All rights reserved.\n * See COPYING.txt for license details.\n */\n"
5-
},
6-
"setup": {
7-
"src": "<%= path.css.setup %>/setup.css",
8-
"dest": "<%= path.css.setup %>/setup.css"
9-
}
10-
}
2+
"options": {
3+
"stripBanners": true,
4+
"banner": "/**\n * Copyright © <%= grunt.template.today(\"yyyy\") %> Magento. All rights reserved.\n * See COPYING.txt for license details.\n */\n"
5+
},
6+
"setup": {
7+
"src": "<%= path.css.setup %>/setup.css",
8+
"dest": "<%= path.css.setup %>/setup.css"
9+
}
10+
}

‎dev/tools/grunt/configs/cssmin.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
2-
"options": {
3-
"report": "gzip",
4-
"keepSpecialComments": 0
5-
},
6-
"setup": {
7-
"files": {
8-
"<%= path.css.setup %>/setup.css": "<%= path.css.setup %>/setup.css"
9-
}
10-
},
11-
"updater": {
12-
"files": {
13-
"<%= path.css.updater %>/updater.css": "<%= path.css.updater %>/updater.css"
14-
}
2+
"options": {
3+
"report": "gzip",
4+
"keepSpecialComments": 0
5+
},
6+
"setup": {
7+
"files": {
8+
"<%= path.css.setup %>/setup.css": "<%= path.css.setup %>/setup.css"
159
}
16-
}
10+
},
11+
"updater": {
12+
"files": {
13+
"<%= path.css.updater %>/updater.css": "<%= path.css.updater %>/updater.css"
14+
}
15+
}
16+
}

‎dev/tools/grunt/configs/eslint.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
2-
"file": {
3-
"options": {
4-
"configFile": "dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc",
5-
"reset": true,
6-
"useEslintrc": false
7-
}
8-
},
9-
"test": {
10-
"options": {
11-
"configFile": "dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc",
12-
"reset": true,
13-
"outputFile": "dev/tests/static/eslint-error-report.xml",
14-
"format": "junit",
15-
"quiet": true
16-
}
2+
"file": {
3+
"options": {
4+
"configFile": "dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc",
5+
"reset": true,
6+
"useEslintrc": false
177
}
8+
},
9+
"test": {
10+
"options": {
11+
"configFile": "dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc",
12+
"reset": true,
13+
"outputFile": "dev/tests/static/eslint-error-report.xml",
14+
"format": "junit",
15+
"quiet": true
16+
}
17+
}
1818
}

‎dev/tools/grunt/configs/jscs.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
2-
"file": {
3-
"options": {
4-
"config": "dev/tests/static/testsuite/Magento/Test/Js/_files/jscs/.jscsrc"
5-
},
6-
"src": ""
2+
"file": {
3+
"options": {
4+
"config": "dev/tests/static/testsuite/Magento/Test/Js/_files/jscs/.jscsrc"
75
},
8-
"test": {
9-
"options": {
10-
"config": "dev/tests/static/testsuite/Magento/Test/Js/_files/jscs/.jscsrc",
11-
"reporterOutput": "dev/tests/static/jscs-error-report.xml",
12-
"reporter": "junit"
13-
},
14-
"src": ""
15-
}
6+
"src": ""
7+
},
8+
"test": {
9+
"options": {
10+
"config": "dev/tests/static/testsuite/Magento/Test/Js/_files/jscs/.jscsrc",
11+
"reporterOutput": "dev/tests/static/jscs-error-report.xml",
12+
"reporter": "junit"
13+
},
14+
"src": ""
15+
}
1616
}

‎dev/tools/grunt/configs/mage-minify.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
{
2-
"legacy": {
3-
"options": {
4-
"compressor": "yui-js"
5-
},
6-
"files": {
7-
"<%= path.uglify.legacy %>": [
8-
"lib/web/prototype/prototype.js",
9-
"lib/web/prototype/window.js",
10-
"lib/web/scriptaculous/builder.js",
11-
"lib/web/scriptaculous/effects.js",
12-
"lib/web/lib/ccard.js",
13-
"lib/web/prototype/validation.js",
14-
"lib/web/varien/js.js",
15-
"lib/web/mage/adminhtml/varienLoader.js",
16-
"lib/web/mage/adminhtml/tools.js",
17-
"dev/tools/grunt/assets/legacy-build/shim.js"
18-
]
19-
}
2+
"legacy": {
3+
"options": {
4+
"compressor": "yui-js"
5+
},
6+
"files": {
7+
"<%= path.uglify.legacy %>": [
8+
"lib/web/prototype/prototype.js",
9+
"lib/web/prototype/window.js",
10+
"lib/web/scriptaculous/builder.js",
11+
"lib/web/scriptaculous/effects.js",
12+
"lib/web/lib/ccard.js",
13+
"lib/web/prototype/validation.js",
14+
"lib/web/varien/js.js",
15+
"lib/web/mage/adminhtml/varienLoader.js",
16+
"lib/web/mage/adminhtml/tools.js",
17+
"dev/tools/grunt/assets/legacy-build/shim.js"
18+
]
2019
}
20+
}
2121
}

‎dev/tools/grunt/configs/styledocco.json

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
{
2-
"documentation": {
3-
"options": {
4-
"name": "Magento UI Library",
5-
"verbose": true,
6-
"include": [
7-
"<%= path.doc %>/docs.css"
8-
]
9-
},
10-
"files": {
11-
"<%= path.doc %>": "<%= path.doc %>/source"
12-
}
2+
"documentation": {
3+
"options": {
4+
"name": "Magento UI Library",
5+
"verbose": true,
6+
"include": ["<%= path.doc %>/docs.css"]
7+
},
8+
"files": {
9+
"<%= path.doc %>": "<%= path.doc %>/source"
1310
}
14-
}
11+
}
12+
}

‎grunt-config.json.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"themes": "dev/tools/grunt/configs/local-themes"
2+
"themes": "dev/tools/grunt/configs/local-themes"
33
}

‎package.json.sample

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
11
{
2-
"name": "magento2",
3-
"author": "Magento Commerce Inc.",
4-
"description": "Magento2 node modules dependencies for local development",
5-
"license": "(OSL-3.0 OR AFL-3.0)",
6-
"repository": {
7-
"type": "git",
8-
"url": "https://github.com/magento/magento2.git"
9-
},
10-
"homepage": "http://magento.com/",
11-
"devDependencies": {
12-
"glob": "~7.1.1",
13-
"grunt": "~1.0.1",
14-
"grunt-autoprefixer": "~3.0.4",
15-
"grunt-banner": "~0.6.0",
16-
"grunt-continue": "~0.1.0",
17-
"grunt-contrib-clean": "~1.1.0",
18-
"grunt-contrib-connect": "~1.0.2",
19-
"grunt-contrib-cssmin": "~2.2.1",
20-
"grunt-contrib-imagemin": "~2.0.1",
21-
"grunt-contrib-jasmine": "~1.2.0",
22-
"grunt-contrib-less": "~1.4.1",
23-
"grunt-contrib-watch": "~1.0.0",
24-
"grunt-eslint": "~20.1.0",
25-
"grunt-exec": "~3.0.0",
26-
"grunt-jscs": "~3.0.1",
27-
"grunt-replace": "~1.0.1",
28-
"grunt-styledocco": "~0.3.0",
29-
"grunt-template-jasmine-requirejs": "~0.2.3",
30-
"grunt-text-replace": "~0.4.0",
31-
"imagemin-svgo": "~5.2.1",
32-
"load-grunt-config": "~0.19.2",
33-
"morgan": "~1.9.0",
34-
"node-minify": "~2.3.1",
35-
"path": "~0.12.7",
36-
"serve-static": "~1.13.1",
37-
"squirejs": "~0.2.1",
38-
"strip-json-comments": "~2.0.1",
39-
"time-grunt": "~1.4.0",
40-
"underscore": "~1.8.0"
41-
}
2+
"name": "magento2",
3+
"author": "Magento Commerce Inc.",
4+
"description": "Magento2 node modules dependencies for local development",
5+
"license": "(OSL-3.0 OR AFL-3.0)",
6+
"repository": {
7+
"type": "git",
8+
"url": "https://github.com/magento/magento2.git"
9+
},
10+
"homepage": "http://magento.com/",
11+
"devDependencies": {
12+
"glob": "~7.1.1",
13+
"grunt": "~1.0.1",
14+
"grunt-autoprefixer": "~3.0.4",
15+
"grunt-banner": "~0.6.0",
16+
"grunt-continue": "~0.1.0",
17+
"grunt-contrib-clean": "~1.1.0",
18+
"grunt-contrib-connect": "~1.0.2",
19+
"grunt-contrib-cssmin": "~2.2.1",
20+
"grunt-contrib-imagemin": "~2.0.1",
21+
"grunt-contrib-jasmine": "~1.2.0",
22+
"grunt-contrib-less": "~1.4.1",
23+
"grunt-contrib-watch": "~1.0.0",
24+
"grunt-eslint": "~20.1.0",
25+
"grunt-exec": "~3.0.0",
26+
"grunt-jscs": "~3.0.1",
27+
"grunt-replace": "~1.0.1",
28+
"grunt-styledocco": "~0.3.0",
29+
"grunt-template-jasmine-requirejs": "~0.2.3",
30+
"grunt-text-replace": "~0.4.0",
31+
"imagemin-svgo": "~5.2.1",
32+
"load-grunt-config": "~0.19.2",
33+
"morgan": "~1.9.0",
34+
"node-minify": "~2.3.1",
35+
"path": "~0.12.7",
36+
"serve-static": "~1.13.1",
37+
"squirejs": "~0.2.1",
38+
"strip-json-comments": "~2.0.1",
39+
"time-grunt": "~1.4.0",
40+
"underscore": "~1.8.0"
41+
}
4242
}

0 commit comments

Comments
 (0)