generator-folklore 3.0.21 → 3.0.23

package/lib/generators/app/index.js

@@ -2,11 +2,11 @@
 
 var _chalk = _interopRequireDefault(require("chalk"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 module.exports = class AppGenerator extends _generator.default {
   // The name `constructor` is important here

package/lib/generators/babel/index.js

@@ -3,7 +3,7 @@
 var _chalk = _interopRequireDefault(require("chalk"));
 var _path = _interopRequireDefault(require("path"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 module.exports = class BabelGenerator extends _generator.default {
   constructor(...args) {
     super(...args);

package/lib/generators/browserslist/index.js

@@ -2,7 +2,7 @@
 
 var _chalk = _interopRequireDefault(require("chalk"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 module.exports = class BrowsersListGenerator extends _generator.default {
   get prompting() {
     return {

package/lib/generators/build/index.js

@@ -5,7 +5,7 @@ var _isArray = _interopRequireDefault(require("lodash/isArray"));
 var _path = _interopRequireDefault(require("path"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
 var _utils = require("../../lib/utils");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 module.exports = class AppGenerator extends _generator.default {
   // The name `constructor` is important here
   constructor(...args) {

package/lib/generators/cli/index.js

@@ -4,7 +4,7 @@ var _chalk = _interopRequireDefault(require("chalk"));
 var _lodash = _interopRequireDefault(require("lodash"));
 var _path = _interopRequireDefault(require("path"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 module.exports = class CliGenerator extends _generator.default {
   // The name `constructor` is important here
   constructor(...args) {

package/lib/generators/docs/index.js

@@ -4,11 +4,11 @@ var _chalk = _interopRequireDefault(require("chalk"));
 var _lodash = _interopRequireDefault(require("lodash"));
 var _path = _interopRequireDefault(require("path"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 module.exports = class DocsGenerator extends _generator.default {
   constructor(...args) {

package/lib/generators/editorconfig/index.js

@@ -2,7 +2,7 @@
 
 var _chalk = _interopRequireDefault(require("chalk"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 module.exports = class EditorConfigGenerator extends _generator.default {
   prompting() {
     if (this.options.quiet) {

package/lib/generators/eslint/index.js

@@ -2,7 +2,7 @@
 
 var _chalk = _interopRequireDefault(require("chalk"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 module.exports = class EslintGenerator extends _generator.default {
   prompting() {
     if (this.options.quiet) {

package/lib/generators/html-project/index.js

@@ -4,7 +4,7 @@ var _chalk = _interopRequireDefault(require("chalk"));
 var _lodash = _interopRequireDefault(require("lodash"));
 var _path = _interopRequireDefault(require("path"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 module.exports = class HTMLProjectGenerator extends _generator.default {
   // The name `constructor` is important here
   constructor(...args) {

package/lib/generators/intl/index.js

@@ -3,7 +3,7 @@
 var _chalk = _interopRequireDefault(require("chalk"));
 var _path = _interopRequireDefault(require("path"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 module.exports = class IntlGenerator extends _generator.default {
   constructor(...args) {
     super(...args);

package/lib/generators/laravel/index.js

@@ -7,11 +7,11 @@ var _path = _interopRequireDefault(require("path"));
 var _chalk = _interopRequireDefault(require("chalk"));
 var _passwordGenerator = _interopRequireDefault(require("password-generator"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 module.exports = class LaravelGenerator extends _generator.default {
   static safeDbString(str) {

package/lib/generators/laravel-auth/index.js

@@ -5,7 +5,7 @@ var _chalk = _interopRequireDefault(require("chalk"));
 var _glob = _interopRequireDefault(require("glob"));
 var _path = _interopRequireDefault(require("path"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 module.exports = class LaravelAuthGenerator extends _generator.default {
   constructor(...args) {
     super(...args);

package/lib/generators/laravel-mediatheque/index.js

@@ -5,7 +5,7 @@ var _glob = _interopRequireDefault(require("glob"));
 var _lodash = _interopRequireDefault(require("lodash"));
 var _path = _interopRequireDefault(require("path"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 module.exports = class LaravelMediathequeGenerator extends _generator.default {
   constructor(...args) {
     super(...args);

package/lib/generators/laravel-package/index.js

@@ -5,7 +5,7 @@ var _chalk = _interopRequireDefault(require("chalk"));
 var _path = _interopRequireDefault(require("path"));
 var _changeCase = require("change-case");
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 module.exports = class ComposerPackageGenerator extends _generator.default {
   constructor(...args) {
     super(...args);

package/lib/generators/laravel-panneau/index.js

@@ -7,7 +7,7 @@ var _glob = _interopRequireDefault(require("glob"));
 var _lodash = _interopRequireDefault(require("lodash"));
 var _path = _interopRequireDefault(require("path"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 module.exports = class LaravelPanneauGenerator extends _generator.default {
   constructor(...args) {
     super(...args);

package/lib/generators/laravel-panneau/templates/app/Http/Resources/BlockResource.php

@@ -6,6 +6,8 @@ use Illuminate\Http\Resources\Json\JsonResource;
 use Folklore\Contracts\Resources\HasBlocks;
 use Folklore\Http\Resources\LocalizedResource;
 use App\Contracts\Resources\Blocks\Text as TextBlock;
+use App\Contracts\Resources\Blocks\ImageBlock as ImageBlock;
+use Folklore\Http\Resources\MediaResource;
 
 class BlockResource extends JsonResource
 {
@@ -18,7 +20,6 @@ class BlockResource extends JsonResource
     public function toArray($request)
     {
         $type = $this->type();
-        $locale = $request->locale();
         return [
             'id' => $this->id(),
             'type' => $type,
@@ -27,9 +28,27 @@ class BlockResource extends JsonResource
                 return !is_null($blocks) ? new BlocksCollection($blocks) : [];
             }),
 
-            $this->mergeWhen($this->resource instanceof TextBlock, function () use ($locale) {
+            $this->mergeWhen($this->resource instanceof TextBlock, function () {
                 return [
-                    'body' => $this->body($locale),
+                    'title' => new LocalizedResource(function ($locale) {
+                        return $this->title($locale);
+                    }),
+                    'body' => new LocalizedResource(function ($locale) {
+                        return $this->body($locale);
+                    }),
+                ];
+            }),
+
+            $this->mergeWhen($this->resource instanceof ImageBlock, function () {
+                $image = $this->image();
+                return [
+                    'image' => !empty($image) ? new MediaResource($image) : null,
+                    'caption' => new LocalizedResource(function ($locale) {
+                        return $this->caption($locale);
+                    }),
+                    'credits' => new LocalizedResource(function ($locale) {
+                        return $this->credits($locale);
+                    }),
                 ];
             }),
         ];

package/lib/generators/laravel-panneau/templates/app/Models/Block.php

@@ -11,7 +11,7 @@ class Block extends BaseBlock
 {
     use HasFactory;
 
-    protected $typeResources = [
+    protected $typedResources = [
         'text' => \App\Resources\Blocks\TextBlock::class,
         'image' => \App\Resources\Blocks\ImageBlock::class,
     ];

package/lib/generators/laravel-panneau/templates/app/Models/Page.php

@@ -19,4 +19,9 @@ class Page extends BasePage
     {
         return $this->toTypedResource() ?? new PageResource($this);
     }
+
+    public function blocks()
+    {
+        return $this->morphToMany(Block::class, 'blockable', 'blocks_pivot');
+    }
 }

package/lib/generators/laravel-panneau/templates/app/Panneau/Http/Resources/BlockResource.php

@@ -3,9 +3,11 @@
 namespace App\Panneau\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
-use App\Contracts\Resources\HasBlocks;
+use Folklore\Contracts\Resources\HasBlocks;
 use Folklore\Http\Resources\LocalizedResource;
 use App\Contracts\Resources\Blocks\Text as TextBlock;
+use App\Contracts\Resources\Blocks\Image as ImageBlock;
+use Folklore\Http\Resources\MediaResource;
 
 class BlockResource extends JsonResource
 {
@@ -18,7 +20,6 @@ class BlockResource extends JsonResource
     public function toArray($request)
     {
         $type = $this->type();
-
         return [
             'id' => $this->id(),
             'type' => $type,
@@ -29,11 +30,27 @@ class BlockResource extends JsonResource
 
             $this->mergeWhen($this->resource instanceof TextBlock, function () {
                 return [
+                    'title' => new LocalizedResource(function ($locale) {
+                        return $this->title($locale);
+                    }),
                     'body' => new LocalizedResource(function ($locale) {
                         return $this->body($locale);
                     }),
                 ];
             }),
+
+            $this->mergeWhen($this->resource instanceof ImageBlock, function () {
+                $image = $this->image();
+                return [
+                    'image' => !empty($image) ? new MediaResource($image) : null,
+                    'caption' => new LocalizedResource(function ($locale) {
+                        return $this->caption($locale);
+                    }),
+                    'credits' => new LocalizedResource(function ($locale) {
+                        return $this->credits($locale);
+                    }),
+                ];
+            }),
         ];
     }
 }

package/lib/generators/laravel-panneau/templates/resources/assets/js/components/Panneau.jsx

@@ -1,12 +1,13 @@
-import React, { useState, useEffect } from 'react';
-import PropTypes from 'prop-types';
-import Panneau from '@panneau/app';
 import { getCSRFHeaders } from '@folklore/fetch';
-
+import Panneau from '@panneau/app';
 import { FIELDS_NAMESPACE } from '@panneau/core/contexts';
-import * as fieldsComponents from './panneau/fields';
+import PropTypes from 'prop-types';
+import React, { useState, useEffect } from 'react';
+
 import * as AppPropTypes from '../lib/PropTypes';
 
+import * as fieldsComponents from './panneau/fields';
+
 import '../../styles/panneau.scss';
 
 const propTypes = {
@@ -26,7 +27,6 @@ const defaultProps = {
 const PanneauContainer = ({ definition, user, baseUrl, uploadEndpoint, statusCode }) => {
     const { routes = {} } = definition;
     const isAuthorized = statusCode !== 401 && statusCode !== 403;
-
     const [localeLoaded, setLocaleLoaded] = useState(false);
 
     useEffect(() => {

package/lib/generators/laravel-panneau/templates/resources/assets/styles/panneau.scss

@@ -1,2 +1,4 @@
+@import '~@panneau/app/scss/styles';
+
 @import '~@panneau/themes/scss/styles';
 @import '~@panneau/themes/scss/vendor';

package/lib/generators/laravel-project/index.js

@@ -7,11 +7,11 @@ var _passwordGenerator = _interopRequireDefault(require("password-generator"));
 var _path = _interopRequireDefault(require("path"));
 var _yeomanRemote = _interopRequireDefault(require("yeoman-remote"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 module.exports = class LaravelProjectGenerator extends _generator.default {
   static safeDbString(str) {

package/lib/generators/lerna-package/index.js

@@ -6,7 +6,7 @@ var _chalk = _interopRequireDefault(require("chalk"));
 var _get = _interopRequireDefault(require("lodash/get"));
 var _changeCase = require("change-case");
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 module.exports = class LernaPackageGenerator extends _generator.default {
   constructor(...args) {
     super(...args);

package/lib/generators/lerna-repository/index.js

@@ -4,7 +4,7 @@ var _chalk = _interopRequireDefault(require("chalk"));
 var _lodash = _interopRequireDefault(require("lodash"));
 var _path = _interopRequireDefault(require("path"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 module.exports = class LernaRepositoryGenerator extends _generator.default {
   constructor(...args) {
     super(...args);

package/lib/generators/micromag-project/index.js

@@ -5,7 +5,7 @@ var _lodash = _interopRequireDefault(require("lodash"));
 var _path = _interopRequireDefault(require("path"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
 var _utils = require("../../lib/utils");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 module.exports = class MicromagProjectGenerator extends _generator.default {
   // The name `constructor` is important here
   constructor(...args) {

package/lib/generators/node-project/index.js

@@ -5,7 +5,7 @@ var _lodash = _interopRequireDefault(require("lodash"));
 var _path = _interopRequireDefault(require("path"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
 var _utils = require("../../lib/utils");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 module.exports = class NodeProjectGenerator extends _generator.default {
   // The name `constructor` is important here
   constructor(...args) {
@@ -116,7 +116,7 @@ module.exports = class NodeProjectGenerator extends _generator.default {
         const serverEntryPath = _path.default.join(srcPath, serverPath, 'server.js');
         const scripts = {
           'build:web': `flklr build --load-env ${(0, _utils.ensureLeadingDotSlash)(webEntryPath)}`,
-          'build:rollup': `rollup --config rollup.config.js`,
+          'build:rollup': `rollup --bundleConfigAsCjs --config rollup.config.js`,
           'build': 'npm run build:web && npm run build:rollup',
           'server': `babel-node ${(0, _utils.ensureLeadingDotSlash)(serverEntryPath)}`,
           'start': `flklr serve --load-env ${(0, _utils.ensureLeadingDotSlash)(webEntryPath)}`

package/lib/generators/npm-package/index.js

@@ -4,7 +4,7 @@ var _chalk = _interopRequireDefault(require("chalk"));
 var _lodash = _interopRequireDefault(require("lodash"));
 var _path = _interopRequireDefault(require("path"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 module.exports = class NpmPackageGenerator extends _generator.default {
   constructor(...args) {
     super(...args);

package/lib/generators/prettier/index.js

@@ -2,7 +2,7 @@
 
 var _chalk = _interopRequireDefault(require("chalk"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 module.exports = class PrettierGenerator extends _generator.default {
   get prompting() {
     return {

package/lib/generators/react-app/index.js

@@ -4,11 +4,11 @@ var _chalk = _interopRequireDefault(require("chalk"));
 var _lodash = _interopRequireDefault(require("lodash"));
 var _path = _interopRequireDefault(require("path"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 module.exports = class ReactAppGenerator extends _generator.default {
   // The name `constructor` is important here

package/lib/generators/react-package/index.js

@@ -5,7 +5,7 @@ var _changeCase = require("change-case");
 var _lodash = _interopRequireDefault(require("lodash"));
 var _path = _interopRequireDefault(require("path"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 module.exports = class ReactPackageGenerator extends _generator.default {
   constructor(...args) {
     super(...args);

package/lib/generators/rollup/index.js

@@ -3,7 +3,7 @@
 var _chalk = _interopRequireDefault(require("chalk"));
 var _path = _interopRequireDefault(require("path"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 module.exports = class RollupGenerator extends _generator.default {
   constructor(...args) {
     super(...args);

package/lib/generators/sass-lint/index.js

@@ -2,7 +2,7 @@
 
 var _chalk = _interopRequireDefault(require("chalk"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 module.exports = class SassLintGenerator extends _generator.default {
   constructor(...args) {
     super(...args);

package/lib/generators/scss/index.js

@@ -3,7 +3,7 @@
 var _chalk = _interopRequireDefault(require("chalk"));
 var _path = _interopRequireDefault(require("path"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 module.exports = class ScssGenerator extends _generator.default {
   constructor(...args) {
     super(...args);

package/lib/generators/server/index.js

@@ -4,7 +4,7 @@ var _chalk = _interopRequireDefault(require("chalk"));
 var _lodash = _interopRequireDefault(require("lodash"));
 var _path = _interopRequireDefault(require("path"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 module.exports = class ServerGenerator extends _generator.default {
   // The name `constructor` is important here
   constructor(...args) {

package/lib/generators/storybook/index.js

@@ -3,7 +3,7 @@
 var _chalk = _interopRequireDefault(require("chalk"));
 var _path = _interopRequireDefault(require("path"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 module.exports = class StorybookGenerator extends _generator.default {
   constructor(...args) {
     super(...args);

package/lib/generators/stylelint/index.js

@@ -2,7 +2,7 @@
 
 var _chalk = _interopRequireDefault(require("chalk"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 module.exports = class StylelintGenerator extends _generator.default {
   constructor(...args) {
     super(...args);

package/lib/generators/svgo/index.js

@@ -2,7 +2,7 @@
 
 var _chalk = _interopRequireDefault(require("chalk"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 module.exports = class SvgoGenerator extends _generator.default {
   prompting() {
     if (this.options.quiet) {

package/lib/generators/test/index.js

@@ -2,7 +2,7 @@
 
 var _chalk = _interopRequireDefault(require("chalk"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 module.exports = class TestGenerator extends _generator.default {
   constructor(...args) {
     super(...args);

package/lib/lib/generator.js

@@ -8,9 +8,9 @@ var _yeomanGenerator = _interopRequireDefault(require("yeoman-generator"));
 var _immutable = _interopRequireDefault(require("immutable"));
 var _path = _interopRequireDefault(require("path"));
 var _lodash = _interopRequireDefault(require("lodash"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 class Generator extends _yeomanGenerator.default {
   static getConfigPath() {

package/lib/lib/utils.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.ensureLeadingDotSlash = ensureLeadingDotSlash;
 var _lodash = require("lodash");
 var _path = _interopRequireDefault(require("path"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function ensureLeadingDotSlash(filePath) {
   return (0, _lodash.isString)(filePath) && !_path.default.isAbsolute(filePath) && filePath.match(/^\./) === null ? `./${filePath}` : filePath;
   ;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "generator-folklore",
-    "version": "3.0.21",
+    "version": "3.0.23",
     "description": "Yeoman generator for projects at Folklore",
     "keywords": [
         "yeoman-generator"
@@ -40,5 +40,5 @@
         "yeoman-generator": "^5.7.0",
         "yeoman-remote": "^1.0.1"
     },
-    "gitHead": "e187175793ce4d11d128d39929b4779c534081bd"
+    "gitHead": "c13ef70b8126b3182b3e3365f34f9231fa9b1535"
 }