Merge remote-tracking branch 'upstream/master'

2 files changed, 27 insertions, 0 deletions

diff --git a/.dev/.eslintrc.js b/.dev/.eslintrc.js
new file mode 100644
index 00000000..151b785b
--- /dev/null
+++ b/.dev/.eslintrc.js
@@ -0,0 +1,12 @@
+module.exports = {
+  "extends": "airbnb-base",
+  "env": {
+    "browser": true,
+  },
+  "rules": {
+    "no-param-reassign": 0, // manipulate DOM style properties
+    "no-restricted-globals": 0, // currently Shaarli uses alert/confirm, could be be improved later
+    "no-alert": 0, // currently Shaarli uses alert/confirm, could be be improved later
+    "no-cond-assign": [2, "except-parens"], // assignment in while loops is readable and avoid assignment duplication
+  }
+};
diff --git a/.dev/.sasslintrc b/.dev/.sasslintrc
new file mode 100644
index 00000000..ac406d7b
--- /dev/null
+++ b/.dev/.sasslintrc
@@ -0,0 +1,15 @@
+options:
+  max-warnings: 0
+rules:
+  property-sort-order:
+    - 1
+    -
+      order: 'concentric'
+  no-important:
+    - 0
+  no-vendor-prefixes:
+    - 0 # this will be fixed with v2: see https://github.com/sasstools/sass-lint/pull/1137
+  nesting-depth:
+    - 1
+    -
+      max-depth: 4