diff --git a/packages/build/package.json b/packages/build/package.json index a16918f..c0acece 100644 --- a/packages/build/package.json +++ b/packages/build/package.json @@ -8,9 +8,9 @@ "latus-build": "./build.js" }, "scripts": { - "build": "LATUS_POSTCSS_CONFIG=./src/build/postcss.config.js LATUS_WEBPACK_CONFIG=./src/build/webpack.config.js NODE_PATH=./node_modules webpack --config ./webpack.config.js --mode production", + "build": "LATUS_ESLINT_CONFIG=./.eslintrc.js LATUS_POSTCSS_CONFIG=./src/build/postcss.config.js LATUS_WEBPACK_CONFIG=./src/build/webpack.config.js NODE_PATH=./node_modules webpack --config ./webpack.config.js --mode production", "fp": "npm unpublish --force $(node -e 'const {name, version} = require(`./package.json`); process.stdout.write(`${name}@${version}`)') && npm publish", - "lint": "NODE_PATH=./node_modules eslint --config ./.eslintrc.js --format codeframe --ext mjs,js .", + "lint": "NODE_PATH=./node_modules eslint --config ./src/build/.eslintrc.js --format codeframe --ext mjs,js .", "test": "yarn --silent run build --display none && mocha --colors test.js" }, "files": [ diff --git a/packages/build/src/build.js b/packages/build/src/build.js index 57f1775..0d32f81 100755 --- a/packages/build/src/build.js +++ b/packages/build/src/build.js @@ -1,4 +1,3 @@ -/* eslint-disable */ import {spawn} from 'child_process'; import {statSync} from 'fs'; import {join, normalize} from 'path'; @@ -17,9 +16,10 @@ const localConfig = (filename) => { statSync(localConfig); configFile = localConfig; } + // eslint-disable-next-line no-empty catch (error) {} return configFile; -} +}; const build = async (args = []) => { const {production} = program.opts(); @@ -142,7 +142,6 @@ program }); const lint = () => { - const {production} = program.opts(); const configFile = localConfig('.eslintrc.js'); spawn( 'eslint', @@ -173,8 +172,6 @@ program const test = async () => { process.argv.splice(2, 1); await build(['--display', 'none']); - const {production} = program.opts(); - const configFile = localConfig('.eslintrc.js'); spawn( 'mocha', [ diff --git a/packages/build/src/build/.eslint.defaults.js b/packages/build/src/build/.eslint.defaults.js index 1dccaa0..a7704fa 100644 --- a/packages/build/src/build/.eslint.defaults.js +++ b/packages/build/src/build/.eslint.defaults.js @@ -1,5 +1,5 @@ const { - LATUS_WEBPACK_CONFIG = require.resolve('@latus/build/build/webpack.config.js'), + LATUS_WEBPACK_CONFIG = require.resolve('./webpack.config.js'), } = process.env; const config = { diff --git a/packages/build/src/build/.neutrinorc.js b/packages/build/src/build/.neutrinorc.js index 069d0b7..0b53246 100644 --- a/packages/build/src/build/.neutrinorc.js +++ b/packages/build/src/build/.neutrinorc.js @@ -7,7 +7,8 @@ const react = require('@neutrinojs/react'); const nodeExternals = require('webpack-node-externals'); const { - LATUS_POSTCSS_CONFIG = require.resolve('@latus/build/build/postcss.config.js'), + LATUS_ESLINT_DEFAULTS = require.resolve('./.eslint.defaults.js'), + LATUS_POSTCSS_CONFIG = require.resolve('./postcss.config.js'), } = process.env; module.exports = { @@ -16,7 +17,7 @@ module.exports = { airbnb({ eslint: { cache: false, - baseConfig: require(`${__dirname}/.eslint.defaults`), + baseConfig: require(LATUS_ESLINT_DEFAULTS), }, }), (neutrino) => { diff --git a/packages/build/src/build/webpack.config.js b/packages/build/src/build/webpack.config.js index 21162c6..9e0528d 100644 --- a/packages/build/src/build/webpack.config.js +++ b/packages/build/src/build/webpack.config.js @@ -1,7 +1,7 @@ const neutrino = require('neutrino'); const { - LATUS_NEUTRINO_CONFIG = require.resolve('@latus/build/build/.neutrinorc.js'), + LATUS_NEUTRINO_CONFIG = require.resolve('./.neutrinorc.js'), } = process.env; module.exports = neutrino(require(LATUS_NEUTRINO_CONFIG)).webpack();