generator-folklore 3.0.6 → 3.0.7

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

@@ -289,19 +289,18 @@ module.exports = class LaravelProjectGenerator extends _generator.default {
     if (this.options.mediatheque) {
       this.composeWith('folklore:laravel-mediatheque', {
         'project-name': this.options['project-name'],
-        'skip-install': true
+        'skip-install': true,
+        quiet: true
       });
-    } // if (this.options.panneau) {
-    //     this.composeWith('folklore:laravel-panneau', {
-    //         'project-name': this.options['project-name'],
-    //         'js-path': jsSrcPath,
-    //         'styles-path': stylesSrcPath,
-    //         'skip-install': skipInstall,
-    //         'install-npm': true,
-    //         quiet: true,
-    //     });
-    // }
-    // if (this.options.auth) {
+    }
+
+    if (this.options.panneau) {
+      this.composeWith('folklore:laravel-panneau', {
+        'project-name': this.options['project-name'],
+        'skip-install': skipInstall,
+        quiet: true
+      });
+    } // if (this.options.auth) {
     //     this.composeWith('folklore:laravel-auth', {
     //         'project-name': this.options['project-name'],
     //         'js-path': jsSrcPath,
@@ -368,6 +367,14 @@ module.exports = class LaravelProjectGenerator extends _generator.default {
             'folklore/laravel-folklore': 'v1.x-dev',
             'folklore/laravel-locale': 'v8.x-dev',
             'folklore/laravel-image': 'v1.x-dev'
+          },
+          'require-dev': {
+            'laravel/telescope': '^4.0.0'
+          },
+          extra: {
+            laravel: {
+              'dont-discover': ['laravel/telescope']
+            }
           }
         });
       },
@@ -490,6 +497,14 @@ module.exports = class LaravelProjectGenerator extends _generator.default {
         await this.spawnCommand('php', ['artisan', 'vendor:publish', '--provider=Folklore\\Image\\ServiceProvider']);
       },
 
+      async telescope() {
+        if (this.options['skip-install']) {
+          return;
+        }
+
+        await this.spawnCommand('php', ['artisan', 'telescope:install']);
+      },
+
       async valet() {
         if (this.options['skip-install']) {
           return;

package/lib/generators/laravel-project/templates/laravel/app/Contracts/Repositories/Users.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Contracts\Repositories;
+
+use Folklore\Contracts\Repositories\Users as BaseUsers;
+use App\Contracts\Resources\User as UserResource;
+
+interface Users extends BaseUsers
+{
+    public function findById(string $id): ?UserResource;
+
+    public function findByEmail(string $email): ?UserResource;
+
+    public function create($data): UserResource;
+
+    public function update(string $id, $data): ?UserResource;
+}

package/lib/generators/laravel-project/templates/laravel/app/Models/User.php

@@ -13,36 +13,6 @@ class User extends BaseUser
 {
     use HasApiTokens, HasFactory;
 
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array<int, string>
-     */
-    protected $fillable = [
-        'name',
-        'email',
-        'password',
-    ];
-
-    /**
-     * The attributes that should be hidden for serialization.
-     *
-     * @var array<int, string>
-     */
-    protected $hidden = [
-        'password',
-        'remember_token',
-    ];
-
-    /**
-     * The attributes that should be cast.
-     *
-     * @var array<string, string>
-     */
-    protected $casts = [
-        'email_verified_at' => 'datetime',
-    ];
-
     public function toResource(): UserContract
     {
         return new UserResource($this);

package/lib/generators/laravel-project/templates/laravel/app/Providers/AppServiceProvider.php

@@ -6,9 +6,66 @@ use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Http\Request;
+use Illuminate\Support\Arr;
 
 class AppServiceProvider extends ServiceProvider
 {
+    /**
+     * Register any application services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        $this->registerRepositories();<% if (options.mediatheque) { %>
+        $this->registerMediatheque();<% } %>
+        $this->registerTelescope();
+    }
+
+    protected function registerRepositories()
+    {
+        $this->app->bind(
+            \Folklore\Contracts\Repositories\Users::class,
+            \App\Repositories\Users::class
+        );
+
+        $this->app->bind(
+            \App\Contracts\Repositories\Users::class,
+            \App\Repositories\Users::class
+        );<% if (options.panneau) { %>
+
+        $this->app->bind(
+            \Folklore\Contracts\Repositories\Pages::class,
+            \App\Repositories\Pages::class
+        );
+
+        $this->app->bind(
+            \App\Contracts\Repositories\Pages::class,
+            \App\Repositories\Pages::class
+        );<% } %>
+    }<% if (options.mediatheque) { %>
+
+    protected function registerMediatheque()
+    {
+        $this->app->bind(
+            \Folklore\Mediatheque\Contracts\Models\Media::class,
+            \App\Models\Media::class
+        );
+
+        $this->app->bind(
+            \Folklore\Mediatheque\Contracts\Models\File::class,
+            \App\Models\MediaFile::class
+        );
+    }<% } %>
+
+    protected function registerTelescope()
+    {
+        if ($this->app->environment('local')) {
+            $this->app->register(\Laravel\Telescope\TelescopeServiceProvider::class);
+            $this->app->register(TelescopeServiceProvider::class);
+        }
+    }
+
     /**
      * Bootstrap any application services.
      *
@@ -16,30 +73,48 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
+        // Some defaults
         Schema::defaultStringLength(191);
         JsonResource::withoutWrapping();
 
+        $this->bootRequest();
+
+        $this->bootImage();
+    }
+
+    protected function bootRequest()
+    {
         // Determine site from request
         Request::macro('site', function () {
             return null;
         });
     }
 
-    /**
-     * Register any application services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        $this->registerRepositories();
-    }
-
-    protected function registerRepositories()
+    protected function bootImage()
     {
-        $this->app->bind(
-            \Folklore\Contracts\Repositories\Users::class,
-            \App\Repositories\Users::class
-        );
+        foreach (config('image.sizes') as $filter) {
+            $id = $filter['id'];
+            $data = Arr::except($filter, ['id']);
+            if (sizeof($data) === 0) {
+                continue;
+            }
+            $newFilter = [];
+            if (isset($filter['maxWidth'])) {
+                $newFilter['width'] = $filter['maxWidth'];
+            }
+            if (isset($filter['maxHeight'])) {
+                $newFilter['height'] = $filter['maxHeight'];
+            }
+            if (isset($filter['width'])) {
+                $newFilter['width'] = $filter['width'];
+            }
+            if (isset($filter['height'])) {
+                $newFilter['height'] = $filter['height'];
+            }
+            if (isset($filter['width']) && isset($filter['height'])) {
+                $newFilter['crop'] = true;
+            }
+            $this->app['image']->filter($id, $newFilter);
+        }
     }
 }

package/lib/generators/laravel-project/templates/laravel/app/Repositories/Users.php

@@ -3,11 +3,12 @@
 namespace App\Repositories;
 
 use Folklore\Repositories\Users as BaseUsers;
+use App\Contracts\Repositories\Users as UsersContract;
 use Illuminate\Database\Eloquent\Model;
 use App\Models\User as UserModel;
 use App\Contracts\Resources\User as UserContract;
 
-class Users extends BaseUsers
+class Users extends BaseUsers implements UsersContract
 {
     protected function newModel(): Model
     {
@@ -24,12 +25,12 @@ class Users extends BaseUsers
         return parent::findByEmail($email);
     }
 
-    public function create(array $data): UserContract
+    public function create($data): UserContract
     {
         return parent::create($data);
     }
 
-    public function update(string $id, array $data): ?UserContract
+    public function update(string $id, $data): ?UserContract
     {
         return parent::update($id, $data);
     }

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

@@ -194,8 +194,8 @@ return [
         // App\Providers\BroadcastServiceProvider::class,
         App\Providers\EventServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
-        App\Providers\ViewServiceProvider::class,
-
+        App\Providers\ViewServiceProvider::class,<% if (options.panneau) { %>
+        App\Panneau\PanneauServiceProvider::class,<% } %>
     ],
 
     /*

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/prettier/index.js

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

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

@@ -108,8 +108,8 @@ 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@^2.0.0', '@folklore/routes@^0.1.0', '@folklore/fonts@^0.0.1', '@folklore/forms@^0.0.1', '@folklore/fetch@^0.1.0', '@folklore/hooks@^0.0.1', '@folklore/tracking@^0.0.1', // Polyfills
+        'intl@^1.0.0', '@formatjs/intl-locale@^3.0.0', '@formatjs/intl-pluralrules@^5.0.0', 'intersection-observer@^0.12.0', 'resize-observer-polyfill@1.0.0']);
       }
 
     };

package/lib/generators/stylelint/index.js

@@ -37,7 +37,7 @@ 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@^5.0.0', 'stylelint-config-idiomatic-order@^8.0.0', 'stylelint-config-prettier@^9.0.0']);
       }
 
     };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "generator-folklore",
-    "version": "3.0.6",
+    "version": "3.0.7",
     "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,6 +31,7 @@
     "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",
@@ -39,5 +40,5 @@
         "yeoman-generator": "^5.6.1",
         "yeoman-remote": "^1.0.1"
     },
-    "gitHead": "8331a20ddf7647db4895648efb495ce23d070fb3"
+    "gitHead": "bc3878a65d256dd8742a6deea2699252d4a4dfb0"
 }

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;
-    }
-}