From 527fd1bf7258140a6f7c6eac78cf34c97ffb18a7 Mon Sep 17 00:00:00 2001 From: marcosvega91 Date: Thu, 28 May 2020 19:56:20 +0200 Subject: [PATCH 1/7] update lint staged to run all scripts --- package.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index db9db541..0c929497 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,8 @@ "ci:lint": "eslint 'src/**/*.js' -c ./.eslintrc.js", "ci:test": "jest --ci", "test": "jest", - "test:watch": "jest --watch" + "test:watch": "jest --watch", + "prettier": "prettier 'src/**/*.js' --write" }, "dependencies": { "codemirror": "5.53.2", @@ -70,5 +71,12 @@ "hooks": { "pre-commit": "lint-staged" } + }, + "lint-staged": { + "*.js": [ + "npm run lint", + "npm run prettier", + "npm run ci:test" + ] } } From af1c7ca14487f6982ec077bcf7bcc4e78ae23b71 Mon Sep 17 00:00:00 2001 From: marcosvega91 Date: Thu, 28 May 2020 20:02:17 +0200 Subject: [PATCH 2/7] add param --passWithNoTests --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0c929497..2355e9f5 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "*.js": [ "npm run lint", "npm run prettier", - "npm run ci:test" + "npm run ci:test -- --passWithNoTests" ] } } From 980c45a61f623d99fae8ce336c000aa43172cef5 Mon Sep 17 00:00:00 2001 From: marcosvega91 Date: Thu, 28 May 2020 22:31:33 +0200 Subject: [PATCH 3/7] fix prettier --- .prettierignore | 10 ++++++++++ package.json | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 .prettierignore diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 00000000..4734fa05 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,10 @@ +.cache +dist +.github +.lintstagedrc.js +.babelrc +.eslintrc.js +.prettierrc.js +package-lock.json +package.json +postcss.config.js diff --git a/package.json b/package.json index 2355e9f5..a743626a 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "ci:test": "jest --ci", "test": "jest", "test:watch": "jest --watch", - "prettier": "prettier 'src/**/*.js' --write" + "prettier": "prettier . --write" }, "dependencies": { "codemirror": "5.53.2", From 7e6eb6d759bac1f258e1be1acb130a0b04e102a7 Mon Sep 17 00:00:00 2001 From: marcosvega91 Date: Thu, 28 May 2020 22:37:19 +0200 Subject: [PATCH 4/7] update lint staged and remote it from package --- .lintstagedrc.js | 6 +++--- package.json | 7 ------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.lintstagedrc.js b/.lintstagedrc.js index 92a1c72c..168c640d 100644 --- a/.lintstagedrc.js +++ b/.lintstagedrc.js @@ -1,4 +1,4 @@ module.exports = { - '**/*.js': (files) => [`eslint --quiet --fix ${files.join(' ')}`], - '**/*.md': (files) => [`prettier --write ${files.join(' ')}`], -} + '**/*.js': (files) => [`eslint --quiet --fix ${files.join(' ')}`,`jest --passWithNoTests`], + '**/*.{md,js}': (files) => [`prettier --write ${files.join(' ')}`], +}; diff --git a/package.json b/package.json index a743626a..101f9007 100644 --- a/package.json +++ b/package.json @@ -71,12 +71,5 @@ "hooks": { "pre-commit": "lint-staged" } - }, - "lint-staged": { - "*.js": [ - "npm run lint", - "npm run prettier", - "npm run ci:test -- --passWithNoTests" - ] } } From d0ec08fda75df143d55dd57c498f68af78a4d6fe Mon Sep 17 00:00:00 2001 From: marcosvega91 Date: Fri, 29 May 2020 07:31:32 +0200 Subject: [PATCH 5/7] remove from ignore config files --- .prettierignore | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.prettierignore b/.prettierignore index 4734fa05..ba70f389 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,10 +1,2 @@ .cache dist -.github -.lintstagedrc.js -.babelrc -.eslintrc.js -.prettierrc.js -package-lock.json -package.json -postcss.config.js From 0cdba0c9c2954d9fddc34c75fd3c2858f50db106 Mon Sep 17 00:00:00 2001 From: marcosvega91 Date: Fri, 29 May 2020 08:12:18 +0200 Subject: [PATCH 6/7] update lint script and add .eslintignore --- .eslintignore | 2 ++ package.json | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 .eslintignore diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 00000000..ba70f389 --- /dev/null +++ b/.eslintignore @@ -0,0 +1,2 @@ +.cache +dist diff --git a/package.json b/package.json index 101f9007..c3c55846 100644 --- a/package.json +++ b/package.json @@ -12,9 +12,9 @@ "postbuild:client": "mkdir -p dist/client/public && cp _redirects dist/client/_redirects && cp public/favicon.ico dist/client/favicon.ico && cp public/android-chrome-512x512.png dist/client/public/icon.png && cp -r .well-known dist/client/.well-known", "build:server": "cp -r src/lambda/ dist/server", "postbuild:server": "mkdir -p dist/server/server && mv dist/client/index.html dist/server/server/", - "lint": "eslint 'src/**/*.js' --quiet --fix", + "lint": "eslint . --quiet --fix", "clean": "rimraf ./dist ./.cache", - "ci:lint": "eslint 'src/**/*.js' -c ./.eslintrc.js", + "ci:lint": "eslint . -c ./.eslintrc.js", "ci:test": "jest --ci", "test": "jest", "test:watch": "jest --watch", From c8b117528059f43a32cd3d5519e107c97b7c2686 Mon Sep 17 00:00:00 2001 From: marcosvega91 Date: Fri, 29 May 2020 12:05:51 +0200 Subject: [PATCH 7/7] remove confg file from script --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c3c55846..188d386d 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "postbuild:server": "mkdir -p dist/server/server && mv dist/client/index.html dist/server/server/", "lint": "eslint . --quiet --fix", "clean": "rimraf ./dist ./.cache", - "ci:lint": "eslint . -c ./.eslintrc.js", + "ci:lint": "eslint .", "ci:test": "jest --ci", "test": "jest", "test:watch": "jest --watch",