generator-folklore 3.0.39 → 3.0.41

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

@@ -0,0 +1,53 @@
+<?php
+
+use Illuminate\Foundation\Application;
+use Illuminate\Foundation\Configuration\Exceptions;
+use Illuminate\Foundation\Configuration\Middleware;
+use Illuminate\Support\Facades\Route;
+use Illuminate\Http\Request;
+// use Sentry\Laravel\Integration;
+
+return Application::configure(basePath: dirname(__DIR__))
+    ->withRouting(
+        commands: __DIR__.'/../routes/console.php',
+        health: '/up',
+        using: function () {
+            Route::middleware('api')
+                ->prefix('api')
+                ->group(base_path('routes/api.php'));
+
+            Route::middleware('web')->group(base_path('routes/web.php'));
+        },
+    )
+    ->withMiddleware(function (Middleware $middleware) {
+        $middleware->group('session', [
+            Illuminate\Cookie\Middleware\EncryptCookies::class,
+            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
+            \Illuminate\Session\Middleware\StartSession::class,
+            \Illuminate\View\Middleware\ShareErrorsFromSession::class,
+            \Illuminate\Foundation\Http\Middleware\VerifyCsrfToken::class,
+            \Illuminate\Routing\Middleware\SubstituteBindings::class,
+        ]);
+
+        $middleware->replace(
+            \Illuminate\Http\Middleware\TrustProxies::class,
+            \App\Http\Middleware\TrustProxies::class,
+        );
+
+        $middleware->alias([
+            'auth' => \App\Http\Middleware\Authenticate::class,
+        ]);
+    })
+    ->withExceptions(function (Exceptions $exceptions) {
+        // Integration::handles($exceptions);
+        $exceptions->shouldRenderJsonWhen(function (Request $request) {
+            if ($request->is('api/*')) {
+                return true;
+            }
+
+            return $request->expectsJson();
+        });
+    })
+    ->withExceptions(function (Exceptions $exceptions): void {
+        //
+    })->create();

package/lib/generators/laravel-project/templates/laravel/bootstrap/providers.php

@@ -0,0 +1,9 @@
+<?php
+
+return [
+    App\Providers\AppServiceProvider::class,
+    App\Providers\RouteServiceProvider::class,
+    App\Providers\ViewServiceProvider::class,
+    App\Providers\FortifyServiceProvider::class,<% if (options.panneau) { %>
+    App\Panneau\PanneauServiceProvider::class,<% } %>
+];

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

@@ -1,7 +1,5 @@
 <?php
 
-use Illuminate\Support\Facades\Facade;
-
 return [
 
     /*
@@ -9,9 +7,9 @@ return [
     | Application Name
     |--------------------------------------------------------------------------
     |
-    | This value is the name of your application. This value is used when the
+    | This value is the name of your application, which will be used when the
     | framework needs to place the application's name in a notification or
-    | any other location as required by the application or its packages.
+    | other UI elements where an application name needs to be displayed.
     |
     */
 
@@ -50,22 +48,20 @@ return [
     |
     | This URL is used by the console to properly generate URLs when using
     | the Artisan command line tool. You should set this to the root of
-    | your application so that it is used when running Artisan tasks.
+    | the application so that it's available within Artisan commands.
     |
     */
 
     'url' => env('APP_URL', '<%= options.project_url %>'),
 
-    'asset_url' => env('ASSET_URL'),
-
     /*
     |--------------------------------------------------------------------------
     | Application Timezone
     |--------------------------------------------------------------------------
     |
     | Here you may specify the default timezone for your application, which
-    | will be used by the PHP date and date-time functions. We have gone
-    | ahead and set this to a sensible default for you out of the box.
+    | will be used by the PHP date and date-time functions. The timezone
+    | is set to "UTC" by default as it is suitable for most use cases.
     |
     */
 
@@ -77,53 +73,37 @@ return [
     |--------------------------------------------------------------------------
     |
     | The application locale determines the default locale that will be used
-    | by the translation service provider. You are free to set this value
-    | to any of the locales which will be supported by the application.
+    | by Laravel's translation / localization methods. This option can be
+    | set to any locale for which you plan to have translation strings.
     |
     */
 
-    'locale' => 'en',
+    'locale' => env('APP_LOCALE', 'fr'),
 
-    /*
-    |--------------------------------------------------------------------------
-    | Application Fallback Locale
-    |--------------------------------------------------------------------------
-    |
-    | The fallback locale determines the locale to use when the current one
-    | is not available. You may change the value to correspond to any of
-    | the language folders that are provided through your application.
-    |
-    */
+    'fallback_locale' => env('APP_FALLBACK_LOCALE', 'en'),
 
-    'fallback_locale' => 'en',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Faker Locale
-    |--------------------------------------------------------------------------
-    |
-    | This locale will be used by the Faker PHP library when generating fake
-    | data for your database seeds. For example, this will be used to get
-    | localized telephone numbers, street address information and more.
-    |
-    */
-
-    'faker_locale' => 'en_US',
+    'faker_locale' => env('APP_FAKER_LOCALE', 'en_US'),
 
     /*
     |--------------------------------------------------------------------------
     | Encryption Key
     |--------------------------------------------------------------------------
     |
-    | This key is used by the Illuminate encrypter service and should be set
-    | to a random, 32 character string, otherwise these encrypted strings
-    | will not be safe. Please do this before deploying an application!
+    | This key is utilized by Laravel's encryption services and should be set
+    | to a random, 32 character string to ensure that all encrypted values
+    | are secure. You should do this prior to deploying the application.
     |
     */
 
+    'cipher' => 'AES-256-CBC',
+
     'key' => env('APP_KEY'),
 
-    'cipher' => 'AES-256-CBC',
+    'previous_keys' => [
+        ...array_filter(
+            explode(',', (string) env('APP_PREVIOUS_KEYS', ''))
+        ),
+    ],
 
     /*
     |--------------------------------------------------------------------------
@@ -139,80 +119,8 @@ return [
     */
 
     'maintenance' => [
-        'driver' => 'file',
-        // 'store'  => 'redis',
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Autoloaded Service Providers
-    |--------------------------------------------------------------------------
-    |
-    | The service providers listed here will be automatically loaded on the
-    | request to your application. Feel free to add your own services to
-    | this array to grant expanded functionality to your applications.
-    |
-    */
-
-    'providers' => [
-
-        /*
-         * Laravel Framework Service Providers...
-         */
-        Illuminate\Auth\AuthServiceProvider::class,
-        Illuminate\Broadcasting\BroadcastServiceProvider::class,
-        Illuminate\Bus\BusServiceProvider::class,
-        Illuminate\Cache\CacheServiceProvider::class,
-        Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class,
-        Illuminate\Cookie\CookieServiceProvider::class,
-        Illuminate\Database\DatabaseServiceProvider::class,
-        Illuminate\Encryption\EncryptionServiceProvider::class,
-        Illuminate\Filesystem\FilesystemServiceProvider::class,
-        Illuminate\Foundation\Providers\FoundationServiceProvider::class,
-        Illuminate\Hashing\HashServiceProvider::class,
-        Illuminate\Mail\MailServiceProvider::class,
-        Illuminate\Notifications\NotificationServiceProvider::class,
-        Illuminate\Pagination\PaginationServiceProvider::class,
-        Illuminate\Pipeline\PipelineServiceProvider::class,
-        Illuminate\Queue\QueueServiceProvider::class,
-        Illuminate\Redis\RedisServiceProvider::class,
-        Illuminate\Auth\Passwords\PasswordResetServiceProvider::class,
-        Illuminate\Session\SessionServiceProvider::class,
-        Illuminate\Translation\TranslationServiceProvider::class,
-        Illuminate\Validation\ValidationServiceProvider::class,
-        Illuminate\View\ViewServiceProvider::class,
-
-        /*
-         * Package Service Providers...
-         */
-        Folklore\ServiceProvider::class,
-
-        /*
-         * Application Service Providers...
-         */
-        App\Providers\AppServiceProvider::class,
-        // App\Providers\AuthServiceProvider::class,
-        // App\Providers\BroadcastServiceProvider::class,
-        // App\Providers\EventServiceProvider::class,
-        App\Providers\RouteServiceProvider::class,
-        App\Providers\ViewServiceProvider::class,<% if (options.panneau) { %>
-        App\Providers\FortifyServiceProvider::class,
-        App\Panneau\PanneauServiceProvider::class,<% } %>
+        'driver' => env('APP_MAINTENANCE_DRIVER', 'file'),
+        'store' => env('APP_MAINTENANCE_STORE', 'database'),
     ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | Class Aliases
-    |--------------------------------------------------------------------------
-    |
-    | This array of class aliases will be registered when this application
-    | is started. However, feel free to register as many as you wish as
-    | the aliases are "lazy" loaded so they don't hinder performance.
-    |
-    */
-
-    'aliases' => Facade::defaultAliases()->merge([
-        // 'ExampleClass' => App\Example\ExampleClass::class,
-    ])->toArray(),
-
 ];

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

@@ -1,5 +1,7 @@
 <?php
 
+use App\Models\User;
+
 return [
 
     /*
@@ -7,15 +9,15 @@ return [
     | Authentication Defaults
     |--------------------------------------------------------------------------
     |
-    | This option controls the default authentication "guard" and password
-    | reset options for your application. You may change these defaults
+    | This option defines the default authentication "guard" and password
+    | reset "broker" for your application. You may change these values
     | as required, but they're a perfect start for most applications.
     |
     */
 
     'defaults' => [
-        'guard' => 'web',
-        'passwords' => 'users',
+        'guard' => env('AUTH_GUARD', 'web'),
+        'passwords' => env('AUTH_PASSWORD_BROKER', 'users'),
     ],
 
     /*
@@ -25,11 +27,11 @@ return [
     |
     | Next, you may define every authentication guard for your application.
     | Of course, a great default configuration has been defined for you
-    | here which uses session storage and the Eloquent user provider.
+    | which utilizes session storage plus the Eloquent user provider.
     |
-    | All authentication drivers have a user provider. This defines how the
+    | All authentication guards have a user provider, which defines how the
     | users are actually retrieved out of your database or other storage
-    | mechanisms used by this application to persist your user's data.
+    | system used by the application. Typically, Eloquent is utilized.
     |
     | Supported: "session"
     |
@@ -47,12 +49,12 @@ return [
     | User Providers
     |--------------------------------------------------------------------------
     |
-    | All authentication drivers have a user provider. This defines how the
+    | All authentication guards have a user provider, which defines how the
     | users are actually retrieved out of your database or other storage
-    | mechanisms used by this application to persist your user's data.
+    | system used by the application. Typically, Eloquent is utilized.
     |
     | If you have multiple user tables or models you may configure multiple
-    | sources which represent each model / table. These sources may then
+    | providers to represent the model / table. These providers may then
     | be assigned to any extra authentication guards you have defined.
     |
     | Supported: "database", "eloquent"
@@ -65,11 +67,6 @@ return [
             'repository' => Folklore\Contracts\Repositories\Users::class,
         ],
 
-        // 'users' => [
-        //     'driver' => 'eloquent',
-        //     'model' => App\Models\User::class,
-        // ],
-
         // 'users' => [
         //     'driver' => 'database',
         //     'table' => 'users',
@@ -81,20 +78,24 @@ return [
     | Resetting Passwords
     |--------------------------------------------------------------------------
     |
-    | You may specify multiple password reset configurations if you have more
-    | than one user table or model in the application and you want to have
-    | separate password reset settings based on the specific user types.
+    | These configuration options specify the behavior of Laravel's password
+    | reset functionality, including the table utilized for token storage
+    | and the user provider that is invoked to actually retrieve users.
     |
-    | The expire time is the number of minutes that each reset token will be
+    | The expiry time is the number of minutes that each reset token will be
     | considered valid. This security feature keeps tokens short-lived so
     | they have less time to be guessed. You may change this as needed.
     |
+    | The throttle setting is the number of seconds a user must wait before
+    | generating more password reset tokens. This prevents the user from
+    | quickly generating a very large amount of password reset tokens.
+    |
     */
 
     'passwords' => [
         'users' => [
             'provider' => 'users',
-            'table' => 'password_resets',
+            'table' => env('AUTH_PASSWORD_RESET_TOKEN_TABLE', 'password_reset_tokens'),
             'expire' => 60,
             'throttle' => 60,
         ],
@@ -105,12 +106,12 @@ return [
     | Password Confirmation Timeout
     |--------------------------------------------------------------------------
     |
-    | Here you may define the amount of seconds before a password confirmation
-    | times out and the user is prompted to re-enter their password via the
+    | Here you may define the number of seconds before a password confirmation
+    | window expires and users are asked to re-enter their password via the
     | confirmation screen. By default, the timeout lasts for three hours.
     |
     */
 
-    'password_timeout' => 10800,
+    'password_timeout' => env('AUTH_PASSWORD_TIMEOUT', 10800),
 
 ];

package/lib/generators/laravel-project/templates/laravel/resources/views/meta/base.blade.php

@@ -1,11 +1,11 @@
 <title>{{ $title }}</title>
 
 <meta name="language" content="{{ $locale }}">
-<meta name="description" content="{{ $description }}" data-react-helmet="true">
+<meta name="description" content="{{ $description }}">
 
 @if (isset($keywords) && sizeof($keywords))
-<meta name="keywords" content="{{ $keywords->implode(',') }}" data-react-helmet="true">
+<meta name="keywords" content="{{ $keywords->implode(',') }}">
 @endif
 
-<link rel="shortcut icon" href="{{ asset('static/media/favicon/favicon.ico') }}" type="image/x-ico" data-react-helmet="true">
-<link rel="icon" href="{{ asset('static/media/favicon/favicon.png') }}" type="image/png" data-react-helmet="true">
+<link rel="shortcut icon" href="{{ asset('static/media/favicon/favicon.ico') }}" type="image/x-ico">
+<link rel="icon" href="{{ asset('static/media/favicon/favicon.png') }}" type="image/png">

package/lib/generators/laravel-project/templates/laravel/resources/views/meta/opengraph.blade.php

@@ -1,9 +1,9 @@
 <!-- Open Graph -->
 <meta property="og:locale" content="{{$locale}}">
-<meta property="og:title" content="{{ $title }}" data-react-helmet="true">
-<meta property="og:type" content="website" data-react-helmet="true">
-<meta property="og:description" content="{{ $description }}" data-react-helmet="true">
-<meta property="og:url" content="{{ $url }}" data-react-helmet="true">
+<meta property="og:title" content="{{ $title }}">
+<meta property="og:type" content="website">
+<meta property="og:description" content="{{ $description }}">
+<meta property="og:url" content="{{ $url }}">
 @if(isset($image))
-    <meta property="og:image" content="{{ $image }}" data-react-helmet="true">
+    <meta property="og:image" content="{{ $image }}">
 @endif

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

@@ -182,7 +182,7 @@ class LernaPackageGenerator extends _generator.default {
           this.fs.copyTpl(this.templatePath('src/react/__stories__/Component.story.jsx'), this.packagePath(`src/__stories__/${componentName}.story.jsx`), {
             componentName
           });
-          this.fs.copyTpl(this.templatePath('src/react/index.js'), this.packagePath('src/index.js'), {
+          this.fs.copyTpl(this.templatePath('src/react/index.ts'), this.packagePath('src/index.ts'), {
             componentName
           });
           this.fs.copy(this.templatePath('src/react/styles.scss'), this.packagePath('src/styles.scss'));

package/lib/generators/lerna-repository/templates/jest.config.js

@@ -16,7 +16,7 @@ const moduleNameMapper = getPackagesPaths().reduce((map, packagePath) => {
     const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
     return {
         ...map,
-        [packageJson.name]: `<rootDir>/${packagePath}/src/index.js`,
+        [packageJson.name]: `<rootDir>/${packagePath}/src/index.ts`,
     };
 }, {});
 

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

@@ -155,11 +155,11 @@ class MicromagProjectGenerator extends _generator.default {
       },
       dependencies() {
         this.addDependencies({
-          '@micromag/viewer': '^0.3.767',
-          '@micromag/data': '^0.3.767',
-          '@micromag/core': '^0.3.767',
-          '@micromag/consent': '^0.3.767',
-          '@micromag/intl': '^0.3.767'
+          '@micromag/viewer': '^0.4.0',
+          '@micromag/data': '^0.4.0',
+          '@micromag/core': '^0.4.0',
+          '@micromag/consent': '^0.4.0',
+          '@micromag/intl': '^0.4.0'
         });
       }
     };

package/lib/generators/micromag-project/templates/App.tsx

@@ -5,7 +5,6 @@ import { IntlProvider } from '@micromag/intl';
 
 import { AnalyticsProvider } from '../contexts/AnalyticsContext';
 import { ModalProvider } from '../contexts/ModalContext';
-import { MicromagItem } from '../types/micromag';
 import Routes from './Routes';
 
 import defaultMicromags from '../micromags';

package/lib/generators/micromag-project/templates/MicromagPage.tsx

@@ -3,7 +3,6 @@ import { useLocation } from 'wouter';
 
 import useMicromagStory from '../../hooks/useMicromagStory';
 
-import { MicromagItem } from '../../types/micromag';
 import Micromag from '../partials/Micromag';
 import PageMeta from '../partials/PageMeta';
 

package/lib/generators/micromag-project/templates/Routes.tsx

@@ -1,6 +1,5 @@
 import { Route, Switch } from 'wouter';
 
-import { MicromagItem } from '../types/micromag';
 import MainLayout from './layouts/Main';
 import MicromagPage from './pages/Micromag';
 

package/lib/generators/micromag-project/templates/hooks/useMicromagPreview.ts

@@ -1,5 +1,4 @@
 import { useMemo } from 'react';
-import { MicromagStory } from '../types/micromag';
 
 export function useMicromagPreview(story: MicromagStory): MicromagStory {
     return useMemo(() => {

package/lib/generators/micromag-project/templates/hooks/useMicromagStory.ts

@@ -4,7 +4,6 @@ import { useEffect, useState } from 'react';
 import addTrackingCodesToStory from '../lib/addTrackingCodesToStory';
 
 import { useAnalytics } from '../contexts/AnalyticsContext';
-import { MicromagItem } from '../types/micromag';
 
 const cache = new Map();
 

package/lib/generators/micromag-project/templates/hooks/useMicromagVideo.ts

@@ -1,7 +1,5 @@
 import { useMemo } from 'react';
 
-import { MicromagStory } from '../types/micromag';
-
 export function useMicromagVideo(story: MicromagStory): {
     url: string | null;
     thumbnail: string | null;

package/lib/generators/micromag-project/templates/hooks/useStoryTrackingVariables.ts

@@ -2,8 +2,6 @@ import isEmpty from 'lodash/isEmpty';
 import uniq from 'lodash/uniq';
 import { useMemo } from 'react';
 
-import { MicromagStory } from '../types/micromag';
-
 export function useStoryTrackingVariables(story: MicromagStory): Record<string, unknown> {
     const trackingVariables = useMemo(() => {
         // Organisation level

package/lib/generators/micromag-project/templates/index.html.ejs

@@ -14,7 +14,7 @@
 
         <meta property="og:locale" content="fr_CA" />
         <meta property="og:image" content="/static/media/facebook.jpg" />
-        <meta property="og:title" content="Espace pour la vie - Micromags" />
+        <meta property="og:title" content="Micromags" />
         <meta property="og:type" content="website" />
         <meta property="og:description" content="" />
         <meta property="og:url" content="/" />

package/lib/generators/micromag-project/templates/kiosk/Routes.tsx

@@ -1,7 +1,6 @@
 import { useRoutes } from '@folklore/routes';
 import { Route, Switch } from 'wouter';
 
-import { MicromagItem } from '../types/micromag';
 import MainLayout from './layouts/Main';
 import HomePage from './pages/Home';
 import MicromagPage from './pages/Micromag';

package/lib/generators/micromag-project/templates/kiosk/micromags.ts

@@ -1,5 +1,3 @@
-import { MicromagItem } from './types/micromag';
-
 import testStory from './micromags/test/data.json';
 
 const micromags: MicromagItem[] = [

package/lib/generators/micromag-project/templates/lib/addTrackingCodesToStory.ts

@@ -1,5 +1,3 @@
-import { MicromagStory } from '../types/micromag';
-
 export default function addTrackingCodesToStory(story: MicromagStory, extraCodes: string[]) {
     if (extraCodes.length <= 0 || story === null) {
         return story;

package/lib/generators/micromag-project/templates/micromags.ts

@@ -1,5 +1,3 @@
-import { MicromagItem } from './types/micromag';
-
 import testStory from './micromag/data.json';
 
 const micromags: MicromagItem[] = [

package/lib/generators/micromag-project/templates/partials/Micromag.tsx

@@ -7,8 +7,6 @@ import { useState, useCallback, useMemo, ReactNode } from 'react';
 
 import useStoryTrackingVariables from '../../hooks/useStoryTrackingVariables';
 
-import { MicromagStory } from '../../types/micromag';
-
 import styles from '<%= getRelativeStylesPath('components/partials/Micromag.jsx', 'partials/micromag.module.css') %>';
 
 interface MicromagProps {

package/lib/generators/micromag-project/templates/partials/Thumbnail.tsx

@@ -1,7 +1,6 @@
 import useMicromagStory from '../../hooks/useMicromagStory';
 import { useMicromagVideo } from '../../hooks/useMicromagVideo';
 
-import { MicromagItem } from '../../types/micromag';
 import Preview from './Preview';
 import Video from './Video';
 

package/lib/generators/micromag-project/templates/types/micromag.d.ts

@@ -1,15 +1,15 @@
-export interface MicromagTrackingCode {
+interface MicromagTrackingCode {
     id: string;
     type: string;
     [key: string]: unknown;
 }
 
-export interface MicromagVideo {
+interface MicromagVideo {
     media?: string;
     [key: string]: unknown;
 }
 
-export interface MicromagComponent {
+interface MicromagComponent {
     id: string;
     type: string;
     video?: MicromagVideo;
@@ -20,7 +20,7 @@ export interface MicromagComponent {
     [key: string]: unknown;
 }
 
-export interface MicromagOrganisation {
+interface MicromagOrganisation {
     slug?: string;
     tracking?: {
         codes?: MicromagTrackingCode[];
@@ -32,7 +32,7 @@ export interface MicromagOrganisation {
     [key: string]: unknown;
 }
 
-export interface MicromagStory {
+interface MicromagStory {
     title?: string;
     metadata?: {
         [key: string]: unknown;
@@ -50,7 +50,7 @@ export interface MicromagStory {
     [key: string]: unknown;
 }
 
-export interface MicromagItem {
+interface MicromagItem {
     id: string;
     slug: string;
     story?: MicromagStory;

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

@@ -107,7 +107,7 @@ class NodeProjectGenerator extends _generator.default {
   get writing() {
     return {
       index() {
-        this.fs.copyTpl(this.templatePath('index.js'), this.srcPath('index.js'));
+        this.fs.copyTpl(this.templatePath('index.ts'), this.srcPath('index.ts'));
       },
       packageJson() {
         const {
@@ -115,7 +115,7 @@ class NodeProjectGenerator extends _generator.default {
           'html-path': htmlPath,
           'server-path': serverPath
         } = this.options;
-        const webEntryPath = _path.default.join(srcPath, htmlPath, 'index.js');
+        const webEntryPath = _path.default.join(srcPath, htmlPath, 'index.ts');
         const serverEntryPath = _path.default.join(srcPath, serverPath, 'server.js');
         const scripts = {
           'build:web': `flklr build --load-env ${(0, _utils.ensureLeadingDotSlash)(webEntryPath)}`,