generator-folklore 2.2.49 → 2.2.53

package/lib/generators/app/index.js

@@ -6,9 +6,9 @@ var _generator = _interopRequireDefault(require("../../lib/generator"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 

package/lib/generators/build/index.js

@@ -10,9 +10,9 @@ var _generator = _interopRequireDefault(require("../../lib/generator"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -247,8 +247,8 @@ module.exports = class AppGenerator extends _generator.default {
         const destPath = this.destinationPath('package.json');
         const currentData = this.fs.exists(destPath) ? this.fs.readJSON(destPath) : {};
 
-        const newData = _objectSpread({}, currentData, {
-          scripts: _objectSpread({}, currentData.scripts || null, {}, scripts)
+        const newData = _objectSpread(_objectSpread({}, currentData), {}, {
+          scripts: _objectSpread(_objectSpread({}, currentData.scripts || null), scripts)
         });
 
         this.fs.writeJSON(destPath, newData);
@@ -267,7 +267,8 @@ module.exports = class AppGenerator extends _generator.default {
         const devDependencies = [// Loaders
         'babel-loader@latest', 'css-loader@latest', 'eslint-loader@latest', 'file-loader@latest', 'postcss-loader@latest', 'sass-loader@latest', 'style-loader@latest', 'url-loader@latest', // Plugins
         'html-webpack-plugin@^4.0.0-alpha.2', 'webpack-manifest-plugin@latest', 'case-sensitive-paths-webpack-plugin@latest', 'postcss-preset-env@latest', 'postcss-safe-parser@latest', 'postcss-flexbugs-fixes@latest', 'pnp-webpack-plugin@latest', 'babel-preset-react-app@^6.1.0', 'babel-plugin-named-asset-import@latest', 'terser-webpack-plugin@latest', 'mini-css-extract-plugin@latest', 'optimize-css-assets-webpack-plugin@latest', 'workbox-webpack-plugin@latest', // Others
-        'autoprefixer@latest', 'cssnano@latest', 'chalk@latest', 'dotenv@latest', 'dotenv-expand@latest', 'node-sass@latest', 'fs-extra@latest', 'glob@latest', 'pretty-bytes@latest', 'react-dev-utils@^6.1.1', 'webpack@^4.0'];
+        'autoprefixer@latest', 'cssnano@latest', 'chalk@latest', 'dotenv@latest', 'dotenv-expand@latest', 'node-sass@latest', 'fs-extra@latest', 'glob@latest', 'pretty-bytes@latest', 'react-dev-utils@^10.0.0', 'webpack@^4.0' // TODO: update webpack 4
+        ];
         const dependencies = ['whatwg-fetch', 'core-js@^2.4.0', 'promise', 'raf', 'lodash@latest', 'object-assign'];
 
         if (this.options.server) {

package/lib/generators/build/templates/scripts/server.js

@@ -19,7 +19,7 @@ process.env.NODE_ENV = 'development';
 // Makes the script crash on unhandled rejections instead of silently
 // ignoring them. In the future, promise rejections that are not handled will
 // terminate the Node.js process with a non-zero exit code.
-process.on('unhandledRejection', (err) => {
+process.on('unhandledRejection', err => {
     throw err;
 });
 
@@ -49,15 +49,16 @@ const createDevServerConfig = require('../webpackDevServer.config');
 const useYarn = fs.existsSync(paths.yarnLockFile);
 const isInteractive = process.stdout.isTTY;
 
-const webpackConfigs = program.config !== null
-    ? program.config.map(configPath => require(path.join(process.env.PWD, configPath)))
-    : defaultWebpackConfig;
+const webpackConfigs =
+    program.config !== null
+        ? program.config.map(configPath => require(path.join(process.env.PWD, configPath)))
+        : defaultWebpackConfig;
 
 const entries = isArray(webpackConfigs)
     ? webpackConfigs.reduce(
-        (allEntries, webpackConfig) => [...allEntries, ...webpackConfig.entry],
-        [],
-    )
+          (allEntries, webpackConfig) => [...allEntries, ...webpackConfig.entry],
+          [],
+      )
     : webpackConfigs.entry;
 
 // Warn and crash if required files are missing
@@ -90,43 +91,65 @@ const { checkBrowsers } = require('react-dev-utils/browsersHelper');
 
 function mayProxy(pathname) {
     const maybePublicPath = path.resolve(paths.appPublic, pathname.slice(1));
-    return !fs.existsSync(maybePublicPath) || fs.lstatSync(maybePublicPath).isDirectory();
+    return (
+        !pathname.startsWith('/sockjs-node') &&
+        (!fs.existsSync(maybePublicPath) || fs.lstatSync(maybePublicPath).isDirectory())
+    );
 }
 
 checkBrowsers(paths.appPath, isInteractive)
     .then(() => choosePort(HOST, DEFAULT_PORT))
-    .then((port) => {
+    .then(port => {
         if (port == null) {
             // We have not found a port.
             return;
         }
+
         const protocol = process.env.HTTPS === 'true' || config.https ? 'https' : 'http';
         const appName = require(paths.appPackageJson).name;
         const urls = prepareUrls(protocol, HOST, port);
+        let devServer;
+        const devSocket = {
+            warnings: warnings => devServer.sockWrite(devServer.sockets, 'warnings', warnings),
+            errors: errors => devServer.sockWrite(devServer.sockets, 'errors', errors),
+        };
         // Create a webpack compiler that is configured with custom messages.
-        const compiler = createCompiler(webpack, webpackConfigs, appName, urls, useYarn);
+        // const compiler = createCompiler(webpack, webpackConfigs, appName, urls, useYarn);
+        const compiler = createCompiler({
+            appName,
+            urls,
+            useYarn,
+            webpack,
+            devSocket,
+            config: webpackConfigs,
+        });
         // Load proxy config
         const proxySetting = config.proxy || require(paths.appPackageJson).proxy;
         const proxyConfig = prepareProxy(proxySetting, paths.appPublic) || null;
         // Serve webpack assets generated by the compiler over a web server.
         const serverConfig = createDevServerConfig(
-            proxyConfig !== null ? [
-                {
-                    ...proxyConfig[0],
-                    context(pathname, req) {
-                        return (
-                            req.method !== 'GET' || pathname === '/' || (mayProxy(pathname) && req.headers.accept)
-                        );
-                    },
-                    changeOrigin: false,
-                    autoRewrite: true,
-                },
-            ] : null,
+            // proxyConfig,
+            proxyConfig !== null
+                ? [
+                      {
+                          ...proxyConfig[0],
+                          context(pathname, req) {
+                              return (
+                                  req.method !== 'GET' ||
+                                  pathname === '/' ||
+                                  (mayProxy(pathname) && req.headers.accept)
+                              );
+                          },
+                          changeOrigin: false,
+                          autoRewrite: true,
+                      },
+                  ]
+                : null,
             urls.lanUrlForConfig,
         );
-        const devServer = new WebpackDevServer(compiler, serverConfig);
+        devServer = new WebpackDevServer(compiler, serverConfig);
         // Launch WebpackDevServer.
-        devServer.listen(port, HOST, (err) => {
+        devServer.listen(port, HOST, err => {
             if (err) {
                 console.log(err);
                 return;
@@ -138,16 +161,16 @@ checkBrowsers(paths.appPath, isInteractive)
             openBrowser(urls.localUrlForBrowser);
         });
 
-        ['SIGINT', 'SIGTERM'].forEach((sig) => {
+        ['SIGINT', 'SIGTERM'].forEach(sig => {
             process.on(sig, () => {
                 devServer.close();
                 process.exit();
             });
         });
     })
-    .catch((err) => {
+    .catch(err => {
         if (err && err.message) {
-            console.log(err.message);
+            console.log(err);
         }
         process.exit(1);
     });

package/lib/generators/build/templates/webpackDevServer.config.js

@@ -58,6 +58,9 @@ module.exports = (proxy, allowedHost) => ({
     // in the Webpack development configuration. Note that only changes
     // to CSS are currently hot reloaded. JS changes will refresh the browser.
     hot: true,
+    // Use 'ws' instead of 'sockjs-node' on server since we're using native
+    // websockets in `webpackHotDevClient`.
+    transportMode: 'ws',
     // It is important to tell WebpackDevServer to use the same "root" path
     // as we specified in the config. In development, we always serve from /.
     publicPath: webpackConfig.output.publicPath,

package/lib/generators/docs/index.js

@@ -10,9 +10,9 @@ var _generator = _interopRequireDefault(require("../../lib/generator"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -128,7 +128,7 @@ module.exports = class DocsGenerator extends _generator.default {
         };
         const destPath = this.destinationPath('package.json');
         const packageJSON = this.fs.exists(destPath) ? this.fs.readJSON(destPath) : {};
-        packageJSON.scripts = _objectSpread({}, packageJSON.scripts, {}, scripts);
+        packageJSON.scripts = _objectSpread(_objectSpread({}, packageJSON.scripts), scripts);
         this.fs.writeJSON(destPath, packageJSON);
       }
 

package/lib/generators/js/templates/src/components/App.jsx

@@ -4,7 +4,7 @@ import { connect } from 'react-redux';
 import { Route, Switch, useHistory } from 'react-router';
 import { useUrlGenerator } from '@folklore/react-container';
 
-import * as AppPropTypes from '../lib/PropTypes';
+// import * as AppPropTypes from '../lib/PropTypes';
 import { resetRequest as resetRequestAction } from '../actions/SiteActions';
 import MainLayout from './layouts/Main';
 import HomePage from './pages/Home';

package/lib/generators/laravel/index.js

@@ -16,9 +16,9 @@ var _generator = _interopRequireDefault(require("../../lib/generator"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -376,7 +376,7 @@ module.exports = class LaravelGenerator extends _generator.default {
           url: urlLocal
         };
 
-        const prodTemplateData = _objectSpread({}, templateData, {
+        const prodTemplateData = _objectSpread(_objectSpread({}, templateData), {}, {
           url,
           db_username: this.options['db-name']
         });

package/lib/generators/lerna-package/templates/gitignore

@@ -34,4 +34,3 @@ publish
 /lib
 /es
 /dist
-/package-lock.json

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "generator-folklore",
-    "version": "2.2.49",
+    "version": "2.2.53",
     "description": "Yeoman generator for projects at Folklore",
     "keywords": [
         "yeoman-generator"
@@ -39,5 +39,5 @@
         "yeoman-generator": "^2.0.3",
         "yeoman-remote": "^1.0.1"
     },
-    "gitHead": "e60d3fecf3baf683fb8b42b9391099e80d558b64"
+    "gitHead": "55a5d3ae12a27c5319c5e1d6c2a8ed3b9a02cb71"
 }