[chore] moving webpack scripts to scripts folder.

Author: diasbruno

Makefile

@@ -1,7 +1,9 @@
-NODE=$(shell which node)
-NPM=$(shell which npm)
-YARN=$(shell which yarn)
-JQ=$(shell which jq)
+NODE=$(shell which node 2> /dev/null)
+NPM=$(shell which npm 2> /dev/null)
+YARN=$(shell which yarn 2> /dev/null)
+JQ=$(shell which jq 2> /dev/null)
+
+PKM?=$(if $(YARN),$(YARN),$(shell which npm))
 
 BABEL=./node_modules/.bin/babel
 COVERALLS=./node_modules/coveralls/bin/coveralls.js
@@ -29,10 +31,9 @@ help: info
 	@echo "  make publish-all      - publish version and docs."
 
 info:
-	@echo node version: `$(NODE) --version` "($(NODE))"
-	@echo npm version: `$(NPM) --version` "($(NPM))"
-	@echo yarn version: `$(YARN) --version` "($(YARN))"
-	@echo jq version: `$(JQ) --version` "($(JQ))"
+	@[[ ! -z "$(NODE)" ]] && echo node version: `$(NODE) --version` "$(NODE)"
+	@[[ ! -z "$(PKM)" ]] && echo $(shell basename $(PKM)) version: `$(PKM) --version` "$(PKM)"
+	@[[ ! -z "$(JQ)" ]] && echo jq version: `$(JQ) --version` "$(JQ)"
 
 deps: deps-project deps-docs
 
@@ -54,7 +55,7 @@ tests-single-run:
 	@npm run test -- --single-run
 
 coveralls:
-	-cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js 2>/dev/null
+	-cat ./coverage/lcov.info | $(COVERALLS) 2>/dev/null
 
 tests-ci: clean lint
 	@COVERAGE=$(COVERAGE) make tests-single-run coveralls
@@ -91,7 +92,7 @@ compile:
 
 build: compile
 	@echo "[Building dists]"
-	@./node_modules/.bin/webpack --config webpack.dist.config.js
+	@./node_modules/.bin/webpack --config ./scripts/webpack.dist.config.js
 
 release-commit:
 	git commit --allow-empty -m "Release v`cat .version`."

bootstrap.sh

@@ -18,7 +18,7 @@ module.exports = function(config) {
 
     files: ['./specs/index.js'],
 
-    webpack: require('./webpack.test.config'),
+    webpack: require('./scripts/webpack.test.config'),
 
     webpackMiddleware: { stats: 'errors-only' },
 

karma.conf.js

@@ -14,7 +14,7 @@
     "example": "examples"
   },
   "scripts": {
-    "start": "./node_modules/.bin/webpack-dev-server --inline --host 127.0.0.1 --content-base examples/",
+    "start": "npx webpack-dev-server --config ./scripts/webpack.config.js --inline --host 127.0.0.1 --content-base examples/",
     "test": "cross-env NODE_ENV=test karma start",
     "lint": "eslint src/ specs/"
   },

package.json

@@ -0,0 +1,20 @@
+const path = require('path');
+
+module.exports = {
+  mode: 'development',
+  output: {
+    filename: '[name].js',
+    path: path.resolve(__dirname, './examples/__build__'),
+    publicPath: '/__build__/'
+  },
+  module: {
+    rules: [
+      { test: /\.js$/, exclude: /node_modules/, use: { loader: 'babel-loader' } }
+    ]
+  },
+  resolve: {
+    alias: {
+      "react-modal": path.resolve(__dirname, "../src")
+    }
+  }
+};

scripts/defaultConfig.js

@@ -0,0 +1,29 @@
+const fs = require('fs');
+const path = require('path');
+const webpack = require('webpack');
+const defaultConfig = require('./defaultConfig'); 
+
+var EXAMPLES_DIR = path.resolve(__dirname, '../examples');
+
+function isDirectory(dir) {
+  return fs.lstatSync(dir).isDirectory();
+}
+
+function buildEntries() {
+  return fs.readdirSync(EXAMPLES_DIR).reduce(function (entries, dir) {
+    if (dir === 'build')
+      return entries;
+
+    var isDraft = dir.charAt(0) === '_';
+
+    if (!isDraft && isDirectory(path.join(EXAMPLES_DIR, dir)))
+      entries[dir] = path.join(EXAMPLES_DIR, dir, 'app.js');
+
+    return entries;
+  }, {});
+}
+
+module.exports = {
+  ...defaultConfig,
+  entry: buildEntries(),
+};

scripts/webpack.config.js

@@ -1,55 +1,45 @@
-var webpack = require('webpack');
-var path = require('path');
+const webpack = require('webpack');
+const path = require('path');
+const defaultConfig = require('./defaultConfig');
 
-var reactExternal = {
+const reactExternal = {
   root: 'React',
   commonjs2: 'react',
   commonjs: 'react',
   amd: 'react'
 };
-var reactDOMExternal = {
+const reactDOMExternal = {
   root: 'ReactDOM',
   commonjs2: 'react-dom',
   commonjs: 'react-dom',
   amd: 'react-dom'
 };
 
 module.exports = {
+  ...defaultConfig,
   mode: 'production',
-
   entry: {
-    'react-modal': './src/index.js',
-    'react-modal.min': './src/index.js'
+    'react-modal': path.resolve(__dirname, '../src/index.js'),
+    'react-modal.min': path.resolve(__dirname, '../src/index.js')
   },
-
   externals: {
     'react': reactExternal,
     'react-dom': reactDOMExternal
   },
-
   output: {
     filename: '[name].js',
     chunkFilename: '[id].chunk.js',
-    path: path.resolve(__dirname, 'dist'),
+    path: path.resolve(__dirname, '../dist'),
     publicPath: '/',
     libraryTarget: 'umd',
     library: 'ReactModal'
   },
-
   optimization: {
     minimize: true
   },
-
   plugins: [
     new webpack.DefinePlugin({
       'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV)
     })
-  ],
-
-  module: {
-    rules: [
-      { test: /\.js?$/, exclude: /node_modules/, use: { loader: 'babel-loader' } }
-    ]
-  }
-
+  ]
 };

webpack.dist.config.js renamed to scripts/webpack.dist.config.js

@@ -0,0 +1,21 @@
+const path = require('path');
+const defaultConfig = require('./defaultConfig');
+
+module.exports = {
+  ...defaultConfig,
+  plugins: [],
+  entry: path.resolve(__dirname, '../specs/index.js'),
+  devtool: 'inline-source-map',
+  module: {
+    ...defaultConfig.module,
+    rules: [
+      {
+        test: /\.js$/,
+        use: { loader: 'istanbul-instrumenter-loader' },
+        enforce: 'post',
+        include: path.resolve(__dirname, '../src')
+      },
+      ...defaultConfig.module.rules
+    ]
+  }
+};