generator-folklore 3.0.6 → 3.0.8

package/lib/generators/laravel-project/templates/laravel/config/image.php

@@ -0,0 +1,204 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Image sizes
+    |--------------------------------------------------------------------------
+    */
+    'sizes' => [
+        [
+            'id' => 'original',
+        ],
+        [
+            'id' => 'thumbnail',
+            'width' => 200,
+            'height' => 200,
+        ],
+        [
+            'id' => 'small',
+            'maxWidth' => 500,
+            'maxHeight' => 500,
+        ],
+        [
+            'id' => 'medium',
+            'maxWidth' => 800,
+            'maxHeight' => 800,
+        ],
+        [
+            'id' => 'large',
+            'maxWidth' => 1600,
+            'maxHeight' => 1600,
+        ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Image Filters
+    |--------------------------------------------------------------------------
+    |
+    | The list of filters you can use when making an image or generating an url.
+    | There is some built-in filters, and you can add or replace any. It is also
+    | possible to declare a filter with an array or a closure instead of a Filter
+    | Class.
+    |
+    */
+    'filters' => [
+        'blur' => \Folklore\Image\Filters\Blur::class,
+        'colorize' => \Folklore\Image\Filters\Colorize::class,
+        'gamma' => \Folklore\Image\Filters\Gamma::class,
+        'grayscale' => \Folklore\Image\Filters\Grayscale::class,
+        'interlace' => \Folklore\Image\Filters\Interlace::class,
+        'negative' => \Folklore\Image\Filters\Negative::class,
+        'rotate' => \Folklore\Image\Filters\Rotate::class,
+        'resize' => \Folklore\Image\Filters\Resize::class
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Source
+    |--------------------------------------------------------------------------
+    |
+    | This option define the default source to be used by the Image facade. The
+    | source determine where the image files are read and saved.
+    |
+    */
+    'source' => 'public',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Sources
+    |--------------------------------------------------------------------------
+    |
+    | The list of sources where you store images.
+    |
+    | Supported driver: "local", "filesystem"
+    |
+    */
+    'sources' => [
+
+        'public' => [
+            // The local driver use a local path on the machine.
+            'driver' => 'local',
+
+            // The path where the images are stored.
+            'path' => public_path()
+        ],
+
+        'cloud' => [
+            // The filesystem driver lets you use the filesystem from laravel.
+            'driver' => 'filesystem',
+
+            // The filesystem disk where the images are stored.
+            'disk' => 'public',
+
+            // The path on the disk where the images are stored. If set to null,
+            // it will start from the root.
+            'path' => null,
+
+            // Cache the file on local machine. It can be useful for remote files.
+            'cache' => true,
+
+            // The path where you want to put cached files
+            'cache_path' => storage_path('image/cache')
+        ]
+
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | URL Generator
+    |--------------------------------------------------------------------------
+    |
+    | The URL Generator configuration is used when generating an image url
+    | and by the router to generate a pattern for catching image requests.
+    | These are the defaults values and you can overide it in each routes or
+    | when generating an url using the `pattern` parameter.
+    |
+    */
+    'url' => [
+        // The format of the url that will be generated. The `{filters}` placeholder
+        // will be replaced by the filters according to the `filters_format`.
+        'format' => '{dirname}/{basename}{filters}.{extension}',
+
+        // The format of the filters that will replace `{filters}` in the
+        // url `format` above. The `{filter}` placeholder will be replaced by
+        // each filter according to the `filter_format` and joined
+        // by the `filter_separator`.
+        'filters_format' => '-filters({filter})',
+
+        // The format of a filter.
+        'filter_format' => '{key}({value})',
+
+        // The separator for each filter
+        'filter_separator' => '-',
+
+        // This is the regex that will replace any placeholders in the option 'format'.
+        // They are used when the route pattern is generated and added to the
+        // Laravel Router to match image request.
+        'placeholders_patterns' => [
+            'host' => '(.*?)?',
+            'dirname' => '(.*?)?',
+            'basename' => '([^\/\.]+?)',
+            'filename' => '([^\/]+)',
+            'extension' => '(jpeg|jpg|gif|png)',
+        ]
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Routes
+    |--------------------------------------------------------------------------
+    |
+    | Default configuration for image routes. See routes/image.php
+    |
+    */
+    'routes' => [
+        // Path to the routes file that will be automatically loaded. Set to null
+        // to prevent auto-loading of routes.
+        'map' => base_path('routes/images.php'),
+
+        // Default domain for routes
+        'domain' => null,
+
+        // Default namespace for controller
+        'namespace' => null,
+
+        // Default middlewares for routes
+        'middleware' => [],
+
+        // The controller serving the images
+        'controller' => '\Folklore\Image\Http\ImageController@serve',
+
+        // The name of the pattern that will be added to the Laravel Router.
+        'pattern_name' => 'image_pattern',
+
+        // The middleware used when a route as `cache` enabled
+        'cache_middleware' => 'image.middleware.cache'
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Image Driver
+    |--------------------------------------------------------------------------
+    |
+    | This option controls the default image "driver" used by Imagine library
+    | to manipulate images.
+    |
+    | Supported: "gd", "imagick", "gmagick"
+    |
+    */
+    'driver' => 'gd',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Memory limit
+    |--------------------------------------------------------------------------
+    |
+    | When manipulating an image, the memory limit is increased to this value
+    |
+    */
+    'memory_limit' => '128M',
+
+];

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

@@ -1,11 +1,11 @@
 "use strict";
 
+var _chalk = _interopRequireDefault(require("chalk"));
+
 var _lodash = _interopRequireDefault(require("lodash"));
 
 var _path = _interopRequireDefault(require("path"));
 
-var _chalk = _interopRequireDefault(require("chalk"));
-
 var _generator = _interopRequireDefault(require("../../lib/generator"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -217,7 +217,12 @@ module.exports = class LernaRepositoryGenerator extends _generator.default {
           return;
         }
 
-        this.addDevDependencies(['lerna@latest', 'glob@latest', 'mkdirp@latest', '@babel/runtime@latest']);
+        this.addDevDependencies({
+          lerna: 'latest',
+          glob: 'latest',
+          mkdirp: 'latest',
+          '@babel/runtime': 'latest'
+        });
       },
 
       bootstrap() {

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

@@ -240,8 +240,12 @@ module.exports = class NpmPackageGenerator extends _generator.default {
           return;
         }
 
-        this.addDependencies(['@babel/runtime@latest']);
-        this.addDevDependencies(['jest@latest']);
+        this.addDependencies({
+          '@babel/runtime': 'latest'
+        });
+        this.addDevDependencies({
+          jest: 'latest'
+        });
       }
 
     };

package/lib/generators/prettier/index.js

@@ -31,7 +31,11 @@ module.exports = class PrettierGenerator extends _generator.default {
       },
 
       dependencies() {
-        this.addDevDependencies(['prettier', '@prettier/plugin-php', '@trivago/prettier-plugin-sort-imports']);
+        this.addDevDependencies({
+          prettier: 'latest',
+          '@prettier/plugin-php': 'latest',
+          '@trivago/prettier-plugin-sort-imports': 'latest'
+        });
       }
 
     };

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

@@ -108,8 +108,28 @@ module.exports = class ReactAppGenerator extends _generator.default {
       },
 
       dependencies() {
-        this.addDependencies(['react', 'react-dom', 'prop-types', 'react-intl', 'react-router', 'react-router-dom', 'react-helmet', 'classnames', '@folklore/routes', '@folklore/fonts', '@folklore/forms', '@folklore/fetch', '@folklore/hooks', '@folklore/tracking', // Polyfills
-        'intl', '@formatjs/intl-locale', '@formatjs/intl-pluralrules', 'intersection-observer', 'resize-observer-polyfill']);
+        this.addDependencies({
+          react: '^18.0.0',
+          'react-dom': '^18.0.0',
+          'prop-types': '^15.0.0',
+          'react-intl': '^6.0.0',
+          'react-router': '^6.0.0',
+          'react-router-dom': '^6.0.0',
+          'react-helmet': '^6.0.0',
+          classnames: 'latest',
+          '@folklore/routes': '^0.1.1',
+          '@folklore/fonts': '^0.0.11',
+          '@folklore/forms': '^0.0.19',
+          '@folklore/fetch': '^0.1.15',
+          '@folklore/hooks': '^0.0.27',
+          '@folklore/tracking': '^0.0.14',
+          // Polyfills
+          intl: 'latest',
+          '@formatjs/intl-locale': 'latest',
+          '@formatjs/intl-pluralrules': 'latest',
+          'intersection-observer': 'latest',
+          'resize-observer-polyfill': 'latest'
+        });
       }
 
     };

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

@@ -1,13 +1,13 @@
 "use strict";
 
-var _lodash = _interopRequireDefault(require("lodash"));
-
-var _path = _interopRequireDefault(require("path"));
-
 var _chalk = _interopRequireDefault(require("chalk"));
 
 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 }; }
@@ -192,7 +192,16 @@ module.exports = class ReactPackageGenerator extends _generator.default {
           return;
         }
 
-        this.addDevDependencies(['domready@latest', 'jquery@latest', 'enzyme@latest', 'react-test-renderer@latest', '@storybook/react@latest', '@storybook/addon-actions@latest', 'extract-text-webpack-plugin@latest', 'html-webpack-plugin@latest']);
+        this.addDevDependencies({
+          domready: 'latest',
+          jquery: 'latest',
+          enzyme: 'latest',
+          'react-test-renderer': 'latest',
+          '@storybook/react': 'latest',
+          '@storybook/addon-actions': 'latest',
+          'extract-text-webpack-plugin': 'latest',
+          'html-webpack-plugin': 'latest'
+        });
       }
 
     };

package/lib/generators/rollup/index.js

@@ -37,7 +37,14 @@ module.exports = class RollupGenerator extends _generator.default {
       },
 
       dependencies() {
-        this.addDevDependencies(['@rollup/plugin-babel', '@rollup/plugin-commonjs', '@rollup/plugin-json', '@rollup/plugin-node-resolve', '@rollup/plugin-replace', 'rollup']);
+        this.addDevDependencies({
+          '@rollup/plugin-babel': 'latest',
+          '@rollup/plugin-commonjs': 'latest',
+          '@rollup/plugin-json': 'latest',
+          '@rollup/plugin-node-resolve': 'latest',
+          '@rollup/plugin-replace': 'latest',
+          rollup: '^2.79.1'
+        });
       }
 
     };

package/lib/generators/server/index.js

@@ -60,10 +60,17 @@ module.exports = class ServerGenerator extends _generator.default {
         const {
           'socket-io': socketIo
         } = this.options;
-        this.addDependencies(['commander', 'debug', 'ejs', 'express']);
+        this.addDependencies({
+          commander: 'latest',
+          debug: 'latest',
+          ejs: 'latest',
+          express: 'latest'
+        });
 
         if (socketIo) {
-          this.addDependencies(['socket.io']);
+          this.addDependencies({
+            'socket.io': 'latest'
+          });
         }
       }
 

package/lib/generators/storybook/index.js

@@ -79,7 +79,15 @@ module.exports = class StorybookGenerator extends _generator.default {
           return;
         }
 
-        this.addDevDependencies(['@storybook/addon-actions@latest', '@storybook/addon-info@latest', '@storybook/addon-storyshots@latest', '@storybook/addons@latest', '@storybook/react@latest', '@storybook/storybook-deployer@latest', 'glob-loader@latest']);
+        this.addDevDependencies({
+          '@storybook/addon-actions': 'latest',
+          '@storybook/addon-info': 'latest',
+          '@storybook/addon-storyshots': 'latest',
+          '@storybook/addons': 'latest',
+          '@storybook/react': 'latest',
+          '@storybook/storybook-deployer': 'latest',
+          'glob-loader': 'latest'
+        });
       }
 
     };

package/lib/generators/stylelint/index.js

@@ -37,7 +37,12 @@ module.exports = class StylelintGenerator extends _generator.default {
       },
 
       dependencies() {
-        this.addDevDependencies(['stylelint', 'stylelint-config-standard-scss', 'stylelint-config-idiomatic-order', 'stylelint-config-prettier']);
+        this.addDevDependencies({
+          stylelint: '^14.0.0',
+          'stylelint-config-standard-scss': 'latest',
+          'stylelint-config-idiomatic-order': 'latest',
+          'stylelint-config-prettier': 'latest'
+        });
       }
 
     };

package/lib/generators/test/index.js

@@ -67,7 +67,16 @@ module.exports = class TestGenerator extends _generator.default {
           return;
         }
 
-        this.addDevDependencies(['babel-jest@latest', 'enzyme@latest', 'enzyme-adapter-react-16@latest', 'eslint-plugin-jest@latest', 'jest@latest', 'jsdom@latest', 'react-test-renderer@latest', 'sinon@latest']);
+        this.addDevDependencies({
+          'babel-jest': 'latest',
+          enzyme: 'latest',
+          'enzyme-adapter-react-16': 'latest',
+          'eslint-plugin-jest': 'latest',
+          jest: 'latest',
+          jsdom: 'latest',
+          'react-test-renderer': 'latest',
+          sinon: 'latest'
+        });
       }
 
     };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "generator-folklore",
-    "version": "3.0.6",
+    "version": "3.0.8",
     "description": "Yeoman generator for projects at Folklore",
     "keywords": [
         "yeoman-generator"
@@ -9,9 +9,9 @@
     "scripts": {
         "clean:lib": "rm -rf lib/*",
         "clean": "npm run clean:lib",
-        "copy:templates": "find src/ -type d | grep -i /templates$ | sed 's/src\\/\\///g' | xargs -I{} cp -r \"src/{}\" \"lib/{}\"",
+        "copy:dirs": "find src/ -type d | grep -E '(/templates|/instructions)$' | sed 's/src\\/\\///g' | xargs -I{} cp -r \"src/{}\" \"lib/{}\"",
         "compile": "../../node_modules/.bin/babel -d lib/ src/",
-        "build": "npm run compile && npm run copy:templates",
+        "build": "npm run compile && npm run copy:dirs",
         "test": "echo \"Error: no test specified\" && exit 1",
         "prepare": "npm run clean && npm run build"
     },
@@ -31,13 +31,14 @@
     "dependencies": {
         "chalk": "^4.0.0",
         "change-case": "^4.1.2",
+        "cli-highlight": "^2.1.11",
         "glob": "^7.2.0",
         "immutable": "^4.0.0",
         "is-utf8": "^0.2.1",
         "lodash": "^4.17.21",
         "password-generator": "^2.3.2",
-        "yeoman-generator": "^5.6.1",
+        "yeoman-generator": "^5.7.0",
         "yeoman-remote": "^1.0.1"
     },
-    "gitHead": "8331a20ddf7647db4895648efb495ce23d070fb3"
+    "gitHead": "a8406b4ff188934ed49c13826cf577968669ed4e"
 }

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

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Panneau\Fields;
-
-use Panneau\Fields\ResourceItem;
-
-class Block extends ResourceItem
-{
-    public function resource(): string
-    {
-        return 'blocks';
-    }
-
-    public function attributes(): ?array
-    {
-        return array_merge(parent::attributes(), [
-            'placeholder' => trans('panneau.fields.blocks_placeholder'),
-            'itemLabelPath' => 'title',
-            'itemDescriptionPath' => null,
-        ]);
-    }
-}

package/lib/generators/laravel-panneau/templates/app/Panneau/Fields/Blocks.php

@@ -1,87 +0,0 @@
-<?php
-
-namespace App\Panneau\Fields;
-
-use Panneau\Fields\Items;
-use Panneau\Fields\ResourceItem;
-use App\Panneau\Resources\Blocks\BlockWithBlocks;
-
-class Blocks extends Items
-{
-    protected $currentDepth = 0;
-
-    protected $maxDepth = null;
-
-    protected $excludeTypes = [];
-
-    public function itemField(): ?string
-    {
-        return Block::class;
-    }
-
-    public function attributes(): ?array
-    {
-        // With types
-        $itemField = $this->itemField();
-        $itemField = !is_null($itemField) ? resolve($itemField) : null;
-        $itemResource =
-            !is_null($itemField) && $itemField instanceof ResourceItem
-                ? $itemField->makeResource()
-                : null;
-        $resourceTypes =
-            !is_null($itemResource) && $itemResource->hasTypes() ? $itemResource->getTypes() : null;
-
-        $attributes = [
-            'withoutFormGroup' => true,
-            'addItemLabel' => trans('panneau.fields.add_block'),
-            'noItemLabel' => trans('panneau.fields.no_blocks'),
-            'itemLabel' => trans('panneau.fields.block'),
-            'withoutSort' => false,
-        ];
-
-        if (!is_null($resourceTypes)) {
-            $attributes['types'] = $resourceTypes
-                ->filter(function ($type) {
-                    $key = get_class($type);
-                    return !in_array($key, $this->excludeTypes);
-                })
-                ->map(function ($type) {
-                    $hasBlocks = collect($type->fields())->contains(function ($field) {
-                        return $field instanceof self;
-                    });
-                    if (isset($this->maxDepth) && $hasBlocks) {
-                        return new BlockWithBlocks($type, $this->currentDepth + 1);
-                    }
-                    return $type;
-                })
-                ->filter(function ($type) {
-                    if (isset($this->maxDepth) && $type instanceof BlockWithBlocks) {
-                        return $type->currentDepth() < $this->maxDepth;
-                    }
-                    return true;
-                })
-                ->values()
-                ->toArray();
-        }
-
-        return $attributes;
-    }
-
-    public function maxDepth($depth)
-    {
-        $this->maxDepth = $depth;
-        return $this;
-    }
-
-    public function currentDepth($depth)
-    {
-        $this->currentDepth = $depth;
-        return $this;
-    }
-
-    public function withoutType($type)
-    {
-        $this->excludeTypes[] = is_object($type) ? get_class($type) : $type;
-        return $this;
-    }
-}

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

@@ -1,51 +0,0 @@
-<?php
-
-namespace App\Panneau\Fields;
-
-use Panneau\Fields\ResourceItem;
-
-class Page extends ResourceItem
-{
-    protected $query = [
-        'paginated' => false,
-    ];
-
-    protected $pageTypes = [];
-
-    public function resource(): string
-    {
-        return 'pages';
-    }
-
-    public function component(): string
-    {
-        return 'item';
-    }
-
-    public function attributes(): ?array
-    {
-        $query = $this->query;
-        if (isset($this->pageTypes) && sizeof($this->pageTypes) > 0) {
-            $query['type'] = $this->pageTypes;
-        }
-
-        return array_merge(parent::attributes(), [
-            'placeholder' => trans('panneau.forms.page_placeholder'),
-            'itemLabelPath' => 'title.'.app()->getLocale(),
-            'itemImagePath' => null,
-            'requestQuery' => $query,
-        ]);
-    }
-
-    public function withQuery($query)
-    {
-        $this->query = $query;
-        return $this;
-    }
-
-    public function withTypes($types)
-    {
-        $this->pageTypes = is_array($types) ? $types : func_get_args();
-        return $this;
-    }
-}

package/lib/generators/laravel-panneau/templates/app/Panneau/Fields/PageSlug.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Panneau\Fields;
-
-use Panneau\Fields\Text;
-
-class PageSlug extends Text
-{
-    public function component(): string
-    {
-        return 'page-slug';
-    }
-
-    public function attributes(): ?array
-    {
-        $locale = app()->getLocale();
-        $locales = config('locale.locales');
-        $finalLocale = in_array($this->name, $locales) ? $this->name : $locale;
-
-        return array_merge(parent::attributes(), [
-            'routes' => [
-                'page' => url()->routeForReactRouter($finalLocale . '.page', [
-                    'withoutPatterns' => true,
-                ]),
-                'page_with_parent' => url()->routeForReactRouter(
-                    $finalLocale . '.page_with_parent',
-                    [
-                        'withoutPatterns' => true,
-                    ]
-                ),
-            ],
-        ]);
-    }
-}

package/lib/generators/laravel-panneau/templates/app/Panneau/Fields/PageSlugLocalized.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Panneau\Fields;
-
-use Panneau\Support\LocalizedField;
-
-class PageSlugLocalized extends LocalizedField
-{
-    public function component(): string
-    {
-        return 'page-slug-localized';
-    }
-
-    public function field($locale)
-    {
-        return new PageSlug($locale);
-    }
-}