diff --git a/.editorconfig b/.editorconfig index 7f0e03b7..501d0d7a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -15,7 +15,7 @@ indent_style = tab indent_style = space indent_size = 2 -[frontend/**/*.{cjs,js,vue}] +[frontend/**/*.{cjs,js,ts,vue}] indent_style = space indent_size = 2 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7830de07..49297f42 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -73,6 +73,6 @@ jobs: - run: pnpm install --frozen-lockfile - name: ESLint representative JS/Vue files run: pnpm --dir frontend exec eslint app/javascript/dashboard/components-next/captain/assistant/AssistantPlayground.spec.js app/javascript/dashboard/components-next/captain/assistant/AssistantPlayground.vue - - name: Prettier representative JS/Vue files - run: pnpm --dir frontend exec prettier --check app/javascript/dashboard/components-next/captain/assistant/AssistantPlayground.spec.js app/javascript/dashboard/components-next/captain/assistant/AssistantPlayground.vue + - name: Prettier representative JS/TS/Vue files + run: pnpm --dir frontend exec prettier --check app/javascript/dashboard/components-next/captain/assistant/AssistantPlayground.spec.js app/javascript/dashboard/components-next/captain/assistant/AssistantPlayground.vue vite.config.ts app/javascript/histoire.setup.ts - run: pnpm --dir frontend build diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts index 63f7f28f..dee9dbae 100644 --- a/frontend/vite.config.ts +++ b/frontend/vite.config.ts @@ -55,8 +55,14 @@ const entrypoints = { dashboard: path.resolve(__dirname, './index.html'), widget: path.resolve(__dirname, './app/javascript/entrypoints/widget.js'), portal: path.resolve(__dirname, './app/javascript/entrypoints/portal.js'), - superadmin: path.resolve(__dirname, './app/javascript/entrypoints/superadmin.js'), - superadmin_pages: path.resolve(__dirname, './app/javascript/entrypoints/superadmin_pages.js'), + superadmin: path.resolve( + __dirname, + './app/javascript/entrypoints/superadmin.js' + ), + superadmin_pages: path.resolve( + __dirname, + './app/javascript/entrypoints/superadmin_pages.js' + ), survey: path.resolve(__dirname, './app/javascript/entrypoints/survey.js'), v3app: path.resolve(__dirname, './app/javascript/entrypoints/v3app.js'), };