From ef4d0ac8900a44f3c11554ed4f6a85c146d5e55d Mon Sep 17 00:00:00 2001 From: Damian Glowala Date: Mon, 16 Sep 2024 22:26:04 +0200 Subject: [PATCH 1/6] fix: generate crawlers regex at build time --- src/module.ts | 14 +++++++++++++- src/runtime/generateFlags.ts | 4 +--- test/fixtures/basic/nuxt.config.ts | 6 +++--- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/module.ts b/src/module.ts index 0dea8c18..90b23681 100644 --- a/src/module.ts +++ b/src/module.ts @@ -1,5 +1,6 @@ import { defu } from 'defu' -import { defineNuxtModule, addPlugin, addImportsDir, createResolver, useLogger } from '@nuxt/kit' +import { defineNuxtModule, addPlugin, addImportsDir, createResolver, useLogger, addTemplate } from '@nuxt/kit' +import { createJiti } from 'jiti' import { name, version } from '../package.json' import type { ModuleOptions } from './types' @@ -41,5 +42,16 @@ export default defineNuxtModule({ addPlugin(resolve('./runtime/plugin')) addImportsDir(resolve('./runtime/composables')) + + addTemplate({ + filename: 'nuxtjs-device.mjs', + getContents: async () => { + const jiti = createJiti(import.meta.url) + + const crawlers = await jiti.import('crawler-user-agents') as { pattern: string }[] + + return `export const REGEX_CRAWLER = new RegExp(/${crawlers.map(crawler => crawler.pattern).join('|')}/)` + }, + }) }, }) diff --git a/src/runtime/generateFlags.ts b/src/runtime/generateFlags.ts index c7809e3a..4c084edc 100644 --- a/src/runtime/generateFlags.ts +++ b/src/runtime/generateFlags.ts @@ -1,5 +1,5 @@ -import crawlers from 'crawler-user-agents' import type { Device } from './types' +import { REGEX_CRAWLER } from '#build/nuxtjs-device.mjs' // eslint-disable-next-line const REGEX_MOBILE1 = /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|FBAN|FBAV|fennec|hiptop|iemobile|ip(hone|od)|Instagram|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i @@ -13,8 +13,6 @@ const REGEX_MOBILE_OR_TABLET1 = /(android|bb\d+|meego).+mobile|avantgo|bada\/|bl // eslint-disable-next-line const REGEX_MOBILE_OR_TABLET2 = /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i -const REGEX_CRAWLER = new RegExp(crawlers.map(crawler => crawler.pattern).join('|')) - function isMobile(userAgent: string): boolean { return REGEX_MOBILE1.test(userAgent) || REGEX_MOBILE2.test(userAgent.slice(0, 4)) } diff --git a/test/fixtures/basic/nuxt.config.ts b/test/fixtures/basic/nuxt.config.ts index 251b2a9e..f14a7bcf 100644 --- a/test/fixtures/basic/nuxt.config.ts +++ b/test/fixtures/basic/nuxt.config.ts @@ -1,5 +1,5 @@ +import Module from '../../../src/module' + export default defineNuxtConfig({ - modules: [ - '@nuxtjs/device', - ], + modules: [Module], }) From 459531afbe3fc437058b5b190765287848dd14cf Mon Sep 17 00:00:00 2001 From: Damian Glowala Date: Tue, 17 Sep 2024 05:30:47 +0200 Subject: [PATCH 2/6] chore: update dependencies --- package.json | 1 + pnpm-lock.yaml | 143 ++++++++++++++++++++++++++----------------------- 2 files changed, 77 insertions(+), 67 deletions(-) diff --git a/package.json b/package.json index 9efce7b0..65452f5c 100644 --- a/package.json +++ b/package.json @@ -50,6 +50,7 @@ "defu": "6.1.4", "eslint": "9.10.0", "happy-dom": "15.7.4", + "jiti": "2.0.0-beta.3", "node-fetch": "3.3.2", "nuxt": "3.13.2", "playwright": "1.47.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9c5e57e1..fd768ee6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,7 +16,7 @@ importers: version: 1.4.2(rollup@4.21.1)(vite@5.4.2(@types/node@22.5.1)(terser@5.31.6))(vue@3.5.6(typescript@5.6.2))(webpack-sources@3.2.3) '@nuxt/eslint-config': specifier: 0.5.7 - version: 0.5.7(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2) + version: 0.5.7(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2) '@nuxt/kit': specifier: 3.13.2 version: 3.13.2(magicast@0.3.5)(rollup@4.21.1)(webpack-sources@3.2.3) @@ -40,16 +40,19 @@ importers: version: 6.1.4 eslint: specifier: 9.10.0 - version: 9.10.0(jiti@1.21.6) + version: 9.10.0(jiti@2.0.0-beta.3) happy-dom: specifier: 15.7.4 version: 15.7.4 + jiti: + specifier: 2.0.0-beta.3 + version: 2.0.0-beta.3 node-fetch: specifier: 3.3.2 version: 3.3.2 nuxt: specifier: 3.13.2 - version: 3.13.2(@parcel/watcher@2.4.1)(@types/node@22.5.1)(eslint@9.10.0(jiti@1.21.6))(ioredis@5.4.1)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.21.1)(terser@5.31.6)(typescript@5.6.2)(vite@5.4.2(@types/node@22.5.1)(terser@5.31.6))(webpack-sources@3.2.3) + version: 3.13.2(@parcel/watcher@2.4.1)(@types/node@22.5.1)(eslint@9.10.0(jiti@2.0.0-beta.3))(ioredis@5.4.1)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.21.1)(terser@5.31.6)(typescript@5.6.2)(vite@5.4.2(@types/node@22.5.1)(terser@5.31.6))(webpack-sources@3.2.3) playwright: specifier: 1.47.1 version: 1.47.1 @@ -2729,6 +2732,10 @@ packages: resolution: {integrity: sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==} hasBin: true + jiti@2.0.0-beta.3: + resolution: {integrity: sha512-pmfRbVRs/7khFrSAYnSiJ8C0D5GvzkE4Ey2pAvUcJsw1ly/p+7ut27jbJrjY79BpAJQJ4gXYFtK6d1Aub+9baQ==} + hasBin: true + js-tokens@4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} @@ -4975,9 +4982,9 @@ snapshots: '@esbuild/win32-x64@0.23.1': optional: true - '@eslint-community/eslint-utils@4.4.0(eslint@9.10.0(jiti@1.21.6))': + '@eslint-community/eslint-utils@4.4.0(eslint@9.10.0(jiti@2.0.0-beta.3))': dependencies: - eslint: 9.10.0(jiti@1.21.6) + eslint: 9.10.0(jiti@2.0.0-beta.3) eslint-visitor-keys: 3.4.3 '@eslint-community/regexpp@4.11.0': {} @@ -5174,34 +5181,34 @@ snapshots: - vue - webpack-sources - '@nuxt/eslint-config@0.5.7(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2)': + '@nuxt/eslint-config@0.5.7(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2)': dependencies: '@eslint/js': 9.10.0 - '@nuxt/eslint-plugin': 0.5.7(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2) - '@stylistic/eslint-plugin': 2.8.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2) - '@typescript-eslint/eslint-plugin': 8.5.0(@typescript-eslint/parser@8.5.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2) - '@typescript-eslint/parser': 8.5.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2) - eslint: 9.10.0(jiti@1.21.6) - eslint-config-flat-gitignore: 0.3.0(eslint@9.10.0(jiti@1.21.6)) + '@nuxt/eslint-plugin': 0.5.7(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2) + '@stylistic/eslint-plugin': 2.8.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2) + '@typescript-eslint/eslint-plugin': 8.5.0(@typescript-eslint/parser@8.5.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2))(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2) + '@typescript-eslint/parser': 8.5.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2) + eslint: 9.10.0(jiti@2.0.0-beta.3) + eslint-config-flat-gitignore: 0.3.0(eslint@9.10.0(jiti@2.0.0-beta.3)) eslint-flat-config-utils: 0.4.0 - eslint-plugin-import-x: 4.2.1(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2) - eslint-plugin-jsdoc: 50.2.2(eslint@9.10.0(jiti@1.21.6)) - eslint-plugin-regexp: 2.6.0(eslint@9.10.0(jiti@1.21.6)) - eslint-plugin-unicorn: 55.0.0(eslint@9.10.0(jiti@1.21.6)) - eslint-plugin-vue: 9.28.0(eslint@9.10.0(jiti@1.21.6)) + eslint-plugin-import-x: 4.2.1(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2) + eslint-plugin-jsdoc: 50.2.2(eslint@9.10.0(jiti@2.0.0-beta.3)) + eslint-plugin-regexp: 2.6.0(eslint@9.10.0(jiti@2.0.0-beta.3)) + eslint-plugin-unicorn: 55.0.0(eslint@9.10.0(jiti@2.0.0-beta.3)) + eslint-plugin-vue: 9.28.0(eslint@9.10.0(jiti@2.0.0-beta.3)) globals: 15.9.0 local-pkg: 0.5.0 pathe: 1.1.2 - vue-eslint-parser: 9.4.3(eslint@9.10.0(jiti@1.21.6)) + vue-eslint-parser: 9.4.3(eslint@9.10.0(jiti@2.0.0-beta.3)) transitivePeerDependencies: - supports-color - typescript - '@nuxt/eslint-plugin@0.5.7(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2)': + '@nuxt/eslint-plugin@0.5.7(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2)': dependencies: '@typescript-eslint/types': 8.5.0 - '@typescript-eslint/utils': 8.5.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2) - eslint: 9.10.0(jiti@1.21.6) + '@typescript-eslint/utils': 8.5.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2) + eslint: 9.10.0(jiti@2.0.0-beta.3) transitivePeerDependencies: - supports-color - typescript @@ -5356,7 +5363,7 @@ snapshots: - supports-color - webpack-sources - '@nuxt/vite-builder@3.13.2(@types/node@22.5.1)(eslint@9.10.0(jiti@1.21.6))(magicast@0.3.5)(optionator@0.9.4)(rollup@4.21.1)(terser@5.31.6)(typescript@5.6.2)(vue@3.5.6(typescript@5.6.2))(webpack-sources@3.2.3)': + '@nuxt/vite-builder@3.13.2(@types/node@22.5.1)(eslint@9.10.0(jiti@2.0.0-beta.3))(magicast@0.3.5)(optionator@0.9.4)(rollup@4.21.1)(terser@5.31.6)(typescript@5.6.2)(vue@3.5.6(typescript@5.6.2))(webpack-sources@3.2.3)': dependencies: '@nuxt/kit': 3.13.2(magicast@0.3.5)(rollup@4.21.1)(webpack-sources@3.2.3) '@rollup/plugin-replace': 5.0.7(rollup@4.21.1) @@ -5389,7 +5396,7 @@ snapshots: unplugin: 1.14.1(webpack-sources@3.2.3) vite: 5.4.5(@types/node@22.5.1)(terser@5.31.6) vite-node: 2.1.1(@types/node@22.5.1)(terser@5.31.6) - vite-plugin-checker: 0.8.0(eslint@9.10.0(jiti@1.21.6))(optionator@0.9.4)(typescript@5.6.2)(vite@5.4.5(@types/node@22.5.1)(terser@5.31.6)) + vite-plugin-checker: 0.8.0(eslint@9.10.0(jiti@2.0.0-beta.3))(optionator@0.9.4)(typescript@5.6.2)(vite@5.4.5(@types/node@22.5.1)(terser@5.31.6)) vue: 3.5.6(typescript@5.6.2) vue-bundle-renderer: 2.1.0 transitivePeerDependencies: @@ -5653,10 +5660,10 @@ snapshots: '@sindresorhus/merge-streams@2.3.0': {} - '@stylistic/eslint-plugin@2.8.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2)': + '@stylistic/eslint-plugin@2.8.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2)': dependencies: - '@typescript-eslint/utils': 8.5.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2) - eslint: 9.10.0(jiti@1.21.6) + '@typescript-eslint/utils': 8.5.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2) + eslint: 9.10.0(jiti@2.0.0-beta.3) eslint-visitor-keys: 4.0.0 espree: 10.1.0 estraverse: 5.3.0 @@ -5681,15 +5688,15 @@ snapshots: '@types/resolve@1.20.2': {} - '@typescript-eslint/eslint-plugin@8.5.0(@typescript-eslint/parser@8.5.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2)': + '@typescript-eslint/eslint-plugin@8.5.0(@typescript-eslint/parser@8.5.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2))(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2)': dependencies: '@eslint-community/regexpp': 4.11.0 - '@typescript-eslint/parser': 8.5.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2) + '@typescript-eslint/parser': 8.5.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2) '@typescript-eslint/scope-manager': 8.5.0 - '@typescript-eslint/type-utils': 8.5.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2) - '@typescript-eslint/utils': 8.5.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2) + '@typescript-eslint/type-utils': 8.5.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2) + '@typescript-eslint/utils': 8.5.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2) '@typescript-eslint/visitor-keys': 8.5.0 - eslint: 9.10.0(jiti@1.21.6) + eslint: 9.10.0(jiti@2.0.0-beta.3) graphemer: 1.4.0 ignore: 5.3.2 natural-compare: 1.4.0 @@ -5699,14 +5706,14 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.5.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2)': + '@typescript-eslint/parser@8.5.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2)': dependencies: '@typescript-eslint/scope-manager': 8.5.0 '@typescript-eslint/types': 8.5.0 '@typescript-eslint/typescript-estree': 8.5.0(typescript@5.6.2) '@typescript-eslint/visitor-keys': 8.5.0 debug: 4.3.6 - eslint: 9.10.0(jiti@1.21.6) + eslint: 9.10.0(jiti@2.0.0-beta.3) optionalDependencies: typescript: 5.6.2 transitivePeerDependencies: @@ -5722,10 +5729,10 @@ snapshots: '@typescript-eslint/types': 8.5.0 '@typescript-eslint/visitor-keys': 8.5.0 - '@typescript-eslint/type-utils@8.5.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2)': + '@typescript-eslint/type-utils@8.5.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2)': dependencies: '@typescript-eslint/typescript-estree': 8.5.0(typescript@5.6.2) - '@typescript-eslint/utils': 8.5.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2) + '@typescript-eslint/utils': 8.5.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2) debug: 4.3.6 ts-api-utils: 1.3.0(typescript@5.6.2) optionalDependencies: @@ -5768,24 +5775,24 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.3.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2)': + '@typescript-eslint/utils@8.3.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2)': dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.10.0(jiti@1.21.6)) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.10.0(jiti@2.0.0-beta.3)) '@typescript-eslint/scope-manager': 8.3.0 '@typescript-eslint/types': 8.3.0 '@typescript-eslint/typescript-estree': 8.3.0(typescript@5.6.2) - eslint: 9.10.0(jiti@1.21.6) + eslint: 9.10.0(jiti@2.0.0-beta.3) transitivePeerDependencies: - supports-color - typescript - '@typescript-eslint/utils@8.5.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2)': + '@typescript-eslint/utils@8.5.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2)': dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.10.0(jiti@1.21.6)) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.10.0(jiti@2.0.0-beta.3)) '@typescript-eslint/scope-manager': 8.5.0 '@typescript-eslint/types': 8.5.0 '@typescript-eslint/typescript-estree': 8.5.0(typescript@5.6.2) - eslint: 9.10.0(jiti@1.21.6) + eslint: 9.10.0(jiti@2.0.0-beta.3) transitivePeerDependencies: - supports-color - typescript @@ -6830,10 +6837,10 @@ snapshots: escape-string-regexp@5.0.0: {} - eslint-config-flat-gitignore@0.3.0(eslint@9.10.0(jiti@1.21.6)): + eslint-config-flat-gitignore@0.3.0(eslint@9.10.0(jiti@2.0.0-beta.3)): dependencies: '@eslint/compat': 1.1.1 - eslint: 9.10.0(jiti@1.21.6) + eslint: 9.10.0(jiti@2.0.0-beta.3) find-up-simple: 1.0.0 eslint-flat-config-utils@0.4.0: @@ -6848,12 +6855,12 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-plugin-import-x@4.2.1(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2): + eslint-plugin-import-x@4.2.1(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2): dependencies: - '@typescript-eslint/utils': 8.3.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2) + '@typescript-eslint/utils': 8.3.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2) debug: 4.3.6 doctrine: 3.0.0 - eslint: 9.10.0(jiti@1.21.6) + eslint: 9.10.0(jiti@2.0.0-beta.3) eslint-import-resolver-node: 0.3.9 get-tsconfig: 4.7.6 is-glob: 4.0.3 @@ -6865,14 +6872,14 @@ snapshots: - supports-color - typescript - eslint-plugin-jsdoc@50.2.2(eslint@9.10.0(jiti@1.21.6)): + eslint-plugin-jsdoc@50.2.2(eslint@9.10.0(jiti@2.0.0-beta.3)): dependencies: '@es-joy/jsdoccomment': 0.48.0 are-docs-informative: 0.0.2 comment-parser: 1.4.1 debug: 4.3.6 escape-string-regexp: 4.0.0 - eslint: 9.10.0(jiti@1.21.6) + eslint: 9.10.0(jiti@2.0.0-beta.3) espree: 10.1.0 esquery: 1.6.0 parse-imports: 2.1.1 @@ -6882,25 +6889,25 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-plugin-regexp@2.6.0(eslint@9.10.0(jiti@1.21.6)): + eslint-plugin-regexp@2.6.0(eslint@9.10.0(jiti@2.0.0-beta.3)): dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.10.0(jiti@1.21.6)) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.10.0(jiti@2.0.0-beta.3)) '@eslint-community/regexpp': 4.11.0 comment-parser: 1.4.1 - eslint: 9.10.0(jiti@1.21.6) + eslint: 9.10.0(jiti@2.0.0-beta.3) jsdoc-type-pratt-parser: 4.1.0 refa: 0.12.1 regexp-ast-analysis: 0.7.1 scslre: 0.3.0 - eslint-plugin-unicorn@55.0.0(eslint@9.10.0(jiti@1.21.6)): + eslint-plugin-unicorn@55.0.0(eslint@9.10.0(jiti@2.0.0-beta.3)): dependencies: '@babel/helper-validator-identifier': 7.24.7 - '@eslint-community/eslint-utils': 4.4.0(eslint@9.10.0(jiti@1.21.6)) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.10.0(jiti@2.0.0-beta.3)) ci-info: 4.0.0 clean-regexp: 1.0.0 core-js-compat: 3.38.1 - eslint: 9.10.0(jiti@1.21.6) + eslint: 9.10.0(jiti@2.0.0-beta.3) esquery: 1.6.0 globals: 15.9.0 indent-string: 4.0.0 @@ -6913,16 +6920,16 @@ snapshots: semver: 7.6.3 strip-indent: 3.0.0 - eslint-plugin-vue@9.28.0(eslint@9.10.0(jiti@1.21.6)): + eslint-plugin-vue@9.28.0(eslint@9.10.0(jiti@2.0.0-beta.3)): dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.10.0(jiti@1.21.6)) - eslint: 9.10.0(jiti@1.21.6) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.10.0(jiti@2.0.0-beta.3)) + eslint: 9.10.0(jiti@2.0.0-beta.3) globals: 13.24.0 natural-compare: 1.4.0 nth-check: 2.1.1 postcss-selector-parser: 6.1.2 semver: 7.6.3 - vue-eslint-parser: 9.4.3(eslint@9.10.0(jiti@1.21.6)) + vue-eslint-parser: 9.4.3(eslint@9.10.0(jiti@2.0.0-beta.3)) xml-name-validator: 4.0.0 transitivePeerDependencies: - supports-color @@ -6941,9 +6948,9 @@ snapshots: eslint-visitor-keys@4.0.0: {} - eslint@9.10.0(jiti@1.21.6): + eslint@9.10.0(jiti@2.0.0-beta.3): dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.10.0(jiti@1.21.6)) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.10.0(jiti@2.0.0-beta.3)) '@eslint-community/regexpp': 4.11.0 '@eslint/config-array': 0.18.0 '@eslint/eslintrc': 3.1.0 @@ -6978,7 +6985,7 @@ snapshots: strip-ansi: 6.0.1 text-table: 0.2.0 optionalDependencies: - jiti: 1.21.6 + jiti: 2.0.0-beta.3 transitivePeerDependencies: - supports-color @@ -7477,6 +7484,8 @@ snapshots: jiti@1.21.6: {} + jiti@2.0.0-beta.3: {} + js-tokens@4.0.0: {} js-tokens@9.0.0: {} @@ -7872,14 +7881,14 @@ snapshots: optionalDependencies: fsevents: 2.3.3 - nuxt@3.13.2(@parcel/watcher@2.4.1)(@types/node@22.5.1)(eslint@9.10.0(jiti@1.21.6))(ioredis@5.4.1)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.21.1)(terser@5.31.6)(typescript@5.6.2)(vite@5.4.2(@types/node@22.5.1)(terser@5.31.6))(webpack-sources@3.2.3): + nuxt@3.13.2(@parcel/watcher@2.4.1)(@types/node@22.5.1)(eslint@9.10.0(jiti@2.0.0-beta.3))(ioredis@5.4.1)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.21.1)(terser@5.31.6)(typescript@5.6.2)(vite@5.4.2(@types/node@22.5.1)(terser@5.31.6))(webpack-sources@3.2.3): dependencies: '@nuxt/devalue': 2.0.2 '@nuxt/devtools': 1.4.2(rollup@4.21.1)(vite@5.4.2(@types/node@22.5.1)(terser@5.31.6))(vue@3.5.6(typescript@5.6.2))(webpack-sources@3.2.3) '@nuxt/kit': 3.13.2(magicast@0.3.5)(rollup@4.21.1)(webpack-sources@3.2.3) '@nuxt/schema': 3.13.2(rollup@4.21.1)(webpack-sources@3.2.3) '@nuxt/telemetry': 2.6.0(magicast@0.3.5)(rollup@4.21.1)(webpack-sources@3.2.3) - '@nuxt/vite-builder': 3.13.2(@types/node@22.5.1)(eslint@9.10.0(jiti@1.21.6))(magicast@0.3.5)(optionator@0.9.4)(rollup@4.21.1)(terser@5.31.6)(typescript@5.6.2)(vue@3.5.6(typescript@5.6.2))(webpack-sources@3.2.3) + '@nuxt/vite-builder': 3.13.2(@types/node@22.5.1)(eslint@9.10.0(jiti@2.0.0-beta.3))(magicast@0.3.5)(optionator@0.9.4)(rollup@4.21.1)(terser@5.31.6)(typescript@5.6.2)(vue@3.5.6(typescript@5.6.2))(webpack-sources@3.2.3) '@unhead/dom': 1.11.6 '@unhead/shared': 1.11.6 '@unhead/ssr': 1.11.6 @@ -9219,7 +9228,7 @@ snapshots: - supports-color - terser - vite-plugin-checker@0.8.0(eslint@9.10.0(jiti@1.21.6))(optionator@0.9.4)(typescript@5.6.2)(vite@5.4.5(@types/node@22.5.1)(terser@5.31.6)): + vite-plugin-checker@0.8.0(eslint@9.10.0(jiti@2.0.0-beta.3))(optionator@0.9.4)(typescript@5.6.2)(vite@5.4.5(@types/node@22.5.1)(terser@5.31.6)): dependencies: '@babel/code-frame': 7.24.7 ansi-escapes: 4.3.2 @@ -9237,7 +9246,7 @@ snapshots: vscode-languageserver-textdocument: 1.0.12 vscode-uri: 3.0.8 optionalDependencies: - eslint: 9.10.0(jiti@1.21.6) + eslint: 9.10.0(jiti@2.0.0-beta.3) optionator: 0.9.4 typescript: 5.6.2 @@ -9382,10 +9391,10 @@ snapshots: vue-devtools-stub@0.1.0: {} - vue-eslint-parser@9.4.3(eslint@9.10.0(jiti@1.21.6)): + vue-eslint-parser@9.4.3(eslint@9.10.0(jiti@2.0.0-beta.3)): dependencies: debug: 4.3.6 - eslint: 9.10.0(jiti@1.21.6) + eslint: 9.10.0(jiti@2.0.0-beta.3) eslint-scope: 7.2.2 eslint-visitor-keys: 3.4.3 espree: 9.6.1 From eec483f7c183c6ff51509549da21b56c4739015d Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Tue, 17 Sep 2024 05:35:28 +0200 Subject: [PATCH 3/6] chore: use workspace module --- test/fixtures/basic/nuxt.config.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/fixtures/basic/nuxt.config.ts b/test/fixtures/basic/nuxt.config.ts index f14a7bcf..02ed9f19 100644 --- a/test/fixtures/basic/nuxt.config.ts +++ b/test/fixtures/basic/nuxt.config.ts @@ -1,5 +1,3 @@ -import Module from '../../../src/module' - export default defineNuxtConfig({ - modules: [Module], + modules: ['@nuxtjs/device'], }) From 1c4cef847734ba64093fc2738c4edeb9f471d975 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Tue, 17 Sep 2024 05:38:51 +0200 Subject: [PATCH 4/6] chore: use direct import --- src/module.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/module.ts b/src/module.ts index 90b23681..f9fd49ce 100644 --- a/src/module.ts +++ b/src/module.ts @@ -1,6 +1,6 @@ import { defu } from 'defu' import { defineNuxtModule, addPlugin, addImportsDir, createResolver, useLogger, addTemplate } from '@nuxt/kit' -import { createJiti } from 'jiti' +import crawlers from 'crawler-user-agents' assert { type: 'json' } import { name, version } from '../package.json' import type { ModuleOptions } from './types' @@ -45,11 +45,7 @@ export default defineNuxtModule({ addTemplate({ filename: 'nuxtjs-device.mjs', - getContents: async () => { - const jiti = createJiti(import.meta.url) - - const crawlers = await jiti.import('crawler-user-agents') as { pattern: string }[] - + getContents: () => { return `export const REGEX_CRAWLER = new RegExp(/${crawlers.map(crawler => crawler.pattern).join('|')}/)` }, }) From fa19a2866047c1fc6fb2008223787c6c4d6d9606 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20G=C5=82owala?= Date: Tue, 17 Sep 2024 10:21:09 +0200 Subject: [PATCH 5/6] chore: remove jiti --- package.json | 1 - pnpm-lock.yaml | 143 +++++++++++++++++++++++-------------------------- 2 files changed, 67 insertions(+), 77 deletions(-) diff --git a/package.json b/package.json index 65452f5c..9efce7b0 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,6 @@ "defu": "6.1.4", "eslint": "9.10.0", "happy-dom": "15.7.4", - "jiti": "2.0.0-beta.3", "node-fetch": "3.3.2", "nuxt": "3.13.2", "playwright": "1.47.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fd768ee6..9c5e57e1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,7 +16,7 @@ importers: version: 1.4.2(rollup@4.21.1)(vite@5.4.2(@types/node@22.5.1)(terser@5.31.6))(vue@3.5.6(typescript@5.6.2))(webpack-sources@3.2.3) '@nuxt/eslint-config': specifier: 0.5.7 - version: 0.5.7(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2) + version: 0.5.7(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2) '@nuxt/kit': specifier: 3.13.2 version: 3.13.2(magicast@0.3.5)(rollup@4.21.1)(webpack-sources@3.2.3) @@ -40,19 +40,16 @@ importers: version: 6.1.4 eslint: specifier: 9.10.0 - version: 9.10.0(jiti@2.0.0-beta.3) + version: 9.10.0(jiti@1.21.6) happy-dom: specifier: 15.7.4 version: 15.7.4 - jiti: - specifier: 2.0.0-beta.3 - version: 2.0.0-beta.3 node-fetch: specifier: 3.3.2 version: 3.3.2 nuxt: specifier: 3.13.2 - version: 3.13.2(@parcel/watcher@2.4.1)(@types/node@22.5.1)(eslint@9.10.0(jiti@2.0.0-beta.3))(ioredis@5.4.1)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.21.1)(terser@5.31.6)(typescript@5.6.2)(vite@5.4.2(@types/node@22.5.1)(terser@5.31.6))(webpack-sources@3.2.3) + version: 3.13.2(@parcel/watcher@2.4.1)(@types/node@22.5.1)(eslint@9.10.0(jiti@1.21.6))(ioredis@5.4.1)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.21.1)(terser@5.31.6)(typescript@5.6.2)(vite@5.4.2(@types/node@22.5.1)(terser@5.31.6))(webpack-sources@3.2.3) playwright: specifier: 1.47.1 version: 1.47.1 @@ -2732,10 +2729,6 @@ packages: resolution: {integrity: sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==} hasBin: true - jiti@2.0.0-beta.3: - resolution: {integrity: sha512-pmfRbVRs/7khFrSAYnSiJ8C0D5GvzkE4Ey2pAvUcJsw1ly/p+7ut27jbJrjY79BpAJQJ4gXYFtK6d1Aub+9baQ==} - hasBin: true - js-tokens@4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} @@ -4982,9 +4975,9 @@ snapshots: '@esbuild/win32-x64@0.23.1': optional: true - '@eslint-community/eslint-utils@4.4.0(eslint@9.10.0(jiti@2.0.0-beta.3))': + '@eslint-community/eslint-utils@4.4.0(eslint@9.10.0(jiti@1.21.6))': dependencies: - eslint: 9.10.0(jiti@2.0.0-beta.3) + eslint: 9.10.0(jiti@1.21.6) eslint-visitor-keys: 3.4.3 '@eslint-community/regexpp@4.11.0': {} @@ -5181,34 +5174,34 @@ snapshots: - vue - webpack-sources - '@nuxt/eslint-config@0.5.7(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2)': + '@nuxt/eslint-config@0.5.7(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2)': dependencies: '@eslint/js': 9.10.0 - '@nuxt/eslint-plugin': 0.5.7(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2) - '@stylistic/eslint-plugin': 2.8.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2) - '@typescript-eslint/eslint-plugin': 8.5.0(@typescript-eslint/parser@8.5.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2))(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2) - '@typescript-eslint/parser': 8.5.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2) - eslint: 9.10.0(jiti@2.0.0-beta.3) - eslint-config-flat-gitignore: 0.3.0(eslint@9.10.0(jiti@2.0.0-beta.3)) + '@nuxt/eslint-plugin': 0.5.7(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2) + '@stylistic/eslint-plugin': 2.8.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2) + '@typescript-eslint/eslint-plugin': 8.5.0(@typescript-eslint/parser@8.5.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2) + '@typescript-eslint/parser': 8.5.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2) + eslint: 9.10.0(jiti@1.21.6) + eslint-config-flat-gitignore: 0.3.0(eslint@9.10.0(jiti@1.21.6)) eslint-flat-config-utils: 0.4.0 - eslint-plugin-import-x: 4.2.1(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2) - eslint-plugin-jsdoc: 50.2.2(eslint@9.10.0(jiti@2.0.0-beta.3)) - eslint-plugin-regexp: 2.6.0(eslint@9.10.0(jiti@2.0.0-beta.3)) - eslint-plugin-unicorn: 55.0.0(eslint@9.10.0(jiti@2.0.0-beta.3)) - eslint-plugin-vue: 9.28.0(eslint@9.10.0(jiti@2.0.0-beta.3)) + eslint-plugin-import-x: 4.2.1(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2) + eslint-plugin-jsdoc: 50.2.2(eslint@9.10.0(jiti@1.21.6)) + eslint-plugin-regexp: 2.6.0(eslint@9.10.0(jiti@1.21.6)) + eslint-plugin-unicorn: 55.0.0(eslint@9.10.0(jiti@1.21.6)) + eslint-plugin-vue: 9.28.0(eslint@9.10.0(jiti@1.21.6)) globals: 15.9.0 local-pkg: 0.5.0 pathe: 1.1.2 - vue-eslint-parser: 9.4.3(eslint@9.10.0(jiti@2.0.0-beta.3)) + vue-eslint-parser: 9.4.3(eslint@9.10.0(jiti@1.21.6)) transitivePeerDependencies: - supports-color - typescript - '@nuxt/eslint-plugin@0.5.7(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2)': + '@nuxt/eslint-plugin@0.5.7(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2)': dependencies: '@typescript-eslint/types': 8.5.0 - '@typescript-eslint/utils': 8.5.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2) - eslint: 9.10.0(jiti@2.0.0-beta.3) + '@typescript-eslint/utils': 8.5.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2) + eslint: 9.10.0(jiti@1.21.6) transitivePeerDependencies: - supports-color - typescript @@ -5363,7 +5356,7 @@ snapshots: - supports-color - webpack-sources - '@nuxt/vite-builder@3.13.2(@types/node@22.5.1)(eslint@9.10.0(jiti@2.0.0-beta.3))(magicast@0.3.5)(optionator@0.9.4)(rollup@4.21.1)(terser@5.31.6)(typescript@5.6.2)(vue@3.5.6(typescript@5.6.2))(webpack-sources@3.2.3)': + '@nuxt/vite-builder@3.13.2(@types/node@22.5.1)(eslint@9.10.0(jiti@1.21.6))(magicast@0.3.5)(optionator@0.9.4)(rollup@4.21.1)(terser@5.31.6)(typescript@5.6.2)(vue@3.5.6(typescript@5.6.2))(webpack-sources@3.2.3)': dependencies: '@nuxt/kit': 3.13.2(magicast@0.3.5)(rollup@4.21.1)(webpack-sources@3.2.3) '@rollup/plugin-replace': 5.0.7(rollup@4.21.1) @@ -5396,7 +5389,7 @@ snapshots: unplugin: 1.14.1(webpack-sources@3.2.3) vite: 5.4.5(@types/node@22.5.1)(terser@5.31.6) vite-node: 2.1.1(@types/node@22.5.1)(terser@5.31.6) - vite-plugin-checker: 0.8.0(eslint@9.10.0(jiti@2.0.0-beta.3))(optionator@0.9.4)(typescript@5.6.2)(vite@5.4.5(@types/node@22.5.1)(terser@5.31.6)) + vite-plugin-checker: 0.8.0(eslint@9.10.0(jiti@1.21.6))(optionator@0.9.4)(typescript@5.6.2)(vite@5.4.5(@types/node@22.5.1)(terser@5.31.6)) vue: 3.5.6(typescript@5.6.2) vue-bundle-renderer: 2.1.0 transitivePeerDependencies: @@ -5660,10 +5653,10 @@ snapshots: '@sindresorhus/merge-streams@2.3.0': {} - '@stylistic/eslint-plugin@2.8.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2)': + '@stylistic/eslint-plugin@2.8.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2)': dependencies: - '@typescript-eslint/utils': 8.5.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2) - eslint: 9.10.0(jiti@2.0.0-beta.3) + '@typescript-eslint/utils': 8.5.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2) + eslint: 9.10.0(jiti@1.21.6) eslint-visitor-keys: 4.0.0 espree: 10.1.0 estraverse: 5.3.0 @@ -5688,15 +5681,15 @@ snapshots: '@types/resolve@1.20.2': {} - '@typescript-eslint/eslint-plugin@8.5.0(@typescript-eslint/parser@8.5.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2))(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2)': + '@typescript-eslint/eslint-plugin@8.5.0(@typescript-eslint/parser@8.5.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2)': dependencies: '@eslint-community/regexpp': 4.11.0 - '@typescript-eslint/parser': 8.5.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2) + '@typescript-eslint/parser': 8.5.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2) '@typescript-eslint/scope-manager': 8.5.0 - '@typescript-eslint/type-utils': 8.5.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2) - '@typescript-eslint/utils': 8.5.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2) + '@typescript-eslint/type-utils': 8.5.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2) + '@typescript-eslint/utils': 8.5.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2) '@typescript-eslint/visitor-keys': 8.5.0 - eslint: 9.10.0(jiti@2.0.0-beta.3) + eslint: 9.10.0(jiti@1.21.6) graphemer: 1.4.0 ignore: 5.3.2 natural-compare: 1.4.0 @@ -5706,14 +5699,14 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.5.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2)': + '@typescript-eslint/parser@8.5.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2)': dependencies: '@typescript-eslint/scope-manager': 8.5.0 '@typescript-eslint/types': 8.5.0 '@typescript-eslint/typescript-estree': 8.5.0(typescript@5.6.2) '@typescript-eslint/visitor-keys': 8.5.0 debug: 4.3.6 - eslint: 9.10.0(jiti@2.0.0-beta.3) + eslint: 9.10.0(jiti@1.21.6) optionalDependencies: typescript: 5.6.2 transitivePeerDependencies: @@ -5729,10 +5722,10 @@ snapshots: '@typescript-eslint/types': 8.5.0 '@typescript-eslint/visitor-keys': 8.5.0 - '@typescript-eslint/type-utils@8.5.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2)': + '@typescript-eslint/type-utils@8.5.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2)': dependencies: '@typescript-eslint/typescript-estree': 8.5.0(typescript@5.6.2) - '@typescript-eslint/utils': 8.5.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2) + '@typescript-eslint/utils': 8.5.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2) debug: 4.3.6 ts-api-utils: 1.3.0(typescript@5.6.2) optionalDependencies: @@ -5775,24 +5768,24 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.3.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2)': + '@typescript-eslint/utils@8.3.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2)': dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.10.0(jiti@2.0.0-beta.3)) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.10.0(jiti@1.21.6)) '@typescript-eslint/scope-manager': 8.3.0 '@typescript-eslint/types': 8.3.0 '@typescript-eslint/typescript-estree': 8.3.0(typescript@5.6.2) - eslint: 9.10.0(jiti@2.0.0-beta.3) + eslint: 9.10.0(jiti@1.21.6) transitivePeerDependencies: - supports-color - typescript - '@typescript-eslint/utils@8.5.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2)': + '@typescript-eslint/utils@8.5.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2)': dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.10.0(jiti@2.0.0-beta.3)) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.10.0(jiti@1.21.6)) '@typescript-eslint/scope-manager': 8.5.0 '@typescript-eslint/types': 8.5.0 '@typescript-eslint/typescript-estree': 8.5.0(typescript@5.6.2) - eslint: 9.10.0(jiti@2.0.0-beta.3) + eslint: 9.10.0(jiti@1.21.6) transitivePeerDependencies: - supports-color - typescript @@ -6837,10 +6830,10 @@ snapshots: escape-string-regexp@5.0.0: {} - eslint-config-flat-gitignore@0.3.0(eslint@9.10.0(jiti@2.0.0-beta.3)): + eslint-config-flat-gitignore@0.3.0(eslint@9.10.0(jiti@1.21.6)): dependencies: '@eslint/compat': 1.1.1 - eslint: 9.10.0(jiti@2.0.0-beta.3) + eslint: 9.10.0(jiti@1.21.6) find-up-simple: 1.0.0 eslint-flat-config-utils@0.4.0: @@ -6855,12 +6848,12 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-plugin-import-x@4.2.1(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2): + eslint-plugin-import-x@4.2.1(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2): dependencies: - '@typescript-eslint/utils': 8.3.0(eslint@9.10.0(jiti@2.0.0-beta.3))(typescript@5.6.2) + '@typescript-eslint/utils': 8.3.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2) debug: 4.3.6 doctrine: 3.0.0 - eslint: 9.10.0(jiti@2.0.0-beta.3) + eslint: 9.10.0(jiti@1.21.6) eslint-import-resolver-node: 0.3.9 get-tsconfig: 4.7.6 is-glob: 4.0.3 @@ -6872,14 +6865,14 @@ snapshots: - supports-color - typescript - eslint-plugin-jsdoc@50.2.2(eslint@9.10.0(jiti@2.0.0-beta.3)): + eslint-plugin-jsdoc@50.2.2(eslint@9.10.0(jiti@1.21.6)): dependencies: '@es-joy/jsdoccomment': 0.48.0 are-docs-informative: 0.0.2 comment-parser: 1.4.1 debug: 4.3.6 escape-string-regexp: 4.0.0 - eslint: 9.10.0(jiti@2.0.0-beta.3) + eslint: 9.10.0(jiti@1.21.6) espree: 10.1.0 esquery: 1.6.0 parse-imports: 2.1.1 @@ -6889,25 +6882,25 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-plugin-regexp@2.6.0(eslint@9.10.0(jiti@2.0.0-beta.3)): + eslint-plugin-regexp@2.6.0(eslint@9.10.0(jiti@1.21.6)): dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.10.0(jiti@2.0.0-beta.3)) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.10.0(jiti@1.21.6)) '@eslint-community/regexpp': 4.11.0 comment-parser: 1.4.1 - eslint: 9.10.0(jiti@2.0.0-beta.3) + eslint: 9.10.0(jiti@1.21.6) jsdoc-type-pratt-parser: 4.1.0 refa: 0.12.1 regexp-ast-analysis: 0.7.1 scslre: 0.3.0 - eslint-plugin-unicorn@55.0.0(eslint@9.10.0(jiti@2.0.0-beta.3)): + eslint-plugin-unicorn@55.0.0(eslint@9.10.0(jiti@1.21.6)): dependencies: '@babel/helper-validator-identifier': 7.24.7 - '@eslint-community/eslint-utils': 4.4.0(eslint@9.10.0(jiti@2.0.0-beta.3)) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.10.0(jiti@1.21.6)) ci-info: 4.0.0 clean-regexp: 1.0.0 core-js-compat: 3.38.1 - eslint: 9.10.0(jiti@2.0.0-beta.3) + eslint: 9.10.0(jiti@1.21.6) esquery: 1.6.0 globals: 15.9.0 indent-string: 4.0.0 @@ -6920,16 +6913,16 @@ snapshots: semver: 7.6.3 strip-indent: 3.0.0 - eslint-plugin-vue@9.28.0(eslint@9.10.0(jiti@2.0.0-beta.3)): + eslint-plugin-vue@9.28.0(eslint@9.10.0(jiti@1.21.6)): dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.10.0(jiti@2.0.0-beta.3)) - eslint: 9.10.0(jiti@2.0.0-beta.3) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.10.0(jiti@1.21.6)) + eslint: 9.10.0(jiti@1.21.6) globals: 13.24.0 natural-compare: 1.4.0 nth-check: 2.1.1 postcss-selector-parser: 6.1.2 semver: 7.6.3 - vue-eslint-parser: 9.4.3(eslint@9.10.0(jiti@2.0.0-beta.3)) + vue-eslint-parser: 9.4.3(eslint@9.10.0(jiti@1.21.6)) xml-name-validator: 4.0.0 transitivePeerDependencies: - supports-color @@ -6948,9 +6941,9 @@ snapshots: eslint-visitor-keys@4.0.0: {} - eslint@9.10.0(jiti@2.0.0-beta.3): + eslint@9.10.0(jiti@1.21.6): dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.10.0(jiti@2.0.0-beta.3)) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.10.0(jiti@1.21.6)) '@eslint-community/regexpp': 4.11.0 '@eslint/config-array': 0.18.0 '@eslint/eslintrc': 3.1.0 @@ -6985,7 +6978,7 @@ snapshots: strip-ansi: 6.0.1 text-table: 0.2.0 optionalDependencies: - jiti: 2.0.0-beta.3 + jiti: 1.21.6 transitivePeerDependencies: - supports-color @@ -7484,8 +7477,6 @@ snapshots: jiti@1.21.6: {} - jiti@2.0.0-beta.3: {} - js-tokens@4.0.0: {} js-tokens@9.0.0: {} @@ -7881,14 +7872,14 @@ snapshots: optionalDependencies: fsevents: 2.3.3 - nuxt@3.13.2(@parcel/watcher@2.4.1)(@types/node@22.5.1)(eslint@9.10.0(jiti@2.0.0-beta.3))(ioredis@5.4.1)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.21.1)(terser@5.31.6)(typescript@5.6.2)(vite@5.4.2(@types/node@22.5.1)(terser@5.31.6))(webpack-sources@3.2.3): + nuxt@3.13.2(@parcel/watcher@2.4.1)(@types/node@22.5.1)(eslint@9.10.0(jiti@1.21.6))(ioredis@5.4.1)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.21.1)(terser@5.31.6)(typescript@5.6.2)(vite@5.4.2(@types/node@22.5.1)(terser@5.31.6))(webpack-sources@3.2.3): dependencies: '@nuxt/devalue': 2.0.2 '@nuxt/devtools': 1.4.2(rollup@4.21.1)(vite@5.4.2(@types/node@22.5.1)(terser@5.31.6))(vue@3.5.6(typescript@5.6.2))(webpack-sources@3.2.3) '@nuxt/kit': 3.13.2(magicast@0.3.5)(rollup@4.21.1)(webpack-sources@3.2.3) '@nuxt/schema': 3.13.2(rollup@4.21.1)(webpack-sources@3.2.3) '@nuxt/telemetry': 2.6.0(magicast@0.3.5)(rollup@4.21.1)(webpack-sources@3.2.3) - '@nuxt/vite-builder': 3.13.2(@types/node@22.5.1)(eslint@9.10.0(jiti@2.0.0-beta.3))(magicast@0.3.5)(optionator@0.9.4)(rollup@4.21.1)(terser@5.31.6)(typescript@5.6.2)(vue@3.5.6(typescript@5.6.2))(webpack-sources@3.2.3) + '@nuxt/vite-builder': 3.13.2(@types/node@22.5.1)(eslint@9.10.0(jiti@1.21.6))(magicast@0.3.5)(optionator@0.9.4)(rollup@4.21.1)(terser@5.31.6)(typescript@5.6.2)(vue@3.5.6(typescript@5.6.2))(webpack-sources@3.2.3) '@unhead/dom': 1.11.6 '@unhead/shared': 1.11.6 '@unhead/ssr': 1.11.6 @@ -9228,7 +9219,7 @@ snapshots: - supports-color - terser - vite-plugin-checker@0.8.0(eslint@9.10.0(jiti@2.0.0-beta.3))(optionator@0.9.4)(typescript@5.6.2)(vite@5.4.5(@types/node@22.5.1)(terser@5.31.6)): + vite-plugin-checker@0.8.0(eslint@9.10.0(jiti@1.21.6))(optionator@0.9.4)(typescript@5.6.2)(vite@5.4.5(@types/node@22.5.1)(terser@5.31.6)): dependencies: '@babel/code-frame': 7.24.7 ansi-escapes: 4.3.2 @@ -9246,7 +9237,7 @@ snapshots: vscode-languageserver-textdocument: 1.0.12 vscode-uri: 3.0.8 optionalDependencies: - eslint: 9.10.0(jiti@2.0.0-beta.3) + eslint: 9.10.0(jiti@1.21.6) optionator: 0.9.4 typescript: 5.6.2 @@ -9391,10 +9382,10 @@ snapshots: vue-devtools-stub@0.1.0: {} - vue-eslint-parser@9.4.3(eslint@9.10.0(jiti@2.0.0-beta.3)): + vue-eslint-parser@9.4.3(eslint@9.10.0(jiti@1.21.6)): dependencies: debug: 4.3.6 - eslint: 9.10.0(jiti@2.0.0-beta.3) + eslint: 9.10.0(jiti@1.21.6) eslint-scope: 7.2.2 eslint-visitor-keys: 3.4.3 espree: 9.6.1 From 340a45f0cd66fe2b942244be76e9fc41d1f29825 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20G=C5=82owala?= Date: Tue, 17 Sep 2024 10:23:24 +0200 Subject: [PATCH 6/6] chore: format --- src/module.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/module.ts b/src/module.ts index f9fd49ce..875ab1de 100644 --- a/src/module.ts +++ b/src/module.ts @@ -45,9 +45,9 @@ export default defineNuxtModule({ addTemplate({ filename: 'nuxtjs-device.mjs', - getContents: () => { - return `export const REGEX_CRAWLER = new RegExp(/${crawlers.map(crawler => crawler.pattern).join('|')}/)` - }, + getContents: () => `export const REGEX_CRAWLER = new RegExp(/${ + crawlers.map(crawler => crawler.pattern).join('|') + }/)`, }) }, })