From a2e134f93b3ebfd7fce895755989d64a8bf597b3 Mon Sep 17 00:00:00 2001 From: An Duong Date: Fri, 20 May 2022 13:39:34 +0700 Subject: [PATCH 1/2] Use @nimblehq/stylelint-config-nimble and @nimblehq/eslint-config-nimble --- lib/nimble_template/addons/variants/phoenix/web/es_lint.ex | 4 ++-- .../addons/variants/phoenix/web/style_lint.ex | 3 +-- priv/templates/nimble_template/assets/.eslintrc.json | 5 +---- priv/templates/nimble_template/assets/.stylelintrc.json | 7 ++----- .../addons/variants/phoenix/web/es_lint_test.exs | 3 +-- .../addons/variants/phoenix/web/style_lint_test.exs | 3 +-- 6 files changed, 8 insertions(+), 17 deletions(-) diff --git a/lib/nimble_template/addons/variants/phoenix/web/es_lint.ex b/lib/nimble_template/addons/variants/phoenix/web/es_lint.ex index 234fc5dc..6c2a4801 100644 --- a/lib/nimble_template/addons/variants/phoenix/web/es_lint.ex +++ b/lib/nimble_template/addons/variants/phoenix/web/es_lint.ex @@ -46,8 +46,8 @@ defmodule NimbleTemplate.Addons.Phoenix.Web.EsLint do """ "devDependencies": { "eslint": "8.14.0", - "eslint-config-prettier": "8.5.0", - "eslint-plugin-prettier": "4.0.0", + "@nimblehq/eslint-config-nimble": "2.3.0" + "" """ ) diff --git a/lib/nimble_template/addons/variants/phoenix/web/style_lint.ex b/lib/nimble_template/addons/variants/phoenix/web/style_lint.ex index 32993aa0..b0ccff6c 100644 --- a/lib/nimble_template/addons/variants/phoenix/web/style_lint.ex +++ b/lib/nimble_template/addons/variants/phoenix/web/style_lint.ex @@ -45,8 +45,7 @@ defmodule NimbleTemplate.Addons.Phoenix.Web.StyleLint do """ "devDependencies": { "stylelint": "14.7.1", - "stylelint-config-property-sort-order-smacss": "9.0.0", - "stylelint-config-sass-guidelines": "9.0.1", + "@nimblehq/stylelint-config-nimble": "1.0.0", """ ) diff --git a/priv/templates/nimble_template/assets/.eslintrc.json b/priv/templates/nimble_template/assets/.eslintrc.json index 733dbb89..d824b299 100644 --- a/priv/templates/nimble_template/assets/.eslintrc.json +++ b/priv/templates/nimble_template/assets/.eslintrc.json @@ -5,18 +5,15 @@ "es2021": true }, "extends": [ - "eslint:recommended", - "prettier" + "@nimblehq/eslint-config-nimble" ], "parserOptions": { "ecmaVersion": 13, "sourceType": "module" }, "plugins": [ - "prettier" ], "rules": { - "prettier/prettier": "error", "no-unused-vars": [ "error", { "argsIgnorePattern": "^_" diff --git a/priv/templates/nimble_template/assets/.stylelintrc.json b/priv/templates/nimble_template/assets/.stylelintrc.json index e4257297..724ffee3 100644 --- a/priv/templates/nimble_template/assets/.stylelintrc.json +++ b/priv/templates/nimble_template/assets/.stylelintrc.json @@ -1,7 +1,6 @@ { "extends": [ - "stylelint-config-sass-guidelines", - "stylelint-config-property-sort-order-smacss" + "@nimblehq/stylelint-config-nimble" ], "ignoreFiles": [ "css/app.css", @@ -10,8 +9,6 @@ "rules": { "selector-class-pattern": null, "no-eol-whitespace": true, - "max-nesting-depth": 3, - "scss/at-extend-no-missing-placeholder": null, - "order/properties-alphabetical-order": null + "scss/at-extend-no-missing-placeholder": null } } diff --git a/test/nimble_template/addons/variants/phoenix/web/es_lint_test.exs b/test/nimble_template/addons/variants/phoenix/web/es_lint_test.exs index 73b99892..4a61d8ff 100644 --- a/test/nimble_template/addons/variants/phoenix/web/es_lint_test.exs +++ b/test/nimble_template/addons/variants/phoenix/web/es_lint_test.exs @@ -15,8 +15,7 @@ defmodule NimbleTemplate.Addons.Phoenix.Web.EsLintTest do assert file =~ """ "devDependencies": { "eslint": "8.14.0", - "eslint-config-prettier": "8.5.0", - "eslint-plugin-prettier": "4.0.0", + "@nimblehq/eslint-config-nimble": "2.3.0", """ end) end) diff --git a/test/nimble_template/addons/variants/phoenix/web/style_lint_test.exs b/test/nimble_template/addons/variants/phoenix/web/style_lint_test.exs index fe0f927b..5379878a 100644 --- a/test/nimble_template/addons/variants/phoenix/web/style_lint_test.exs +++ b/test/nimble_template/addons/variants/phoenix/web/style_lint_test.exs @@ -18,8 +18,7 @@ defmodule NimbleTemplate.Addons.Phoenix.Web.StyleLintTest do assert file =~ """ "devDependencies": { "stylelint": "14.7.1", - "stylelint-config-property-sort-order-smacss": "9.0.0", - "stylelint-config-sass-guidelines": "9.0.1", + "@nimblehq/stylelint-config-nimble": "1.0.0", """ end) end) From 3105f5d558f89eb1e498dfa92442d1bf97f2c469 Mon Sep 17 00:00:00 2001 From: An Duong Date: Fri, 20 May 2022 13:40:18 +0700 Subject: [PATCH 2/2] Fix typo --- lib/nimble_template/addons/variants/phoenix/web/es_lint.ex | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/nimble_template/addons/variants/phoenix/web/es_lint.ex b/lib/nimble_template/addons/variants/phoenix/web/es_lint.ex index 6c2a4801..fde71d12 100644 --- a/lib/nimble_template/addons/variants/phoenix/web/es_lint.ex +++ b/lib/nimble_template/addons/variants/phoenix/web/es_lint.ex @@ -46,8 +46,7 @@ defmodule NimbleTemplate.Addons.Phoenix.Web.EsLint do """ "devDependencies": { "eslint": "8.14.0", - "@nimblehq/eslint-config-nimble": "2.3.0" - "" + "@nimblehq/eslint-config-nimble": "2.3.0", """ )