Merge branch 'tests-configs' into tests

webdevnerdstuff · webdevnerdstuff · commit 87d8f35b3285 · 2024-11-18T17:41:58.000-08:00
diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
@@ -25,7 +25,7 @@ jobs:
         with:
           name: build
           if-no-files-found: error
-          path: build
+          path: ./dist
 
   cypress-run:
     runs-on: ubuntu-22.04
@@ -43,13 +43,14 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: build
-          path: build
+          path: ./dist
 
       - name: Install dependencies
         run: pnpm install
 
       - name: Cypress run
         uses: cypress-io/github-action@v6
         with:
-          start: pnpm start
+          start: pnpm cy:run
+          component: true
           browser: chrome
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 
-npx lint-staged && npm run test:build
+# npx lint-staged && npm run test:build
 npx lint-staged
diff --git a/.husky/prepare-commit-msg b/.husky/prepare-commit-msg
diff --git a/cypress.config.ts b/cypress.config.ts
@@ -1,5 +1,5 @@
 import { defineConfig } from 'cypress';
-import customViteConfig from './vite.cypress.config.ts';
+import customViteConfig from './vite.cypress.config';
 
 export default defineConfig({
 	e2e: {
diff --git a/cypress/support/component.ts b/cypress/support/component.ts
@@ -5,21 +5,20 @@ import { h } from "vue";
 import { mount } from 'cypress/vue';
 import VStepperForm from '../../src/plugin/VStepperForm.vue';
 import * as DATA from '../templates/testData';
-import { Component } from 'vue';
+import type { Component } from 'vue';
 
 
-
-declare global {
-	namespace Cypress {
-		interface Chainable {
-			baseIconClass(icon: string): string;
-			getBaseStepperElements(): Chainable;
-			getDataCy(value: string): Chainable<JQuery<HTMLElement>>;
-			mount: typeof mount;
-			mountComponent(options: any): Chainable;
-		}
-	}
-}
+// declare global {
+// 	namespace Cypress {
+// 		interface Chainable {
+// 			baseIconClass(icon: string): string;
+// 			getBaseStepperElements(): Chainable;
+// 			getDataCy(value: string): Chainable<JQuery<HTMLElement>>;
+// 			mount: typeof mount;
+// 			mountComponent(options: any): Chainable;
+// 		}
+// 	}
+// }
 
 Cypress.Commands.add('mount', (component: Component, options: any = {}) => {
 	// Ensure global settings are defined
@@ -87,7 +86,7 @@ Cypress.Commands.add('mountComponent', (options: MountComponentOptions = {}) =>
 	const localModelValue = { ...answers, ...modelValue };
 
 	return cy.then(() => {
-		cy.mount(VStepperForm, {
+		cy.mount(VStepperForm as any, {
 			props: {
 				modelValue: localModelValue,
 				pages: [{ fields: [{ ...fieldDefault, ...field, }], }],
diff --git a/dist/plugin/components/fields/CommonField/index.d.ts b/dist/plugin/components/fields/CommonField/index.d.ts
@@ -1,6 +1,6 @@
+import { Field, GlobalChips, GlobalClosableChips, GlobalCloseText, GlobalMultiple, GlobalVariant, SharedProps } from '../../../types';
 import { Component } from 'vue';
 import { default as CommonField } from './CommonField.vue';
-import { Field, GlobalChips, GlobalClosableChips, GlobalCloseText, GlobalMultiple, GlobalVariant, SharedProps } from '../../../types';
 interface InternalField extends Omit<Field, 'inline' | 'inlineSpacing' | 'labelPositionLeft'> {
     chips?: GlobalChips;
     closableChips?: GlobalClosableChips;
diff --git a/dist/plugin/components/fields/VSFButtonField/index.d.ts b/dist/plugin/components/fields/VSFButtonField/index.d.ts
@@ -1,6 +1,6 @@
-import { default as VSFButtonField } from './VSFButtonField.vue';
 import { Field, GlobalDensity, SharedProps } from '../../../types';
 import { VBtn } from 'vuetify/components';
+import { default as VSFButtonField } from './VSFButtonField.vue';
 export interface Option {
     appendIcon?: VBtn['appendIcon'];
     class?: string;
diff --git a/dist/plugin/components/fields/VSFCheckbox/index.d.ts b/dist/plugin/components/fields/VSFCheckbox/index.d.ts
@@ -1,6 +1,6 @@
-import { default as VSFCheckbox } from './VSFCheckbox.vue';
 import { Field, SharedProps } from '../../../types';
 import { VCheckbox } from 'vuetify/components';
+import { default as VSFCheckbox } from './VSFCheckbox.vue';
 interface InternalField extends Field {
     color?: VCheckbox['color'];
     density?: VCheckbox['density'];
diff --git a/dist/plugin/components/fields/VSFCustom/index.d.ts b/dist/plugin/components/fields/VSFCustom/index.d.ts
@@ -1,5 +1,5 @@
-import { default as VSFCustom } from './VSFCustom.vue';
 import { Field, SharedProps } from '../../../types';
+import { default as VSFCustom } from './VSFCustom.vue';
 interface InternalField extends Omit<Field, 'inline' | 'inlineSpacing' | 'labelPositionLeft'> {
 }
 export interface VSFCustomProps extends SharedProps {
diff --git a/dist/plugin/components/fields/VSFRadio/index.d.ts b/dist/plugin/components/fields/VSFRadio/index.d.ts
@@ -1,6 +1,6 @@
-import { default as VSFRadio } from './VSFRadio.vue';
 import { Field, SharedProps } from '../../../types';
 import { VRadio, VRadioGroup } from 'vuetify/components';
+import { default as VSFRadio } from './VSFRadio.vue';
 export interface RadioGroupProps {
     appendIcon?: VRadioGroup['appendIcon'];
     direction?: VRadioGroup['direction'];
diff --git a/dist/plugin/components/fields/VSFSwitch/index.d.ts b/dist/plugin/components/fields/VSFSwitch/index.d.ts
@@ -1,6 +1,6 @@
-import { default as VSFSwitch } from './VSFSwitch.vue';
 import { Field, SharedProps } from '../../../types';
 import { VSwitch } from 'vuetify/components';
+import { default as VSFSwitch } from './VSFSwitch.vue';
 interface InternalField extends Omit<Field, 'inline' | 'inlineSpacing' | 'labelPositionLeft'> {
     color?: VSwitch['color'];
     density?: VSwitch['density'];
diff --git a/dist/plugin/types/index.d.ts b/dist/plugin/types/index.d.ts
@@ -1,5 +1,5 @@
-import { App } from 'vue';
 import { FieldValidator, FormValidationResult, GenericObject } from 'vee-validate';
+import { App } from 'vue';
 import { VBtn, VStepper, VStepperItem, VStepperWindowItem, VTooltip } from 'vuetify/components';
 import { ValidationRule } from 'vuetify/composables/validation';
 import { Schema } from 'yup';
diff --git a/env.d.ts b/env.d.ts
@@ -0,0 +1 @@
+/// <reference types="vite/client" />
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -15,11 +15,18 @@ export default tseslint.config(
 			'**/cypress/**',
 			'cypress.config.ts',
 			'src/playground/configs/templates/PlaygroundPage.vue',
+			'src/types/cypress.d.ts',
 			'vite.build.config.mts',
 			'vite.config.mts',
 			'vite.cypress.config.ts',
 		],
 	},
+
+	{
+		name: 'app/files-to-ignore',
+		ignores: ['**/dist/**', '**/dist-ssr/**', '**/coverage/**'],
+	},
+
 	{
 		name: 'app/files-to-lint',
 		files: ['**/*.{ts,mts,tsx,vue}'],
@@ -29,7 +36,7 @@ export default tseslint.config(
 			sourceType: 'module',
 			parserOptions: {
 				parser: tseslint.parser,
-				project: ['./tsconfig.json', './tsconfig.node.json'],
+				project: ['./tsconfig.json', './tsconfig.node.json', 'tsconfig.app.json'],
 				extraFileExtensions: ['.vue'],
 				sourceType: 'module',
 			},
diff --git a/src/documentation/DocsPage.vue b/src/documentation/DocsPage.vue
@@ -106,8 +106,8 @@
 </template>
 
 <script setup lang="ts">
-import * as Section from '@/documentation/sections';
 import packageInfo from '../../package.json';
+import * as Section from '@/documentation/sections';
 
 
 const codeBlockSettings = inject<Docs.CodeBlockSettings>('codeBlockSettings')!;
diff --git a/src/plugin/__tests__/VStepperForm.cy.ts b/src/plugin/__tests__/VStepperForm.cy.ts
@@ -1,7 +1,5 @@
-/// <reference types="../cypress" />
-
 import type { Field } from '../../plugin/types';
-import * as DATA from '../../../cypress/templates/testData';
+import * as DATA from '@cypress/templates/testData';
 import VStepperForm from '../VStepperForm.vue';
 
 
diff --git a/src/plugin/components/fields/CommonField/index.ts b/src/plugin/components/fields/CommonField/index.ts
@@ -1,5 +1,3 @@
-import { Component } from 'vue';
-import type CommonField from './CommonField.vue';
 import type {
 	Field,
 	GlobalChips,
@@ -9,6 +7,8 @@ import type {
 	GlobalVariant,
 	SharedProps,
 } from '@/plugin/types';
+import type { Component } from 'vue';
+import CommonField from './CommonField.vue';
 
 
 interface InternalField extends Omit<Field,
diff --git a/src/plugin/components/fields/VSFButtonField/index.ts b/src/plugin/components/fields/VSFButtonField/index.ts
@@ -1,10 +1,10 @@
-import type VSFButtonField from './VSFButtonField.vue';
 import type {
 	Field,
 	GlobalDensity,
 	SharedProps,
 } from '@/plugin/types';
 import type { VBtn } from 'vuetify/components';
+import VSFButtonField from './VSFButtonField.vue';
 
 
 export interface Option {
diff --git a/src/plugin/components/fields/VSFCheckbox/index.ts b/src/plugin/components/fields/VSFCheckbox/index.ts
@@ -1,9 +1,9 @@
-import type VSFCheckbox from './VSFCheckbox.vue';
 import type {
 	Field,
 	SharedProps,
 } from '@/plugin/types';
 import type { VCheckbox } from 'vuetify/components';
+import VSFCheckbox from './VSFCheckbox.vue';
 
 
 interface InternalField extends Field {
diff --git a/src/plugin/components/fields/VSFCustom/index.ts b/src/plugin/components/fields/VSFCustom/index.ts
@@ -1,8 +1,8 @@
-import type VSFCustom from './VSFCustom.vue';
 import type {
 	Field,
 	SharedProps,
 } from '@/plugin/types';
+import VSFCustom from './VSFCustom.vue';
 
 
 interface InternalField extends Omit<Field,
diff --git a/src/plugin/components/fields/VSFRadio/index.ts b/src/plugin/components/fields/VSFRadio/index.ts
@@ -1,9 +1,9 @@
-import type VSFRadio from './VSFRadio.vue';
 import type {
 	Field,
 	SharedProps,
 } from '@/plugin/types';
 import type { VRadio, VRadioGroup } from 'vuetify/components';
+import VSFRadio from './VSFRadio.vue';
 
 
 export interface RadioGroupProps {
diff --git a/src/plugin/components/fields/VSFSwitch/index.ts b/src/plugin/components/fields/VSFSwitch/index.ts
@@ -1,9 +1,9 @@
-import type VSFSwitch from './VSFSwitch.vue';
 import type {
 	Field,
 	SharedProps,
 } from '@/plugin/types';
 import type { VSwitch } from 'vuetify/components';
+import VSFSwitch from './VSFSwitch.vue';
 
 
 interface InternalField extends Omit<Field,
diff --git a/src/plugin/composables/classes.ts b/src/plugin/composables/classes.ts
@@ -1,4 +1,4 @@
-import {
+import type {
 	UseColumnClasses,
 	UseContainerClasses,
 	UseStepperContainerClasses,
diff --git a/src/plugin/composables/helpers.ts b/src/plugin/composables/helpers.ts
@@ -1,5 +1,5 @@
 import { watchDebounced } from '@vueuse/core';
-import {
+import type {
 	UseAutoPage,
 	UseBuildSettings,
 	UseColumnErrorCheck,
diff --git a/src/plugin/composables/validation.ts b/src/plugin/composables/validation.ts
@@ -1,5 +1,5 @@
 
-import {
+import type {
 	UseOnActions,
 } from '../types/index';
 
diff --git a/src/plugin/types/index.ts b/src/plugin/types/index.ts
@@ -1,9 +1,9 @@
-import { App } from 'vue';
 import type {
 	FieldValidator,
 	FormValidationResult,
 	GenericObject,
 } from 'vee-validate';
+import type { App } from 'vue';
 import type {
 	VBtn,
 	// VIcon,
diff --git a/tsconfig.app.json b/tsconfig.app.json
@@ -0,0 +1,92 @@
+{
+	"compilerOptions": {
+		"allowSyntheticDefaultImports": true,
+		"baseUrl": "./",
+		"composite": true,
+		"declaration": true,
+		"declarationDir": "./dist",
+		"esModuleInterop": true,
+		"forceConsistentCasingInFileNames": true,
+		"importHelpers": true,
+		"jsx": "preserve",
+		"lib": [
+			"ESNext",
+			"DOM"
+		],
+		"module": "ESNext",
+		"moduleResolution": "Node",
+		"noEmit": true,
+		"noFallthroughCasesInSwitch": true,
+		"noImplicitAny": false,
+		"noUncheckedIndexedAccess": true,
+		"noUnusedLocals": true,
+		"noUnusedParameters": true,
+		"outDir": "./dist",
+		"paths": {
+			"@/*": [
+				"./src/*"
+			],
+			"@cypress/*": [
+				"./cypress/*"
+			],
+			"@components/*": [
+				"./src/plugin/components/*"
+			],
+			"@composables/*": [
+				"./src/plugin/composables/*"
+			],
+			"@slots/*": [
+				"./src/plugin/slots/*"
+			],
+			"@types/*": [
+				"./src/plugin/types/*"
+			],
+			"@utils/*": [
+				"./src/plugin/utils/*"
+			]
+		},
+		"resolveJsonModule": true,
+		"rootDir": "./src",
+		"skipLibCheck": true,
+		"strict": true,
+		"target": "ESNext",
+		"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
+		"typeRoots": [
+			"./src/plugin/types",
+			"./src/documentation/types",
+			"./node_modules/@types",
+			"./node_modules/vuetify"
+		],
+		"types": [
+			"cypress",
+			"node"
+		],
+		"useDefineForClassFields": true
+	},
+	"include": [
+		"env.d.ts",
+		"src/**/*",
+		"src/**/*.vue",
+		"eslint.config.mjs",
+		"src/App.vue",
+		"src/main.ts",
+		"src/playground/**/*.ts",
+		"src/playground/**/*.vue",
+		"src/documentation/**/*.ts",
+		"src/documentation/**/*.tsx",
+		"src/documentation/**/*.vue",
+		"src/plugin/**/*.ts",
+		"src/plugin/**/*.tsx",
+		"src/plugin/**/*.vue"
+	],
+	"exclude": [
+		"cypress.config.ts",
+		"cypress/**/*.ts",
+		"cypress/**/*.vue",
+		"src/**/__tests__/*",
+		"playground",
+		"src/playground/configs/templates/PlaygroundPage.vue",
+		"src/plugins/**/*.ts",
+		"src/stores/**/*.ts"
+	],
+}
diff --git a/tsconfig.build.json b/tsconfig.build.json
@@ -1,4 +1,7 @@
 {
+	"compilerOptions": {
+		"allowImportingTsExtensions": false,
+	},
 	"exclude": [
 		"**/*__TEMP.*",
 		"**/*__TEMP/",
@@ -21,5 +24,5 @@
 		"src/plugins/**/*.ts",
 		"src/stores/**/*.ts",
 	],
-	"extends": "./tsconfig.json"
+	"extends": "./tsconfig.app.json"
 }
diff --git a/tsconfig.cypress.json b/tsconfig.cypress.json
diff --git a/tsconfig.json b/tsconfig.json
diff --git a/tsconfig.node.json b/tsconfig.node.json
diff --git a/vite.cypress.config.ts b/vite.cypress.config.ts

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-import { default as VSFCustom } from './VSFCustom.vue';`
`2`	`1`	`import { Field, SharedProps } from '../../../types';`
	`2`	`+import { default as VSFCustom } from './VSFCustom.vue';`
`3`	`3`	`interface InternalField extends Omit<Field, 'inline' \| 'inlineSpacing' \| 'labelPositionLeft'> {`
`4`	`4`	`}`
`5`	`5`	`export interface VSFCustomProps extends SharedProps {`