@onderwijsin/nuxt-turnstile 0.2.1 → 0.2.3

package/README.md

@@ -22,13 +22,13 @@ export default defineNuxtConfig({
 
 The module's options are:
 
-| Option            | Default           | Purpose                                           |
-| ----------------- | ----------------- | ------------------------------------------------- |
-| `enabled`         | `true`            | Enables or disables module setup                  |
-| `siteKey`         | `""`              | Public key used by the Turnstile widget           |
-| `secretKey`       | `""`              | Server-only key used for verification             |
-| `adminToken`      | `""`              | Optional trusted token that bypasses verification |
-| `adminHeaderName` | `"x-admin-token"` | Header accepted for `adminToken`                  |
+| Option            | Default           | Purpose                                               |
+| ----------------- | ----------------- | ----------------------------------------------------- |
+| `enabled`         | `true`            | Enables or disables module setup and its dependencies |
+| `siteKey`         | `""`              | Public key used by the Turnstile widget               |
+| `secretKey`       | `""`              | Server-only key used for verification                 |
+| `adminToken`      | `""`              | Optional trusted token that bypasses verification     |
+| `adminHeaderName` | `"x-admin-token"` | Header accepted for `adminToken`                      |
 
 `siteKey` is public and is also passed to `@nuxtjs/turnstile`. Keep `secretKey` and `adminToken`
 private. In production, prefer `NUXT_TURNSTILE_SECRET_KEY` for the private runtime value. The

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@onderwijsin/nuxt-turnstile",
   "configKey": "turnstile",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "compatibility": {
     "nuxt": "^4.0.0"
   },

package/dist/module.mjs

@@ -1,87 +1,9 @@
 import { defineNuxtModule, useLogger, createResolver, addTypeTemplate, addImportsDir, addServerScanDir } from '@nuxt/kit';
 import { defu } from 'defu';
+import { enabled, resolveModuleName, resolveLoggerScope, moduleSetup, validateModuleOptions, transpileRuntime } from '@onderwijsin/nuxt-module-utils/shared';
 import { z } from 'zod';
 
-var NUMBER_CHAR_RE = /\d/;
-var STR_SPLITTERS = ["-", "_", "/", "."];
-function isUppercase(char = "") {
-  if (NUMBER_CHAR_RE.test(char)) {
-    return void 0;
-  }
-  return char !== char.toLowerCase();
-}
-function splitByCase(str, separators) {
-  const splitters = STR_SPLITTERS;
-  const parts = [];
-  let buff = "";
-  let previousUpper;
-  let previousSplitter;
-  for (const char of str) {
-    const isSplitter = splitters.includes(char);
-    if (isSplitter === true) {
-      parts.push(buff);
-      buff = "";
-      previousUpper = void 0;
-      continue;
-    }
-    const isUpper = isUppercase(char);
-    if (previousSplitter === false) {
-      if (previousUpper === false && isUpper === true) {
-        parts.push(buff);
-        buff = char;
-        previousUpper = isUpper;
-        continue;
-      }
-      if (previousUpper === true && isUpper === false && buff.length > 1) {
-        const lastChar = buff.at(-1);
-        parts.push(buff.slice(0, Math.max(0, buff.length - 1)));
-        buff = lastChar + char;
-        previousUpper = isUpper;
-        continue;
-      }
-    }
-    buff += char;
-    previousUpper = isUpper;
-    previousSplitter = isSplitter;
-  }
-  parts.push(buff);
-  return parts;
-}
-function kebabCase(str, joiner) {
-  return str ? (Array.isArray(str) ? str : splitByCase(str)).map((p) => p.toLowerCase()).join("-") : "";
-}
-var enabled = z.boolean().default(true);
-function resolveModuleName(moduleKey) {
-  return `@onderwijsin/nuxt-${kebabCase(moduleKey)}`;
-}
-function resolveLoggerScope(moduleKey) {
-  return kebabCase(moduleKey);
-}
-function transpileRuntime(nuxt, runtimeDir) {
-  nuxt.options.build.transpile.push(runtimeDir);
-}
-function moduleSetup(MODULE_NAME, options, log) {
-  const start = () => log.start(`Loading module ${MODULE_NAME}`);
-  const end = () => log.success(`Module ${MODULE_NAME} Loaded`);
-  const isEnabled = () => {
-    if ("enabled" in options && options.enabled === false) {
-      log.info(`Module ${MODULE_NAME} is disabled. Skipping setup...`);
-      return false;
-    }
-    return true;
-  };
-  return { start, end, isEnabled };
-}
-function validateModuleOptions(options, schema, log) {
-  const result = schema.safeParse(options);
-  if (result.success) {
-    return result.data;
-  }
-  log.info(z.prettifyError(result.error));
-  throw new Error("Invalid module options \u261D. Exiting.");
-}
-
-const version = "0.2.1";
+const version = "0.2.3";
 
 const turnstileOptionsSchema = z.object({
   enabled,
@@ -108,7 +30,7 @@ const module$1 = defineNuxtModule({
     compatibility: { nuxt: "^4.0.0" }
   },
   defaults: DEFAULTS,
-  moduleDependencies: {
+  moduleDependencies: (nuxt) => nuxt.options.turnstile === false || nuxt.options.turnstile?.enabled === false ? {} : {
     "@nuxt/ui": { version: ">=4.0.0" },
     "@nuxtjs/turnstile": { version: ">=1.1.3" }
   },

package/dist/runtime/server/utils/turnstile.js

@@ -1,8 +1,8 @@
 import { createError, getRequestHeader } from "h3";
 import { useRuntimeConfig } from "#imports";
 import { verifyTurnstileToken } from "@nuxtjs/turnstile/runtime/server/utils/verify.js";
-import { isAdmin } from "module-utils/server";
-import { attempt } from "module-utils/shared";
+import { isAdmin } from "@onderwijsin/nuxt-module-utils/server";
+import { attempt } from "@onderwijsin/nuxt-module-utils/shared";
 import { z } from "zod";
 import { TURNSTILE_TOKEN_HEADER } from "../../constants.js";
 const turnstileVerificationSchema = z.object({

package/package.json

@@ -1,12 +1,16 @@
 {
   "name": "@onderwijsin/nuxt-turnstile",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "Nuxt Turnstile integration with client helpers and server-side validation.",
   "homepage": "https://github.com/onderwijsin/nuxt-modules#readme",
   "bugs": {
     "url": "https://github.com/onderwijsin/nuxt-modules/issues"
   },
   "license": "MIT",
+  "author": {
+    "name": "Remi Huigen",
+    "email": "remihuigen@proton.me"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/onderwijsin/nuxt-modules.git",
@@ -38,15 +42,15 @@
     "@nuxtjs/turnstile": "1.1.3",
     "defu": "6.1.7",
     "h3": "1.15.11",
-    "zod": "4.4.3"
+    "zod": "4.4.3",
+    "@onderwijsin/nuxt-module-utils": "^0.1.0"
   },
   "devDependencies": {
     "@nuxt/module-builder": "1.0.3",
     "@nuxt/test-utils": "4.1.0",
     "nuxt": "4.5.2",
     "typescript": "5.9.3",
-    "unbuild": "3.6.1",
-    "module-utils": "0.0.0"
+    "unbuild": "3.6.1"
   },
   "engines": {
     "node": ">=22"