Develop

.eslintrc

@@ -1,6 +1,3 @@
 {
-    "extends": ["@remindgmbh/eslint-config-nuxt"],
-    "settings": {
-        "import/ignore": ["vee-validate"]
-    }
+    "extends": ["@remindgmbh/eslint-config-nuxt"]
 }

.github/workflows/ci.yaml

@@ -0,0 +1,20 @@
+name: CI
+
+on:
+  pull_request:
+
+jobs:
+  commitlint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: remindgmbh/[email protected]
+  static-analysis:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - run: |
+          npm ci
+          npm run static-analysis

.github/workflows/publish_development.yaml

@@ -0,0 +1,17 @@
+name: Publish Development
+
+on:
+  push:
+    branches:
+      - "develop"
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: remindgmbh/[email protected]
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          node-version: 20
+          npm-token: ${{ secrets.NPM_TOKEN }}
+          type: npm-pre

.github/workflows/release.yaml

@@ -0,0 +1,17 @@
+name: Release
+
+on:
+  push:
+    branches:
+      - "main"
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: remindgmbh/[email protected]
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          node-version: 20
+          npm-token: ${{ secrets.NPM_TOKEN }}
+          type: github-npm

package.json

@@ -1,15 +1,16 @@
 {
     "name": "@remindgmbh/nuxt-typo3-solr",
-    "version": "1.0.0",
+    "version": "0.0.0-development",
     "author": "David Mellen <[email protected]>",
     "license": "BSD-3-Clause",
     "repository": {
         "type": "git",
-        "url": "https://github.com/remindgmbh/nuxt-typo3-solr"
+        "url": "git+https://github.com/remindgmbh/nuxt-typo3-solr.git"
     },
     "type": "module",
     "exports": {
         ".": {
+            "types": "./dist/types.d.ts",
             "import": "./dist/module.mjs",
             "require": "./dist/module.cjs"
         }
@@ -20,39 +21,35 @@
         "dist"
     ],
     "scripts": {
-        "dev": "npm run stub && nuxi dev playground",
+        "dev": "npm run dev:prepare && nuxi dev playground",
         "dev:build": "nuxi build playground",
-        "lint": "npm run lint:prettier && npm run lint:script && npm run lint:style",
-        "lint:prettier": "prettier --check .",
+        "dev:prepare": "nuxt-module-build build --stub && nuxt-module-build prepare && nuxi prepare playground",
+        "lint": "npm run lint:script",
         "lint:script": "eslint --ext \".js,.ts,.vue\" .",
-        "lint:style": "stylelint \"**/*.{vue,[s]css}\"",
-        "prepare": "npm run stub && nuxt-module-build",
-        "prepublishOnly": "npm run typecheck && npm run lint",
+        "prepack": "npm run dev:prepare && nuxt-module-build build",
         "preview": "nuxi preview playground",
-        "stub": "nuxt-module-build --stub && nuxi prepare playground",
+        "static-analysis": "npm run dev:prepare && npm run typecheck && npm run lint",
         "typecheck": "nuxi typecheck"
     },
     "dependencies": {
-        "@nuxt/kit": "^3.6.1",
-        "defu": "^6.1.2"
+        "@nuxt/kit": "^3.10.1"
+    },
+    "peerDependencies": {
+        "@remindgmbh/nuxt-typo3": "^4.0.0 || ^4.0.0-develop"
     },
     "devDependencies": {
-        "@nuxt/module-builder": "^0.4.0",
-        "@nuxt/schema": "^3.6.1",
-        "@remindgmbh/eslint-config-nuxt": "^1.0.4",
-        "@remindgmbh/nuxt-typo3": "^3.0.0",
-        "@remindgmbh/stylelint-config": "^1.0.1",
-        "@types/node": "^20.3.2",
-        "eslint": "^8.43.0",
-        "nuxt": "^3.6.1",
-        "postcss": "^8.4.24",
-        "postcss-html": "^1.5.0",
-        "postcss-scss": "^4.0.6",
-        "prettier": "^2.8.8",
-        "stylelint": "^15.9.0",
-        "vue-tsc": "^1.8.3"
+        "@nuxt/module-builder": "^0.5.5",
+        "@nuxt/schema": "^3.10.1",
+        "@remindgmbh/eslint-config-nuxt": "^1.3.0",
+        "@remindgmbh/nuxt-typo3": "^4.0.0-develop",
+        "@types/node": "^20.11.17",
+        "eslint": "^8.56.0",
+        "nuxt": "^3.10.1",
+        "prettier": "^3.2.5",
+        "typescript": "^5.3.3",
+        "vue-tsc": "^1.8.27"
     },
     "volta": {
-        "node": "18.16.1"
+        "node": "20.9.0"
     }
 }

playground/app.config.ts

@@ -0,0 +1,7 @@
+import { defineAppConfig } from '#imports'
+
+export default defineAppConfig({
+    typo3: {
+        languages: ['/de/', '/en/'],
+    },
+})

playground/app.vue

@@ -1,6 +1,14 @@
 <template>
     <T3TopbarLayout>
         <T3TopbarLayoutHeader>
+            <div>
+                <NuxtLink
+                    v-for="language in availableLanguages"
+                    :key="language.link"
+                    :to="language.link"
+                    >{{ language.navigationTitle }}</NuxtLink
+                >
+            </div>
             <div>
                 <template v-if="rootPageNavigation">
                     <NuxtLink :to="rootPageNavigation.link">{{
@@ -18,8 +26,8 @@
             </div>
             <T3SolrSearchForm
                 v-if="searchForm"
-                :search-form="searchForm"
                 default-value=""
+                :search-form="searchForm"
             />
         </T3TopbarLayoutHeader>
         <T3TopbarLayoutContent>
@@ -29,6 +37,9 @@
 </template>
 
 <script setup lang="ts">
+import { useT3Languages, useT3Navigation, useT3SolrData } from '#imports'
+
 const { rootPageNavigation } = useT3Navigation()
-const { searchForm } = useT3SolrApiData()
+const { searchForm } = useT3SolrData()
+const { availableLanguages } = useT3Languages()
 </script>

playground/nuxt.config.ts

@@ -1,34 +1,27 @@
 export default defineNuxtConfig({
+    components: [
+        {
+            global: true,
+            path: '@/components',
+        },
+    ],
+    imports: {
+        autoImport: false,
+    },
+    modules: ['@remindgmbh/nuxt-typo3', '@remindgmbh/nuxt-typo3-solr'],
     runtimeConfig: {
         public: {
             typo3: {
-                baseUrl: '',
                 api: {
                     baseUrl: '',
                 },
+                baseUrl: '',
                 cookiebotUid: '',
             },
         },
     },
-    components: [
-        {
-            path: '@/components',
-            global: true,
-        },
-    ],
     typescript: {
         shim: false,
         strict: true,
     },
-    css: ['@/assets/base.scss'],
-    modules: ['@remindgmbh/nuxt-typo3', '@remindgmbh/nuxt-typo3-solr'],
-    vite: {
-        server: {
-            hmr: {
-                protocol: 'wss',
-                clientPort: 443,
-                path: 'hmr/',
-            },
-        },
-    },
 })

src/module.ts

@@ -6,56 +6,33 @@ import {
     createResolver,
     defineNuxtModule,
 } from '@nuxt/kit'
-import { defu } from 'defu'
 import { name, version } from '../package.json'
 
 export const CONFIG_KEY = 'typo3Solr'
 
-export interface ModuleOptions {
-    api: {
-        // Type number of global search, only required if changed in backend
-        searchType?: number
-    }
-}
-
-export default defineNuxtModule<ModuleOptions>({
+export default defineNuxtModule({
     meta: {
+        configKey: CONFIG_KEY,
         name,
         version,
-        configKey: CONFIG_KEY,
     },
-    defaults: {
-        api: {
-            searchType: 7385,
-        },
-    },
-    setup(options, nuxt) {
+    setup(_options, nuxt) {
         const resolver = createResolver(import.meta.url)
 
-        nuxt.options.runtimeConfig.public[CONFIG_KEY] = defu(
-            nuxt.options.runtimeConfig.public[CONFIG_KEY],
-            options
-        )
-
         nuxt.options.alias['#nuxt-typo3-solr'] = resolver.resolve('runtime')
 
         addPlugin({
             src: resolver.resolve('runtime/plugins/i18n'),
         })
-        addPlugin({
-            src: resolver.resolve('runtime/plugins/apiData'),
-        })
         addImportsDir(resolver.resolve('runtime/composables/**/*'))
         addImports({
+            as: 'T3SolrModel',
             from: resolver.resolve('runtime/models'),
             name: '*',
-            as: 'T3SolrModel',
         })
         addComponentsDir({
             path: resolver.resolve('runtime/components'),
             pathPrefix: false,
-            global: true,
-            ignore: ['**/shared.*'],
         })
     },
 })