Merge branch 'main' of https://github.com/themeselection/master-vue-free

Author: yagnikvamja

.github/workflows/deploy-demos.yml

@@ -6,19 +6,37 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
+      - name: ⚙️ Setup pnpm
+        uses: pnpm/action-setup@v3
+        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: ⬇️ Checkout template
-        uses: actions/checkout@v3
+      - name: ⬇️ Clone current repo under /<brand-name>/vue-free
+        uses: actions/checkout@v4
+        with:
+          path: ${{ env.BRAND_NAME }}/vue-free
 
-      - name: ⬇️ Install packages
-        run: yarn install
-        working-directory: ./typescript-version
+      - name: ⬇️ Clone automation scripts repo under /automation-scripts
+        uses: actions/checkout@v4
+        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: ⚙️ Prepare free demo
+        working-directory: automation-scripts/vue
+        run: pnpm tsx src/templates/${{ env.BRAND_NAME }}/scripts/prepareVueFreeDemo.ts
 
       - name: 📦 Generate demo
-        run: yarn build --base=/${{ env.BRAND_NAME }}-vuetify-vuejs-admin-template-free/demo/
-        working-directory: ./typescript-version
+        working-directory: ${{ env.BRAND_NAME }}/vue-free/typescript-version
+        run: pnpm i && pnpm build --base=/${{ env.BRAND_NAME }}-vuetify-vuejs-admin-template-free/demo/
 
       - name: 🚀 Upload demo
         uses: appleboy/scp-action@master
@@ -27,11 +45,7 @@ jobs:
           USERNAME: ${{ secrets.USERNAME }}
           PORT: ${{ secrets.PORT }}
           KEY: ${{ secrets.SSHKEY }}
-          source: ./typescript-version/dist
+          source: ${{ env.BRAND_NAME }}/vue-free/typescript-version/dist
           target: ${{ secrets.PROD_DIR }}/demo
-
-          # remove target folder before uploading data 
           rm: true
-
-          # Setting it to `1` will upload all the files inside "dist" dir instead of "dist" dir itself
-          strip_components: 3
+          strip_components: 4

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

@@ -11,6 +11,8 @@ module.exports = {
     'plugin:promise/recommended',
     'plugin:sonarjs/recommended',
     'plugin:@typescript-eslint/recommended',
+    'plugin:case-police/recommended',
+    'plugin:regexp/recommended',
 
     // 'plugin:unicorn/recommended',
   ],
@@ -24,22 +26,26 @@ module.exports = {
     'vue',
     '@typescript-eslint',
     'regex',
+    'regexp',
   ],
-  ignorePatterns: ['src/@iconify/*.js', 'node_modules', 'dist', '*.d.ts'],
+  ignorePatterns: ['src/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',
       multiline: 'below',
     }],
 
     'antfu/top-level-function': 'off',
+    '@typescript-eslint/no-explicit-any': 'off',
 
     // indentation (Already present in TypeScript)
     'indent': ['error', 2],
@@ -50,6 +56,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',
 
@@ -72,11 +81,14 @@ module.exports = {
         allowClassStart: true,
         allowObjectStart: true,
         allowArrayStart: true,
+
+        // We don't want to add extra space above closing SECTION
+        ignorePattern: '!SECTION',
       },
     ],
 
     // Ignore _ as unused variable
-    '@typescript-eslint/no-unused-vars': ['error', { argsIgnorePattern: '^_+$' }],
+    '@typescript-eslint/no-unused-vars': ['error', { varsIgnorePattern: '^_+$', argsIgnorePattern: '^_+$' }],
 
     'array-element-newline': ['error', 'consistent'],
     'array-bracket-newline': ['error', 'consistent'],
@@ -94,7 +106,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': [
@@ -113,6 +128,8 @@ module.exports = {
       ignore: [
         '~pages$',
         'virtual:generated-layouts',
+        '#auth$',
+        '#components$',
 
         // Ignore vite's ?raw imports
         '.*\?raw',
@@ -132,7 +149,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])?/',
@@ -146,8 +163,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',
@@ -191,16 +207,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 \'src/styles\'',
+          message: 'Use \'@styles\' path alias for importing styles from \'src/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',
@@ -216,25 +232,15 @@ module.exports = {
             inspect: '^(?!.*(@core|@layouts)).*',
           },
         },
-        {
-          regex: 'import axios from \'axios\'',
-          replacement: 'import axios from \'@axios\'',
-          message: 'Use axios instances created in \'src/plugin/axios.ts\' instead of unconfigured axios',
-          files: {
-            ignore: '^.*plugins/axios.ts.*',
-          },
-        },
       ],
 
       // Ignore files
-      '\.eslintrc\.js',
+      '\.eslintrc\.cjs',
     ],
   },
   settings: {
     'import/resolver': {
-      node: {
-        extensions: ['.ts', '.js', '.tsx', '.jsx', '.mjs', '.png', '.jpg'],
-      },
+      node: true,
       typescript: {},
     },
   },