diff options
| author | n-peugnet <n.peugnet@free.fr> | 2019-11-17 16:29:21 +0100 |
|---|---|---|
| committer | n-peugnet <n.peugnet@free.fr> | 2019-11-17 16:30:10 +0100 |
| commit | 169f2b097bb7ffcab1b536d66437165e9c4ea2d8 (patch) | |
| tree | acfeff973269ae4fa4d14b81fdb1acfb791c33ca | |
| parent | 698a6d274e1c909e4e7be56fa9d15296706464b5 (diff) | |
| download | wcms-169f2b097bb7ffcab1b536d66437165e9c4ea2d8.tar.gz wcms-169f2b097bb7ffcab1b536d66437165e9c4ea2d8.zip | |
chore: minor file changes
- rename LICENSE.md into LICENSE
- move some vars in Makefile
- move prettier config outside of webpack config
| -rw-r--r-- | LICENSE (renamed from LICENSE.md) | 0 | ||||
| -rw-r--r-- | Makefile | 22 | ||||
| -rw-r--r-- | package.json | 5 | ||||
| -rw-r--r-- | webpack.config.js | 6 |
4 files changed, 17 insertions, 16 deletions
@@ -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', |