-
Notifications
You must be signed in to change notification settings - Fork 9.4k
Feature/formatting json yaml #30062
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
magento-engcom-team
merged 9 commits into
magento:2.4-develop
from
GrimLink:feature/formatting-json-yaml
Oct 13, 2020
Merged
Feature/formatting json yaml #30062
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
b70851d
ADD: formatting rules for json and yaml
GrimLink f7f5dce
IMP: formatting for grunt config files
GrimLink 9ef8d9d
IMP: formatting for dev test config file
GrimLink 93d79b8
IMP: formatting for auth.json
GrimLink 0533f2e
IMP: formatting for grunt-config
GrimLink 5b47647
IMP: formatting for package.json
GrimLink 9d8a772
IMP: formatting by keeping auth.json indent, same as composer
GrimLink 5f704db
Merge branch '2.4-develop' into feature/formatting-json-yaml
ihor-sviziev c722790
magento/magento2#30062: Feature/formatting json yaml.
engcom-Foxtrot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| { | ||
| "tests": [ | ||
| "actionGroupArguments", | ||
| "deprecatedEntityUsage", | ||
| "annotations", | ||
| "pauseActionUsage" | ||
| ] | ||
| "tests": [ | ||
| "actionGroupArguments", | ||
| "deprecatedEntityUsage", | ||
| "annotations", | ||
| "pauseActionUsage" | ||
| ] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,11 @@ | ||
| { | ||
| "options": { | ||
| "browsers": [ | ||
| "last 2 versions", | ||
| "ie 11" | ||
| ] | ||
| }, | ||
| "setup": { | ||
| "src": "<%= path.css.setup %>/setup.css" | ||
| }, | ||
| "updater": { | ||
| "src": "<%= path.css.updater %>/updater.css" | ||
| } | ||
| } | ||
| "options": { | ||
| "browsers": ["last 2 versions", "ie 11"] | ||
| }, | ||
| "setup": { | ||
| "src": "<%= path.css.setup %>/setup.css" | ||
| }, | ||
| "updater": { | ||
| "src": "<%= path.css.updater %>/updater.css" | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| { | ||
| "options": { | ||
| "stripBanners": true, | ||
| "banner": "/**\n * Copyright © <%= grunt.template.today(\"yyyy\") %> Magento. All rights reserved.\n * See COPYING.txt for license details.\n */\n" | ||
| }, | ||
| "setup": { | ||
| "src": "<%= path.css.setup %>/setup.css", | ||
| "dest": "<%= path.css.setup %>/setup.css" | ||
| } | ||
| } | ||
| "options": { | ||
| "stripBanners": true, | ||
| "banner": "/**\n * Copyright © <%= grunt.template.today(\"yyyy\") %> Magento. All rights reserved.\n * See COPYING.txt for license details.\n */\n" | ||
| }, | ||
| "setup": { | ||
| "src": "<%= path.css.setup %>/setup.css", | ||
| "dest": "<%= path.css.setup %>/setup.css" | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,16 @@ | ||
| { | ||
| "options": { | ||
| "report": "gzip", | ||
| "keepSpecialComments": 0 | ||
| }, | ||
| "setup": { | ||
| "files": { | ||
| "<%= path.css.setup %>/setup.css": "<%= path.css.setup %>/setup.css" | ||
| } | ||
| }, | ||
| "updater": { | ||
| "files": { | ||
| "<%= path.css.updater %>/updater.css": "<%= path.css.updater %>/updater.css" | ||
| } | ||
| "options": { | ||
| "report": "gzip", | ||
| "keepSpecialComments": 0 | ||
| }, | ||
| "setup": { | ||
| "files": { | ||
| "<%= path.css.setup %>/setup.css": "<%= path.css.setup %>/setup.css" | ||
| } | ||
| } | ||
| }, | ||
| "updater": { | ||
| "files": { | ||
| "<%= path.css.updater %>/updater.css": "<%= path.css.updater %>/updater.css" | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,18 @@ | ||
| { | ||
| "file": { | ||
| "options": { | ||
| "configFile": "dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc", | ||
| "reset": true, | ||
| "useEslintrc": false | ||
| } | ||
| }, | ||
| "test": { | ||
| "options": { | ||
| "configFile": "dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc", | ||
| "reset": true, | ||
| "outputFile": "dev/tests/static/eslint-error-report.xml", | ||
| "format": "junit", | ||
| "quiet": true | ||
| } | ||
| "file": { | ||
| "options": { | ||
| "configFile": "dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc", | ||
| "reset": true, | ||
| "useEslintrc": false | ||
| } | ||
| }, | ||
| "test": { | ||
| "options": { | ||
| "configFile": "dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc", | ||
| "reset": true, | ||
| "outputFile": "dev/tests/static/eslint-error-report.xml", | ||
| "format": "junit", | ||
| "quiet": true | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,16 @@ | ||
| { | ||
| "file": { | ||
| "options": { | ||
| "config": "dev/tests/static/testsuite/Magento/Test/Js/_files/jscs/.jscsrc" | ||
| }, | ||
| "src": "" | ||
| "file": { | ||
| "options": { | ||
| "config": "dev/tests/static/testsuite/Magento/Test/Js/_files/jscs/.jscsrc" | ||
| }, | ||
| "test": { | ||
| "options": { | ||
| "config": "dev/tests/static/testsuite/Magento/Test/Js/_files/jscs/.jscsrc", | ||
| "reporterOutput": "dev/tests/static/jscs-error-report.xml", | ||
| "reporter": "junit" | ||
| }, | ||
| "src": "" | ||
| } | ||
| "src": "" | ||
| }, | ||
| "test": { | ||
| "options": { | ||
| "config": "dev/tests/static/testsuite/Magento/Test/Js/_files/jscs/.jscsrc", | ||
| "reporterOutput": "dev/tests/static/jscs-error-report.xml", | ||
| "reporter": "junit" | ||
| }, | ||
| "src": "" | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,21 @@ | ||
| { | ||
| "legacy": { | ||
| "options": { | ||
| "compressor": "yui-js" | ||
| }, | ||
| "files": { | ||
| "<%= path.uglify.legacy %>": [ | ||
| "lib/web/prototype/prototype.js", | ||
| "lib/web/prototype/window.js", | ||
| "lib/web/scriptaculous/builder.js", | ||
| "lib/web/scriptaculous/effects.js", | ||
| "lib/web/lib/ccard.js", | ||
| "lib/web/prototype/validation.js", | ||
| "lib/web/varien/js.js", | ||
| "lib/web/mage/adminhtml/varienLoader.js", | ||
| "lib/web/mage/adminhtml/tools.js", | ||
| "dev/tools/grunt/assets/legacy-build/shim.js" | ||
| ] | ||
| } | ||
| "legacy": { | ||
| "options": { | ||
| "compressor": "yui-js" | ||
| }, | ||
| "files": { | ||
| "<%= path.uglify.legacy %>": [ | ||
| "lib/web/prototype/prototype.js", | ||
| "lib/web/prototype/window.js", | ||
| "lib/web/scriptaculous/builder.js", | ||
| "lib/web/scriptaculous/effects.js", | ||
| "lib/web/lib/ccard.js", | ||
| "lib/web/prototype/validation.js", | ||
| "lib/web/varien/js.js", | ||
| "lib/web/mage/adminhtml/varienLoader.js", | ||
| "lib/web/mage/adminhtml/tools.js", | ||
| "dev/tools/grunt/assets/legacy-build/shim.js" | ||
| ] | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,12 @@ | ||
| { | ||
| "documentation": { | ||
| "options": { | ||
| "name": "Magento UI Library", | ||
| "verbose": true, | ||
| "include": [ | ||
| "<%= path.doc %>/docs.css" | ||
| ] | ||
| }, | ||
| "files": { | ||
| "<%= path.doc %>": "<%= path.doc %>/source" | ||
| } | ||
| "documentation": { | ||
| "options": { | ||
| "name": "Magento UI Library", | ||
| "verbose": true, | ||
| "include": ["<%= path.doc %>/docs.css"] | ||
| }, | ||
| "files": { | ||
| "<%= path.doc %>": "<%= path.doc %>/source" | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "themes": "dev/tools/grunt/configs/local-themes" | ||
| "themes": "dev/tools/grunt/configs/local-themes" | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,42 @@ | ||
| { | ||
| "name": "magento2", | ||
| "author": "Magento Commerce Inc.", | ||
| "description": "Magento2 node modules dependencies for local development", | ||
| "license": "(OSL-3.0 OR AFL-3.0)", | ||
| "repository": { | ||
| "type": "git", | ||
| "url": "https://github.com/magento/magento2.git" | ||
| }, | ||
| "homepage": "http://magento.com/", | ||
| "devDependencies": { | ||
| "glob": "~7.1.1", | ||
| "grunt": "~1.0.1", | ||
| "grunt-autoprefixer": "~3.0.4", | ||
| "grunt-banner": "~0.6.0", | ||
| "grunt-continue": "~0.1.0", | ||
| "grunt-contrib-clean": "~1.1.0", | ||
| "grunt-contrib-connect": "~1.0.2", | ||
| "grunt-contrib-cssmin": "~2.2.1", | ||
| "grunt-contrib-imagemin": "~2.0.1", | ||
| "grunt-contrib-jasmine": "~1.2.0", | ||
| "grunt-contrib-less": "~1.4.1", | ||
| "grunt-contrib-watch": "~1.0.0", | ||
| "grunt-eslint": "~20.1.0", | ||
| "grunt-exec": "~3.0.0", | ||
| "grunt-jscs": "~3.0.1", | ||
| "grunt-replace": "~1.0.1", | ||
| "grunt-styledocco": "~0.3.0", | ||
| "grunt-template-jasmine-requirejs": "~0.2.3", | ||
| "grunt-text-replace": "~0.4.0", | ||
| "imagemin-svgo": "~5.2.1", | ||
| "load-grunt-config": "~0.19.2", | ||
| "morgan": "~1.9.0", | ||
| "node-minify": "~2.3.1", | ||
| "path": "~0.12.7", | ||
| "serve-static": "~1.13.1", | ||
| "squirejs": "~0.2.1", | ||
| "strip-json-comments": "~2.0.1", | ||
| "time-grunt": "~1.4.0", | ||
| "underscore": "~1.8.0" | ||
| } | ||
| "name": "magento2", | ||
| "author": "Magento Commerce Inc.", | ||
| "description": "Magento2 node modules dependencies for local development", | ||
| "license": "(OSL-3.0 OR AFL-3.0)", | ||
| "repository": { | ||
| "type": "git", | ||
| "url": "https://github.com/magento/magento2.git" | ||
| }, | ||
| "homepage": "http://magento.com/", | ||
| "devDependencies": { | ||
| "glob": "~7.1.1", | ||
| "grunt": "~1.0.1", | ||
| "grunt-autoprefixer": "~3.0.4", | ||
| "grunt-banner": "~0.6.0", | ||
| "grunt-continue": "~0.1.0", | ||
| "grunt-contrib-clean": "~1.1.0", | ||
| "grunt-contrib-connect": "~1.0.2", | ||
| "grunt-contrib-cssmin": "~2.2.1", | ||
| "grunt-contrib-imagemin": "~2.0.1", | ||
| "grunt-contrib-jasmine": "~1.2.0", | ||
| "grunt-contrib-less": "~1.4.1", | ||
| "grunt-contrib-watch": "~1.0.0", | ||
| "grunt-eslint": "~20.1.0", | ||
| "grunt-exec": "~3.0.0", | ||
| "grunt-jscs": "~3.0.1", | ||
| "grunt-replace": "~1.0.1", | ||
| "grunt-styledocco": "~0.3.0", | ||
| "grunt-template-jasmine-requirejs": "~0.2.3", | ||
| "grunt-text-replace": "~0.4.0", | ||
| "imagemin-svgo": "~5.2.1", | ||
| "load-grunt-config": "~0.19.2", | ||
| "morgan": "~1.9.0", | ||
| "node-minify": "~2.3.1", | ||
| "path": "~0.12.7", | ||
| "serve-static": "~1.13.1", | ||
| "squirejs": "~0.2.1", | ||
| "strip-json-comments": "~2.0.1", | ||
| "time-grunt": "~1.4.0", | ||
| "underscore": "~1.8.0" | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@engcom-Foxtrot basically it's not the same. You just removed option for
composer.lockfiles.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ihor-sviziev yes, composer.lock inherits settings from general configuration *. It's not overridden by *.{yml,yaml,json}