chore: updated laravel package to latest version

Author: yagnikvamja

.github/workflows/deploy-laravel-demo-free.yml

@@ -0,0 +1,120 @@
+name: Deploy - Demos Free
+run-name: ${{ inputs.is_production && '🚀' || '🧪' }} Deploy - Demos Free
+
+on:
+ workflow_dispatch:
+ inputs:
+ is_production:
+ type: boolean
+ description: Is production deployment
+
+jobs:
+ deployment:
+ runs-on: ubuntu-latest
+ env:
+ STAG_DIR: ${{ secrets.PROD_DIR }}staging/
+ DEPLOY_DIR: ${{ secrets.PROD_DIR }}${{ !inputs.is_production && 'staging/' || '' }}
+ steps:
+ - name: ⚙️ Setup pnpm
+ uses: pnpm/action-setup@v4
+ with:
+ version: 8
+
+ - name: ⚙️ Set BRAND_NAME environment variable from repo name
+ run: echo BRAND_NAME=${{ github.event.repository.name }} | cut -d '-' -f1 >> $GITHUB_ENV
+
+ - name: ⬇️ Clone current repo under /<template-name>/vue-laravel-free
+ uses: actions/checkout@v3
+ with:
+ path: ${{ env.BRAND_NAME }}/vue-laravel-free
+
+ - name: ⬇️ Clone automation scripts repo under /automation-scripts
+ uses: actions/checkout@v3
+ with:
+ repository: themeselection/automation-scripts
+ token: ${{ secrets.GH_PAT }}
+ path: automation-scripts
+
+ - name: ⬇️ Install packages in automation-scripts dir
+ working-directory: automation-scripts/vue
+ run: pnpm install
+
+ - name: ⚙️ Set LARAVEL_CORE_DIR_NAME environment variable from generated env file
+ working-directory: automation-scripts/vue
+ run: pnpm tsx src/templates/${{ env.BRAND_NAME }}/scripts/genLaravelCoreDirNameEnvFile.ts --isFree $([[ "${{ inputs.is_production }}" != "true" ]] && echo --staging) && cat .env.laravel-core-dir-name >> $GITHUB_ENV
+
+ - name: ⬇️ Install packages in typescript full version
+ working-directory: ${{ env.BRAND_NAME }}/vue-laravel-free/typescript-version
+ run: pnpm i && composer install
+
+ - name: 🎭 Create .env file from .env.example & generate APP_KEY via `php artisan key:generate`
+ working-directory: ${{ env.BRAND_NAME }}/vue-laravel-free/typescript-version
+ run: cp .env.example .env && php artisan key:generate
+
+ - name: 📦 Generate demos
+ working-directory: automation-scripts/vue
+ run: pnpm tsx src/templates/${{ env.BRAND_NAME }}/scripts/genLaravelDemos.ts --isFree $([[ "${{ inputs.is_production }}" != "true" ]] && echo --staging)
+
+ - name: 🚀 Upload demos zip
+ uses: appleboy/scp-action@master
+ with:
+ host: ${{ secrets.HOST }}
+ username: ${{ secrets.USERNAME }}
+ port: ${{ secrets.PORT }}
+ key: ${{ secrets.SSHKEY }}
+ source: ${{ env.BRAND_NAME }}/vue-laravel-free/typescript-version/*.zip
+ target: ${{ secrets.LARAVEL_CORE_CONTAINER_DIR }}
+ strip_components: 3
+
+ - name: 🪄 Setup demos
+ uses: appleboy/ssh-action@v0.1.5
+ with:
+ host: ${{ secrets.HOST }}
+ username: ${{ secrets.USERNAME }}
+ port: ${{ secrets.PORT }}
+ key: ${{ secrets.SSHKEY }}
+ script: |
+ # create deployment dir if doesn't exist
+ mkdir -p ${{ env.DEPLOY_DIR }}
+
+ # navigate to laravel core container dir
+ cd ${{ secrets.LARAVEL_CORE_CONTAINER_DIR }}
+
+ # Remove existing backup zip
+ rm -rf bak-${{ env.LARAVEL_CORE_DIR_NAME }}-*.zip
+
+ # Remove existing laravel core dir
+ rm -rf ${{ env.LARAVEL_CORE_DIR_NAME }}
+
+ # if prod => zip existing laravel core
+ DEMO_ZIP_NAME="bak-${{ env.LARAVEL_CORE_DIR_NAME }}-$(date +"%Y-%m-%d-%H-%M-%S").zip"
+ [[ "${{ inputs.is_production }}" == "true" ]] && zip -r $DEMO_ZIP_NAME ${{ env.LARAVEL_CORE_DIR_NAME }} -x "*.zip"
+
+ # remove existing staging laravel core & staging demos
+ # ℹ️ Previously we were only performing this removal if `inputs.is_production` is true but doing this for staging as well might remove permission issue in future
+ rm -rf ${{ env.STAG_DIR }}/demo
+
+ # Remove staging laravel core dir
+ # ℹ️ This is tricky because if it's staging then `env.LARAVEL_CORE_DIR_NAME` will have `-staging` already suffixed and work perfectly without below command.
+ # Additionally, below command will result in something like this (that won't do anything) in staging env: `rm -rf <brand>-vuejs-laravel-admin-template-staging-staging`
+ # However, in production it will allow us to remove staging laravel core dir
+ rm -rf ${{ env.LARAVEL_CORE_DIR_NAME }}-staging
+
+ # remove existing demos
+ rm -rf ${{ env.DEPLOY_DIR }}/demo
+
+ # unzip the uploaded laravel core. "-q" option will silently unzip without logs
+ unzip -q ${{ env.LARAVEL_CORE_DIR_NAME }}.zip
+
+ # remove the uploaded zip
+ rm -rf ${{ env.LARAVEL_CORE_DIR_NAME }}.zip
+ 
+ # ATM, we have successfully, uploaded the zip to server with file cleanup. Next, just move the demo in its place
+
+ mv ${{ env.LARAVEL_CORE_DIR_NAME }}/demo ${{ env.DEPLOY_DIR }}
+
+ # create logs dir & laravel.log file in laravel core if doesn't exist. We are doing "echo ls $" because if we don't, "mkdir -p" will create dir as "<brand>*" instead of full name "<brand>-xxx"
+ mkdir -p ${{ env.LARAVEL_CORE_DIR_NAME }}/storage/logs/ && touch ${{ env.LARAVEL_CORE_DIR_NAME }}/storage/logs/laravel.log
+
+ # grant read & write permission to group & other
+ chmod -R g+rw ${{ env.LARAVEL_CORE_DIR_NAME }}/storage

javascript-version/.env.example

@@ -8,18 +8,18 @@ LOG_CHANNEL=stack
 LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 
-DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE=laravel
-DB_USERNAME=root
+DB_CONNECTION=sqlite
+DB_HOST=
+DB_PORT=
+DB_DATABASE=
+DB_USERNAME=
 DB_PASSWORD=
 
-BROADCAST_DRIVER=log
-CACHE_DRIVER=file
+BROADCAST_DRIVER=
+CACHE_DRIVER=
 FILESYSTEM_DISK=local
-QUEUE_CONNECTION=sync
-SESSION_DRIVER=file
+QUEUE_CONNECTION=database
+SESSION_DRIVER=database
 SESSION_LIFETIME=120
 
 MEMCACHED_HOST=127.0.0.1
@@ -28,9 +28,9 @@ REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
-MAIL_MAILER=smtp
-MAIL_HOST=mailpit
-MAIL_PORT=1025
+MAIL_MAILER=log
+MAIL_HOST=127.0.0.1
+MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
@@ -47,9 +47,9 @@ PUSHER_APP_ID=
 PUSHER_APP_KEY=
 PUSHER_APP_SECRET=
 PUSHER_HOST=
-PUSHER_PORT=443
-PUSHER_SCHEME=https
-PUSHER_APP_CLUSTER=mt1
+PUSHER_PORT=
+PUSHER_SCHEME=
+PUSHER_APP_CLUSTER=
 
 VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 VITE_PUSHER_HOST="${PUSHER_HOST}"

javascript-version/.eslintrc-auto-import.json

@@ -4,10 +4,14 @@
  "ComponentPublicInstance": true,
  "ComputedRef": true,
  "EffectScope": true,
+ "ExtractDefaultPropTypes": true,
+ "ExtractPropTypes": true,
+ "ExtractPublicPropTypes": true,
  "InjectionKey": true,
  "PropType": true,
  "Ref": true,
  "VNode": true,
+ "WritableComputedRef": true,
  "acceptHMRUpdate": true,
  "asyncComputed": true,
  "autoResetRef": true,
@@ -45,6 +49,7 @@
  "h": true,
  "ignorableWatch": true,
  "inject": true,
+ "injectLocal": true,
  "isDefined": true,
  "isProxy": true,
  "isReactive": true,
@@ -82,6 +87,7 @@
  "onUpdated": true,
  "pausableWatch": true,
  "provide": true,
+ "provideLocal": true,
  "reactify": true,
  "reactifyObject": true,
  "reactive": true,
@@ -152,6 +158,7 @@
  "useCeil": true,
  "useClamp": true,
  "useClipboard": true,
+ "useClipboardItems": true,
  "useCloned": true,
  "useColorMode": true,
  "useConfirmDialog": true,
@@ -258,7 +265,6 @@
  "useSpeechRecognition": true,
  "useSpeechSynthesis": true,
  "useStepper": true,
- "useStorage": true,
  "useStorageAsync": true,
  "useStyleTag": true,
  "useSum": true,

javascript-version/.eslintrc.js renamed to javascript-version/.eslintrc.cjs

@@ -9,6 +9,8 @@ module.exports = {
  'plugin:import/recommended',
  'plugin:promise/recommended',
  'plugin:sonarjs/recommended',
+ 'plugin:case-police/recommended',
+ 'plugin:regexp/recommended',
 
  // 'plugin:unicorn/recommended',
  ],
@@ -20,15 +22,18 @@ module.exports = {
  plugins: [
  'vue',
  'regex',
+ 'regexp',
  ],
- ignorePatterns: ['resources/js/@iconify/*.js', 'node_modules', 'dist'],
+ ignorePatterns: ['resources/js/plugins/iconify/*.js', 'node_modules', 'dist', '*.d.ts', 'vendor', '*.json'],
  rules: {
  'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
  'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
 
  // indentation (Already present in TypeScript)
  'comma-spacing': ['error', { before: false, after: true }],
  'key-spacing': ['error', { afterColon: true }],
+ 'n/prefer-global/process': ['off'],
+ 'sonarjs/cognitive-complexity': ['off'],
 
  'vue/first-attribute-linebreak': ['error', {
  singleline: 'beside',
@@ -45,6 +50,9 @@ module.exports = {
  // Enforce consistent spacing inside braces of object (Already present in TypeScript)
  'object-curly-spacing': ['error', 'always'],
 
+ // Enforce camelCase naming convention
+ 'camelcase': 'error',
+
  // Disable max-len
  'max-len': 'off',
 
@@ -67,6 +75,9 @@ module.exports = {
  allowClassStart: true,
  allowObjectStart: true,
  allowArrayStart: true,
+
+ // We don't want to add extra space above closing SECTION
+ ignorePattern: '!SECTION',
  },
  ],
 
@@ -88,7 +99,10 @@ module.exports = {
  // Plugin: eslint-plugin-import
  'import/prefer-default-export': 'off',
  'import/newline-after-import': ['error', { count: 1 }],
- 'no-restricted-imports': ['error', 'vuetify/components'],
+ 'no-restricted-imports': ['error', 'vuetify/components', {
+ name: 'vue3-apexcharts',
+ message: 'apexcharts are auto imported',
+ }],
 
  // For omitting extension for ts files
  'import/extensions': [
@@ -107,6 +121,8 @@ module.exports = {
  ignore: [
  '~pages$',
  'virtual:generated-layouts',
+ '#auth$',
+ '#components$',
 
  // Ignore vite's ?raw imports
  '.*\?raw',
@@ -124,7 +140,7 @@ module.exports = {
  // ESLint plugin vue
  'vue/block-tag-newline': 'error',
  'vue/component-api-style': 'error',
- 'vue/component-name-in-template-casing': ['error', 'PascalCase', { registeredComponentsOnly: false }],
+ 'vue/component-name-in-template-casing': ['error', 'PascalCase', { registeredComponentsOnly: false, ignores: ['/^swiper-/'] }],
  'vue/custom-event-name-casing': ['error', 'camelCase', {
  ignores: [
  '/^(click):[a-z]+((\d)|([A-Z0-9][a-z0-9]+))*([A-Z])?/',
@@ -138,8 +154,7 @@ module.exports = {
  'vue/no-child-content': 'error',
  'vue/require-default-prop': 'off',
 
- // NOTE this rule only supported in SFC, Users of the unplugin-vue-define-options should disable that rule: https://github.com/vuejs/eslint-plugin-vue/issues/1886
- // 'vue/no-duplicate-attr-inheritance': 'error',
+ 'vue/no-duplicate-attr-inheritance': 'error',
  'vue/no-empty-component-block': 'error',
  'vue/no-multiple-objects-in-class': 'error',
  'vue/no-reserved-component-names': 'error',
@@ -171,6 +186,8 @@ module.exports = {
  // },
  // }],
 
+ // Internal Rules
+
  // https://github.com/gmullerb/eslint-plugin-regex
  'regex/invalid': [
  'error',
@@ -181,16 +198,16 @@ module.exports = {
  message: 'Use \'@images\' path alias for image imports',
  },
  {
- regex: '@/styles',
+ regex: '@/assets/styles',
  replacement: '@styles',
- message: 'Use \'@styles\' path alias for importing styles from \'resources/js/styles\'',
+ message: 'Use \'@styles\' path alias for importing styles from \'resources/js/assets/styles\'',
  },
 
- // {
- //  id: 'Disallow icon of icon library',
- //  regex: 'tabler-\\w',
- //  message: 'Only \'mdi\' icons are allowed',
- // },
+ {
+ id: 'Disallow icon of icon library',
+ regex: 'tabler-\\w',
+ message: 'Only \'mdi\' icons are allowed',
+ },
 
  {
  regex: '@core/\\w',
@@ -206,25 +223,16 @@ module.exports = {
  inspect: '^(?!.*(@core|@layouts)).*',
  },
  },
- {
- regex: 'import axios from \'axios\'',
- replacement: 'import axios from \'@axios\'',
- message: 'Use axios instances created in \'resources/js/plugin/axios.js\' instead of unconfigured axios',
- files: {
- ignore: '^.*plugins/axios.js.*',
- },
- },
  ],
 
  // Ignore files
- '\.eslintrc\.js',
+ '\.eslintrc\.cjs',
  ],
  },
  settings: {
  'import/resolver': {
- node: {
- extensions: ['.js', '.js', '.jsx', '.jsx', '.mjs', '.png', '.jpg'],
- }, alias: { 'extensions': ['.ts', '.js', '.tsx', '.jsx', '.mjs'], 'map': [["@", "./resources/js"], ["@core", "./resources/js/@core"], ["@layouts", "./resources/js/@layouts"], ["@images", "./resources/images/"], ["@styles", "./resources/styles/"], ["@configured-variables", "./resources/styles/variables/_template.scss"], ["@axios", "./resources/js/plugins/axios"], ["apexcharts", "node_modules/apexcharts-clevision"]] },
+ node: true,
+ typescript: { project: './jsconfig.json' },
  },
  },
 }