You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by ka...@apache.org on 2019/10/16 09:26:37 UTC

[airflow-site] branch aip-11 updated: Add JSON Pretty formatter (#80)

This is an automated email from the ASF dual-hosted git repository.

kamilbregula pushed a commit to branch aip-11
in repository https://gitbox.apache.org/repos/asf/airflow-site.git


The following commit(s) were added to refs/heads/aip-11 by this push:
     new 46f1f1c  Add JSON Pretty formatter (#80)
46f1f1c is described below

commit 46f1f1c651d544d65c04e3cb20702fd41c241421
Author: Kamil BreguĊ‚a <mi...@users.noreply.github.com>
AuthorDate: Wed Oct 16 11:26:28 2019 +0200

    Add JSON Pretty formatter (#80)
---
 .pre-commit-config.yaml    |  6 +++++-
 landing-pages/.babelrc     |  6 +++---
 landing-pages/package.json | 30 +++++++++++++++---------------
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 45d2907..2a69477 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -114,7 +114,6 @@ repos:
   -   repo: https://github.com/pre-commit/pre-commit-hooks
       rev: v2.3.0
       hooks:
-        - id: trailing-whitespace
         - id: check-executables-have-shebangs
         - id: check-json
         - id: check-merge-conflict
@@ -122,6 +121,11 @@ repos:
         - id: check-yaml
         - id: detect-private-key
         - id: end-of-file-fixer
+        - id: pretty-format-json
+          args:
+            - --indent=2
+            - --autofix
+            - --top-keys=name,version,description,repository,main,author,license,scripts
         - id: mixed-line-ending
         - id: requirements-txt-fixer
         - id: trailing-whitespace
diff --git a/landing-pages/.babelrc b/landing-pages/.babelrc
index e6c62a1..d04414c 100644
--- a/landing-pages/.babelrc
+++ b/landing-pages/.babelrc
@@ -1,9 +1,9 @@
 {
-  "presets": [
-    "@babel/preset-env"
-  ],
   "plugins": [
     "@babel/plugin-syntax-object-rest-spread",
     "@babel/plugin-proposal-object-rest-spread"
+  ],
+  "presets": [
+    "@babel/preset-env"
   ]
 }
diff --git a/landing-pages/package.json b/landing-pages/package.json
index 5efb93b..d8fc5ef 100644
--- a/landing-pages/package.json
+++ b/landing-pages/package.json
@@ -4,25 +4,25 @@
   "description": "Apache Airflow website",
   "repository": "apache/airflow-site",
   "main": "index.js",
+  "author": "",
+  "license": "MIT",
   "scripts": {
+    "build": "npm run build:webpack && npm run build:hugo",
+    "build:hugo": "hugo -d ../dist -s site -v",
+    "build:hugo:preview": "npm run build:hugo -- -D -F",
+    "build:preview": "npm run build:webpack && npm run build:hugo:preview",
+    "build:webpack": "cross-env NODE_ENV=production webpack --config webpack.prod.js",
     "lint": "run-p lint:**",
-    "lint:js": "eslint src",
     "lint:css": "stylelint \"site/assets/scss/**/*.scss\"",
-    "start": "run-p start:**",
-    "start:hugo": "hugo -d ../dist -s site -vw",
-    "start:webpack": "webpack-dev-server --config webpack.dev.js --hot",
+    "lint:js": "eslint src",
+    "prebuild": "rimraf dist",
     "preview": "run-p preview:**",
     "preview:hugo": "npm run start:hugo -- -D -F",
     "preview:webpack": "npm run start:webpack",
-    "prebuild": "rimraf dist",
-    "build": "npm run build:webpack && npm run build:hugo",
-    "build:preview": "npm run build:webpack && npm run build:hugo:preview",
-    "build:hugo": "hugo -d ../dist -s site -v",
-    "build:hugo:preview": "npm run build:hugo -- -D -F",
-    "build:webpack": "cross-env NODE_ENV=production webpack --config webpack.prod.js"
+    "start": "run-p start:**",
+    "start:hugo": "hugo -d ../dist -s site -vw",
+    "start:webpack": "webpack-dev-server --config webpack.dev.js --hot"
   },
-  "author": "",
-  "license": "MIT",
   "devDependencies": {
     "@babel/core": "^7.5.4",
     "@babel/plugin-proposal-object-rest-spread": "^7.5.4",
@@ -67,12 +67,12 @@
     "webpack-merge": "^4.1.4",
     "whatwg-fetch": "^3.0.0"
   },
-  "resolutions": {
-    "natives": "1.1.6"
-  },
   "hugo-bin": {
     "buildTags": "extended"
   },
+  "resolutions": {
+    "natives": "1.1.6"
+  },
   "stylelint": {
     "extends": [
       "stylelint-config-recommended"