Skip to content

Codestyle #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
easingthemes merged 5 commits into from
May 21, 2021
Merged

Codestyle #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
544199d
Fixes #5
quicoto May 21, 2021
79c3d2c
Fixes #6
quicoto May 21, 2021
6cb8310
Fixes #3
quicoto May 21, 2021
27edf3f
refactor: Code styling
quicoto May 21, 2021
f07e84c
Merge branch 'codestyle' of https://github.com/Netcentric/fe-build in…
quicoto May 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions config/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
const general = require('./general.config.js');
const plugins = require('./plugins.config');
const eslint = require('./eslint.config');
const babel = require('./babel.config');
const output = require('./output.config');
const optimization = require('./optimization.config');
const clientlibs = require('./clientlibs.config');
const eslint = require('./eslint.config');
const general = require('./general.config.js');
const optimization = require('./optimization.config');
const output = require('./output.config');
const plugins = require('./plugins.config');
const postcss = require('./postcss.config');
const resolve = require('./resolve.config');
const sass = require('./sass.config');
const stylelint = require('./stylelint.config');
const resolve = require('./resolve.config');
const postcss = require('./postcss.config');
const templates = require('./templates.config');

const modules = general.modules;
Expand Down
2 changes: 1 addition & 1 deletion tasks/clientlibs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const renderClientLibs = require('../utils/renderClientLibs');

// extend log to proper say what file is running
module.exports = (config) => {
log(__filename, 'clientlibs task running....', '', 'info', true);
log(__filename, 'clientlibs task running...', '', 'info', true);

// checking all entries at this configuration
const entries = {
Expand Down
4 changes: 2 additions & 2 deletions tasks/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const renderStyles = require('../utils/renderStyles');
module.exports = (config) => {
if (config && config.general && config.general.watch) {
try {
log(__filename, 'Watcher Sass / autoprefixer running....', '', 'info', true);
log(__filename, 'Watcher Sass / autoprefixer running...', '', 'info', true);

const gaze = require('gaze');
const sassPattern = path.join(config.general.sourcesPath, `**/*.${config.general.sourceKey}.scss`);
Expand All @@ -31,7 +31,7 @@ module.exports = (config) => {
log(__filename, 'Something is missing did you run `ncps fe-install`?', e.message, 'error');
}
} else {
log(__filename, 'Sass / autoprefixer running....', '', 'info', true);
log(__filename, 'Sass / autoprefixer running...', '', 'info', true);

// checking all entries at this configuration
const entries = generateEntries(config, 'scss');
Expand Down
2 changes: 1 addition & 1 deletion tasks/webpack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module.exports = (config) => {
};

// log at the beginning
log(__filename, 'Webpack transpile running....', '', 'info', true);
log(__filename, 'Webpack transpile running...', '', 'info', true);

// extract from flatten configs to webpack
const { output, plugins, optimization, resolve, externals } = config;
Expand Down
2 changes: 1 addition & 1 deletion utils/renderPostcss.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module.exports = function renderPostcss(input, outFile, config, cb) {
// try to dynamic load of postcss plugins
/* eslint-disable */
const runPlugins = plugins.map(plugin => require(plugin));
const map = !config.general.isProduction ? { inline: input.map.toString() } : false;
const map = config.general.isProduction ? false : { inline: input.map.toString() } ;

/* eslint-enable */
// run postcss plugins at sass output
Expand Down
2 changes: 1 addition & 1 deletion utils/writeFile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ module.exports = function writeFile(filepath, content, override = false) {
fs.writeFileSync(filepath, content,
err => log(__filename, 'error', `could not write file: ${err.Error},'\n ${err.path}`, 'error'));

log(__filename, `write file....${filepath}`, '', 'info', true);
log(__filename, `write file...${filepath}`, '', 'info', true);
};