From 169f2b097bb7ffcab1b536d66437165e9c4ea2d8 Mon Sep 17 00:00:00 2001
From: n-peugnet <n.peugnet@free.fr>
Date: Sun, 17 Nov 2019 16:29:21 +0100
Subject: chore: minor file changes

- rename LICENSE.md into LICENSE
- move some vars in Makefile
- move prettier config outside of webpack config
---
 LICENSE           | 21 +++++++++++++++++++++
 LICENSE.md        | 21 ---------------------
 Makefile          | 22 +++++++++++-----------
 package.json      |  5 +++++
 webpack.config.js |  6 +-----
 5 files changed, 38 insertions(+), 37 deletions(-)
 create mode 100644 LICENSE
 delete mode 100644 LICENSE.md

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..4d7a09c
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Vincent Peugnet
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/LICENSE.md b/LICENSE.md
deleted file mode 100644
index 4d7a09c..0000000
--- a/LICENSE.md
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018 Vincent Peugnet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 720127e..53ea1b1 100644
--- a/Makefile
+++ b/Makefile
@@ -2,22 +2,22 @@ include .default.env
 include .env
 export
 
-build_dir := build
+build_dir  := build
+js_src_dir := src
 
 # Misc variables.
-PATH := vendor/bin:node_modules/.bin:$(PATH)
-override GIT_VERSION := $(shell git --no-pager describe --always --tags)
-override CUR_VERSION := $(strip $(shell cat VERSION 2>/dev/null))
-override WEBPACK_FLAGS += $(if $(filter $(ENV),dist),-p)
+PATH                    := vendor/bin:node_modules/.bin:$(PATH)
+override GIT_VERSION    := $(shell git --no-pager describe --always --tags)
+override CUR_VERSION    := $(strip $(shell cat VERSION 2>/dev/null))
+override WEBPACK_FLAGS  += $(if $(filter $(ENV),dist),-p)
 override COMPOSER_FLAGS += $(if $(filter $(ENV),dist),--no-dev --prefer-dist)
-PREV_ENV_FILE := $(build_dir)/prev_env
-PREV_ENV := $(strip $(shell cat $(PREV_ENV_FILE) 2>/dev/null))
+PREV_ENV_FILE           := $(build_dir)/prev_env
+PREV_ENV                := $(strip $(shell cat $(PREV_ENV_FILE) 2>/dev/null))
 
 # Files variables.
-js_src_dir := src
-js_sources := $(wildcard $(js_src_dir)/*.js)
-js_bundles := $(js_sources:$(js_src_dir)/%.js=assets/js/%.bundle.js)
-js_srcmaps := $(js_sources:$(js_src_dir)/%.js=assets/js/%.bundle.js.map)
+js_sources  := $(wildcard $(js_src_dir)/*.js)
+js_bundles  := $(js_sources:$(js_src_dir)/%.js=assets/js/%.bundle.js)
+js_srcmaps  := $(js_sources:$(js_src_dir)/%.js=assets/js/%.bundle.js.map)
 zip_release := dist/w_cms_$(GIT_VERSION).zip
 
 # Default target. This executes everything targets needed to get a fully
diff --git a/package.json b/package.json
index e2c0a41..ea3dc0e 100644
--- a/package.json
+++ b/package.json
@@ -15,5 +15,10 @@
     "style-loader": "^1.0.0",
     "webpack": "^4.41.2",
     "webpack-cli": "^3.3.9"
+  },
+  "prettier": {
+    "tabWidth": 4,
+    "trailingComma": "es5",
+    "singleQuote": true
   }
 }
diff --git a/webpack.config.js b/webpack.config.js
index 9c6607d..c256ad2 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -35,11 +35,7 @@ module.exports = (env) => {
 			],
 		},
 		plugins: [
-			new PrettierPlugin({
-				tabWidth: 4,
-				trailingComma: 'es5',
-				singleQuote: true,
-			})
+			new PrettierPlugin(),
 		],
 		externals: {
 			'@sentry/browser': 'Sentry',
-- 
cgit v1.2.3