@soleil-se/eslint-config 2.0.0 → 2.1.1

package/.eslintrc.js

@@ -3,4 +3,7 @@ module.exports = {
   env: {
     commonjs: true,   
   },
+  rules: {
+   'global-require': 0
+  }
 }

package/CHANGELOG.md

@@ -4,6 +4,15 @@ Alla förändringar i detta repository antecknas här.
 Formatet baseras på [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 och projektet använder [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.1.1] - 2020-10-06
+### Ändrat
+- Ordning på config så de inställningar Svelte behöver för serversidan kommer med.
+
+## [2.1.0] - 2020-09-28
+### Ändrat
+- Dependencies som behövs som standard ligger som peerDependencies
+- Dependencies för ramverksspecifika plugins behöver installeras utöver peerDependencies. 
+
 ## [2.0.0] - 2020-09-28
 ### Ändrat
 - Stöd för Svelte.

package/README.md

@@ -21,6 +21,7 @@ https://eslint.org/docs/rules/
 
 - [1. Innehållsförteckning](#1-innehållsförteckning)
 - [2. Installera](#2-installera)
+  - [Ramverk](#ramverk)
 - [3. Migrering 1.x.x -> 2.x.x](#3-migrering-1xx---2xx)
 - [4. Config](#4-config)
   - [4.1. Konfigurationsfiler](#41-konfigurationsfiler)
@@ -50,8 +51,15 @@ https://eslint.org/docs/rules/
 
 ## 2. Installera
 
-Installera konfigurationen och `eslint` i ditt projekt genom att köra:   
-`yarn add eslint @soleil-se/eslint-config-sitevision --dev` 
+Installera konfigurationen, `eslint` och de plugins som behövs plugins i ditt projekt genom att köra:   
+`yarn add @soleil-se/eslint-config-sitevision eslint babel-eslint eslint-config-airbnb-base eslint-plugin-import --dev` 
+
+### Ramverk
+Om Vue används i projektet:   
+`yarn add eslint-plugin-vue@6.2.2 --dev`   
+
+Om Svelte använs i projektet:   
+`yarn add eslint-plugin-svelte3 svelte --dev`
 
 ## 3. Migrering 1.x.x -> 2.x.x
 

package/client.js

@@ -1,14 +1,13 @@
+const { getExtends, getPlugins, getOverrides } = require('./utils');
 const client = require('./shared/client');
-const vue = require('./overrides/vue');
-const svelte = require('./overrides/svelte');
 
 module.exports = {
-  extends: ['airbnb-base', 'plugin:vue/recommended'],
-  plugins: ['vue', 'svelte3'],
+  extends: getExtends(),
+  plugins: getPlugins(),
   parserOptions: {
     parser: 'babel-eslint',
     sourceType: 'module',
   },
+  overrides: getOverrides(),
   ...client,
-  overrides: [vue, svelte],
 };

package/global.js

@@ -1,16 +1,32 @@
+const { getExtends, getPlugins, getOverrides } = require('./utils');
+
 const server = require('./shared/server');
 const client = require('./shared/client');
-const vue = require('./overrides/vue');
-const svelte = require('./overrides/svelte');
 
 module.exports = {
-  extends: ['airbnb-base', 'plugin:vue/recommended'],
-  plugins: ['vue', 'svelte3'],
+  extends: getExtends(),
+  plugins: getPlugins(),
   parserOptions: {
     parser: 'babel-eslint',
     sourceType: 'module',
   },
   overrides: [
+    {
+      files: [
+        '*.vue',
+        '*.svelte',
+        'client_src/js/**/*.js',
+        'server_src/webapps/**/app_src/main.js',
+        'server_src/webapps/**/app_src/client/**/*.js',
+        'server_src/webapps/**/app_src/config/config.js',
+        'server_src/webapps/**/app_src/config/client/**/*.js',
+        'server_src/webapps/**/app_config/config.js',
+        'server_src/webapps/**/app_config/client/**/*.js',
+        'server_src/webapps/**/app_config_global/config.js',
+        'server_src/webapps/**/app_config_global/client/**/*.js',
+      ],
+      ...client,
+    },
     {
       files: [
         '*.svelte',
@@ -30,23 +46,5 @@ module.exports = {
       ],
       ...server,
     },
-    {
-      files: [
-        '*.vue',
-        '*.svelte',
-        'client_src/js/**/*.js',
-        'server_src/webapps/**/app_src/main.js',
-        'server_src/webapps/**/app_src/client/**/*.js',
-        'server_src/webapps/**/app_src/config/config.js',
-        'server_src/webapps/**/app_src/config/client/**/*.js',
-        'server_src/webapps/**/app_config/config.js',
-        'server_src/webapps/**/app_config/client/**/*.js',
-        'server_src/webapps/**/app_config_global/config.js',
-        'server_src/webapps/**/app_config_global/client/**/*.js',
-      ],
-      ...client,
-    },
-    vue,
-    svelte,
-  ],
+  ].concat(getOverrides()),
 };

package/package.json

@@ -1,22 +1,28 @@
 {
   "name": "@soleil-se/eslint-config",
-  "version": "2.0.0",
+  "version": "2.1.1",
   "description": "Settings for ESLint in a SiteVision project",
   "author": "Soleil AB",
   "license": "UNLICENSED",
   "private": false,
-  "homepage": "https://github.com/soleilit/eslint-config#readme",
-  "dependencies": {
+  "homepage": "https://github.com/soleilit/@soleil-se/eslint-config#readme",
+  "devDependencies": {
     "babel-eslint": "^10.1.0",
-    "eslint": "^7.6.0",
+    "eslint": "^7.10.0",
     "eslint-config-airbnb-base": "^14.2.0",
-    "eslint-plugin-import": "^2.22.0",
+    "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-svelte3": "^2.7.3",
     "eslint-plugin-vue": "^6.2.2",
-    "svelte": "^3.24.1"
+    "svelte": "^3.29.0"
+  },
+  "peerDependencies": {
+    "babel-eslint": "^10.1.0",
+    "eslint": "^7.10.0",
+    "eslint-config-airbnb-base": "^14.2.0",
+    "eslint-plugin-import": "^2.22.1"
   },
   "scripts": {
     "publish-scope": "node ./publish"
   },
-  "devDependencies": {}
+  "dependencies": {}
 }

package/server-es6.js

@@ -1,10 +1,10 @@
+const { getExtends, getPlugins, getOverrides } = require('./utils');
 const server = require('./shared/server');
-const svelte = require('./overrides/svelte');
 
 module.exports = {
-  extends: 'airbnb-base',
+  extends: getExtends(),
   parser: 'babel-eslint',
-  plugins: ['svelte3'],
+  plugins: getPlugins(),
+  overrides: getOverrides(),
   ...server,
-  overrides: [svelte],
 };

package/universal.js

@@ -1,31 +1,16 @@
+const { getExtends, getPlugins, getOverrides } = require('./utils');
+
 const server = require('./shared/server');
 const client = require('./shared/client');
-const vue = require('./overrides/vue');
-const svelte = require('./overrides/svelte');
 
 module.exports = {
-  extends: ['airbnb-base', 'plugin:vue/recommended'],
-  plugins: ['vue', 'svelte3'],
+  extends: getExtends(),
+  plugins: getPlugins(),
   parserOptions: {
     parser: 'babel-eslint',
     sourceType: 'module',
   },
   overrides: [
-    {
-      files: [
-        '*.svelte',
-        'app_src/index.js',
-        'app_src/hooks.js',
-        'app_src/server/**/*.js',
-        'app_src/config/index.js',
-        'app_src/config/server/**/*.js',
-        'app_config/index.js',
-        'app_config/server/**/*.js',
-        'app_config_global/index.js',
-        'app_config_global/server/**/*.js',
-      ],
-      ...server,
-    },
     {
       files: [
         '*.vue',
@@ -41,7 +26,20 @@ module.exports = {
       ],
       ...client,
     },
-    vue,
-    svelte,
-  ],
+    {
+      files: [
+        '*.svelte',
+        'app_src/index.js',
+        'app_src/hooks.js',
+        'app_src/server/**/*.js',
+        'app_src/config/index.js',
+        'app_src/config/server/**/*.js',
+        'app_config/index.js',
+        'app_config/server/**/*.js',
+        'app_config_global/index.js',
+        'app_config_global/server/**/*.js',
+      ],
+      ...server,
+    },
+  ].concat(getOverrides()),
 };

package/utils/index.js

@@ -0,0 +1,39 @@
+const isRequireable = (id) => {
+  try {
+    require.resolve(id, {
+      paths: [process.cwd()],
+    });
+    return true;
+  } catch (e) {
+    return false;
+  }
+};
+
+const hasVue = isRequireable('eslint-plugin-vue');
+const hasSvelte = isRequireable('eslint-plugin-svelte3');
+
+const getExtends = () => {
+  const extend = ['airbnb-base'];
+  if (hasVue) extend.push('plugin:vue/recommended');
+  return extend;
+};
+
+const getPlugins = () => {
+  const plugins = [];
+  if (hasVue) plugins.push('vue');
+  if (hasSvelte) plugins.push('svelte3');
+  return plugins;
+};
+
+const getOverrides = () => {
+  const overrides = [];
+  if (hasVue) overrides.push(require('../overrides/vue'));
+  if (hasSvelte) overrides.push(require('../overrides/svelte'));
+  return overrides;
+};
+
+module.exports = {
+  getExtends,
+  getPlugins,
+  getOverrides,
+};