From e0bb357600d98f55347a827bdb410cfcb851e1a5 Mon Sep 17 00:00:00 2001 From: Islam Shehata Date: Wed, 5 Jul 2023 17:25:43 +0300 Subject: [PATCH] preserver file structure and names --- examples/app-directory/src/app/page.tsx | 4 +- package.json | 7 +- packages/next-axiom/package.json | 16 +-- packages/next-axiom/src/hooks.ts | 3 +- packages/next-axiom/tsconfig.json | 2 +- packages/next-axiom/vite.config.ts | 30 ++++-- packages/next12-axiom/package.json | 8 +- packages/next12-axiom/vite.config.ts | 26 +++-- pnpm-lock.yaml | 132 ++++++++++++++---------- 9 files changed, 142 insertions(+), 86 deletions(-) diff --git a/examples/app-directory/src/app/page.tsx b/examples/app-directory/src/app/page.tsx index 1a9b666d..8393d3d0 100644 --- a/examples/app-directory/src/app/page.tsx +++ b/examples/app-directory/src/app/page.tsx @@ -4,12 +4,12 @@ import Image from 'next/image'; import { Inter } from 'next/font/google'; import styles from './page.module.css'; import Link from 'next/link'; -import { Logger } from 'next-axiom'; +import { useLogger } from 'next-axiom'; const inter = Inter({ subsets: ['latin'] }); function Home() { - const logger = new Logger(); + const logger = useLogger() logger.info('Hello from client', { foo: 'bar' }); diff --git a/package.json b/package.json index 6e9b4b96..3c8027a7 100644 --- a/package.json +++ b/package.json @@ -45,13 +45,14 @@ "jest": "~29.1", "jest-config": "~29.1", "jest-environment-jsdom": "~29.1", + "next-axiom-core": "workspace:*", "prettier": "2.6.2", + "rollup-plugin-preserve-directives": "^0.2.0", "ts-jest": "~29.1", "ts-node": "^10.8.0", "turbo": "^1.9.9", - "typescript": "^4.6.4", - "vite": "^4.3.9", - "next-axiom-core": "workspace:*" + "typescript": "latest", + "vite": "^4.3.9" }, "workspaces": [ "packages/*", diff --git a/packages/next-axiom/package.json b/packages/next-axiom/package.json index 79bb12f3..e4bdcbe5 100644 --- a/packages/next-axiom/package.json +++ b/packages/next-axiom/package.json @@ -11,8 +11,8 @@ "engines": { "node": ">=16" }, - "main": "dist/cjs/next-axiom.js", - "module": "dist/es/next-axiom.js", + "main": "dist/cjs/index.js", + "module": "dist/es/index.js", "types": "dist/types/index.d.ts", "files": ["dist"], "scripts": { @@ -38,15 +38,19 @@ "url": "https://github.com/axiomhq/next-axiom/issues" }, "homepage": "https://github.com/axiomhq/next-axiom#readme", + "dependencies": { + "whatwg-fetch": "^3.6.2" + }, "peerDependencies": { "next": ">=13.4", "react": ">=18.0.0" }, "exports": { ".": { - "import": "./dist/es/next-axiom.js", - "require": "./dist/cjs/next-axiom.js", + "import": "./dist/es/index.js", + "require": "./dist/cjs/index.js", + "default": "./dist/es/index.js", "types": "./dist/types/index.d.ts" - } + } } -} \ No newline at end of file +} diff --git a/packages/next-axiom/src/hooks.ts b/packages/next-axiom/src/hooks.ts index dc1b49f8..aa6dca39 100644 --- a/packages/next-axiom/src/hooks.ts +++ b/packages/next-axiom/src/hooks.ts @@ -9,6 +9,7 @@ export function useReportWebVitals() { useNextReportWebVitals((metric) => reportWebVitalsWithPath(metric, path)); } +// FIXME: Provide request data and source export function useLogger(config: LoggerConfig = {}): Logger { const path = usePathname(); useEffect(() => { @@ -25,5 +26,5 @@ export function useLogger(config: LoggerConfig = {}): Logger { config.args.path = path; const logger = new Logger(config); - return logger; // FIXME: Provide request data and source + return logger; } diff --git a/packages/next-axiom/tsconfig.json b/packages/next-axiom/tsconfig.json index f14fd70e..02052d14 100644 --- a/packages/next-axiom/tsconfig.json +++ b/packages/next-axiom/tsconfig.json @@ -7,7 +7,7 @@ "sourceMap": true, "strict": true, "composite": true, - "moduleResolution": "node", + "moduleResolution": "NodeNext", "allowSyntheticDefaultImports": true, "esModuleInterop": true, "skipLibCheck": true, diff --git a/packages/next-axiom/vite.config.ts b/packages/next-axiom/vite.config.ts index 8b221924..a8d6b2c9 100644 --- a/packages/next-axiom/vite.config.ts +++ b/packages/next-axiom/vite.config.ts @@ -1,11 +1,15 @@ import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' - +import preserveDirectives from "rollup-plugin-preserve-directives"; +import path from 'path'; // https://vitejs.dev/config/ export default defineConfig({ plugins: [ react(), + // to preserve the 'use client' directive in the generated code + // this only works when build.rollupOptions.output.preserveModules is true + preserveDirectives(), ], define: { 'NEXT_AXIOM_VERSION': process.env.npm_package_version, @@ -13,19 +17,31 @@ export default defineConfig({ optimizeDeps: { include: ['next-axiom-core'], }, + esbuild: { + minifyIdentifiers: false, + keepNames: true, + }, build: { target: 'esnext', lib: { entry: 'src/index.ts', - name: 'next-axiom', formats: ['es', 'cjs'], - fileName: (format) => `${format}/next-axiom.js` + fileName: (format, entryName) => { + // copy the shared package to core instead of internal/next-axiom-core/src + const entry = entryName.replace('internal/next-axiom-core/src/', 'core/') + return `${format}/${entry}.js` + } }, rollupOptions: { - external: (id) => id.includes('node_modules') + external: id => { + return !(path.isAbsolute(id) || id.startsWith(".") || id === 'next-axiom-core') + }, + output: { + exports: 'named', + preserveModules: true, + preserveModulesRoot: 'src', + sourcemap: true, + } }, - commonjsOptions: { - include: [/next-axiom-core/, /node_modules/], - } } }) diff --git a/packages/next12-axiom/package.json b/packages/next12-axiom/package.json index 9bab07f2..ad20f238 100644 --- a/packages/next12-axiom/package.json +++ b/packages/next12-axiom/package.json @@ -11,8 +11,8 @@ "engines": { "node": ">=16" }, - "main": "dist/es/next12-axiom.js", - "module": "dist/es/next12-axiom.js", + "main": "dist/es/index.js", + "module": "dist/es/index.js", "types": "dist/types/index.d.ts", "files": ["dist"], "scripts": { @@ -43,8 +43,8 @@ }, "exports": { ".": { - "import": "./dist/es/next12-axiom.js", - "require": "./dist/umd/next12-axiom.js", + "import": "./dist/es/index.js", + "require": "./dist/cjs/index.js", "types": "./dist/types/index.d.ts" } } diff --git a/packages/next12-axiom/vite.config.ts b/packages/next12-axiom/vite.config.ts index 4049c391..d199c275 100644 --- a/packages/next12-axiom/vite.config.ts +++ b/packages/next12-axiom/vite.config.ts @@ -1,10 +1,15 @@ import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' +import preserveDirectives from "rollup-plugin-preserve-directives"; +import path from 'path'; // https://vitejs.dev/config/ export default defineConfig({ plugins: [ - react() + react(), + // to preserve the 'use client' directive in the generated code + // this only works when build.rollupOptions.output.preserveModules is true + preserveDirectives(), ], define: { 'NEXT_AXIOM_VERSION': process.env.npm_package_version, @@ -17,14 +22,21 @@ export default defineConfig({ lib: { entry: 'src/index.ts', name: 'next12-axiom', - formats: ['es', 'umd'], - fileName: (format) => `${format}/next12-axiom.js` + formats: ['es', 'cjs'], + fileName: (format, entryName) => { + // copy the shared package to core instead of internal/next-axiom-core/src + const entry = entryName.replace('internal/next-axiom-core/src/', 'core/') + return `${format}/${entry}.js` + } }, rollupOptions: { - external: (id) => id.includes('node_modules') - }, - commonjsOptions: { - include: [/next-axiom-core/, /node_modules/], + external: id => { + return !(path.isAbsolute(id) || id.startsWith(".") || id === 'next-axiom-core') + }, + output: { + preserveModules: true, + preserveModulesRoot: 'src', + } } } }) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 971ad458..d3f830c4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,10 +16,10 @@ importers: version: 17.0.29 '@typescript-eslint/eslint-plugin': specifier: ^5.59.11 - version: 5.59.11(@typescript-eslint/parser@5.59.11)(eslint@8.41.0)(typescript@4.9.3) + version: 5.59.11(@typescript-eslint/parser@5.59.11)(eslint@8.41.0)(typescript@5.1.6) '@typescript-eslint/parser': specifier: ^5.59.11 - version: 5.59.11(eslint@8.41.0)(typescript@4.9.3) + version: 5.59.11(eslint@8.41.0)(typescript@5.1.6) '@vitejs/plugin-react': specifier: ^4.0.1 version: 4.0.1(vite@4.3.9) @@ -47,18 +47,21 @@ importers: prettier: specifier: 2.6.2 version: 2.6.2 + rollup-plugin-preserve-directives: + specifier: ^0.2.0 + version: 0.2.0(rollup@3.26.0) ts-jest: specifier: ~29.1 - version: 29.1.0(@babel/core@7.22.1)(jest@29.1.0)(typescript@4.9.3) + version: 29.1.0(@babel/core@7.22.1)(jest@29.1.0)(typescript@5.1.6) ts-node: specifier: ^10.8.0 - version: 10.8.0(@types/node@17.0.29)(typescript@4.9.3) + version: 10.8.0(@types/node@17.0.29)(typescript@5.1.6) turbo: specifier: ^1.9.9 version: 1.9.9 typescript: - specifier: ^4.6.4 - version: 4.9.3 + specifier: latest + version: 5.1.6 vite: specifier: ^4.3.9 version: 4.3.9(@types/node@17.0.29) @@ -89,7 +92,7 @@ importers: version: 18.2.0 eslint-config-next: specifier: ^13.4.0 - version: 13.4.3(eslint@8.41.0)(typescript@4.9.3) + version: 13.4.3(eslint@8.41.0)(typescript@5.1.6) examples/app-directory: dependencies: @@ -114,7 +117,7 @@ importers: version: 18.2.0 eslint-config-next: specifier: ^13.4.0 - version: 13.4.3(eslint@8.41.0)(typescript@4.9.3) + version: 13.4.3(eslint@8.41.0)(typescript@5.1.6) examples/logger: dependencies: @@ -142,7 +145,7 @@ importers: version: 18.0.9 eslint-config-next: specifier: 12.1.4 - version: 12.1.4(eslint@8.41.0)(next@12.2.0)(typescript@4.9.3) + version: 12.1.4(eslint@8.41.0)(next@12.2.0)(typescript@5.1.6) internal/next-axiom-core: dependencies: @@ -158,6 +161,9 @@ importers: react: specifier: '>=18.0.0' version: 18.2.0 + whatwg-fetch: + specifier: ^3.6.2 + version: 3.6.2 packages/next12-axiom: dependencies: @@ -1792,7 +1798,7 @@ packages: '@types/yargs-parser': 21.0.0 dev: true - /@typescript-eslint/eslint-plugin@5.59.11(@typescript-eslint/parser@5.59.11)(eslint@8.41.0)(typescript@4.9.3): + /@typescript-eslint/eslint-plugin@5.59.11(@typescript-eslint/parser@5.59.11)(eslint@8.41.0)(typescript@5.1.6): resolution: {integrity: sha512-XxuOfTkCUiOSyBWIvHlUraLw/JT/6Io1365RO6ZuI88STKMavJZPNMU0lFcUTeQXEhHiv64CbxYxBNoDVSmghg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1804,23 +1810,23 @@ packages: optional: true dependencies: '@eslint-community/regexpp': 4.5.1 - '@typescript-eslint/parser': 5.59.11(eslint@8.41.0)(typescript@4.9.3) + '@typescript-eslint/parser': 5.59.11(eslint@8.41.0)(typescript@5.1.6) '@typescript-eslint/scope-manager': 5.59.11 - '@typescript-eslint/type-utils': 5.59.11(eslint@8.41.0)(typescript@4.9.3) - '@typescript-eslint/utils': 5.59.11(eslint@8.41.0)(typescript@4.9.3) + '@typescript-eslint/type-utils': 5.59.11(eslint@8.41.0)(typescript@5.1.6) + '@typescript-eslint/utils': 5.59.11(eslint@8.41.0)(typescript@5.1.6) debug: 4.3.4 eslint: 8.41.0 grapheme-splitter: 1.0.4 ignore: 5.2.4 natural-compare-lite: 1.4.0 semver: 7.5.1 - tsutils: 3.21.0(typescript@4.9.3) - typescript: 4.9.3 + tsutils: 3.21.0(typescript@5.1.6) + typescript: 5.1.6 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/parser@5.10.1(eslint@8.41.0)(typescript@4.9.3): + /@typescript-eslint/parser@5.10.1(eslint@8.41.0)(typescript@5.1.6): resolution: {integrity: sha512-GReo3tjNBwR5RnRO0K2wDIDN31cM3MmDtgyQ85oAxAmC5K3j/g85IjP+cDfcqDsDDBf1HNKQAD0WqOYL8jXqUA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1832,15 +1838,15 @@ packages: dependencies: '@typescript-eslint/scope-manager': 5.10.1 '@typescript-eslint/types': 5.10.1 - '@typescript-eslint/typescript-estree': 5.10.1(typescript@4.9.3) + '@typescript-eslint/typescript-estree': 5.10.1(typescript@5.1.6) debug: 4.3.4 eslint: 8.41.0 - typescript: 4.9.3 + typescript: 5.1.6 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/parser@5.59.11(eslint@8.41.0)(typescript@4.9.3): + /@typescript-eslint/parser@5.59.11(eslint@8.41.0)(typescript@5.1.6): resolution: {integrity: sha512-s9ZF3M+Nym6CAZEkJJeO2TFHHDsKAM3ecNkLuH4i4s8/RCPnF5JRip2GyviYkeEAcwGMJxkqG9h2dAsnA1nZpA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1852,10 +1858,10 @@ packages: dependencies: '@typescript-eslint/scope-manager': 5.59.11 '@typescript-eslint/types': 5.59.11 - '@typescript-eslint/typescript-estree': 5.59.11(typescript@4.9.3) + '@typescript-eslint/typescript-estree': 5.59.11(typescript@5.1.6) debug: 4.3.4 eslint: 8.41.0 - typescript: 4.9.3 + typescript: 5.1.6 transitivePeerDependencies: - supports-color dev: true @@ -1876,7 +1882,7 @@ packages: '@typescript-eslint/visitor-keys': 5.59.11 dev: true - /@typescript-eslint/type-utils@5.59.11(eslint@8.41.0)(typescript@4.9.3): + /@typescript-eslint/type-utils@5.59.11(eslint@8.41.0)(typescript@5.1.6): resolution: {integrity: sha512-LZqVY8hMiVRF2a7/swmkStMYSoXMFlzL6sXV6U/2gL5cwnLWQgLEG8tjWPpaE4rMIdZ6VKWwcffPlo1jPfk43g==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1886,12 +1892,12 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 5.59.11(typescript@4.9.3) - '@typescript-eslint/utils': 5.59.11(eslint@8.41.0)(typescript@4.9.3) + '@typescript-eslint/typescript-estree': 5.59.11(typescript@5.1.6) + '@typescript-eslint/utils': 5.59.11(eslint@8.41.0)(typescript@5.1.6) debug: 4.3.4 eslint: 8.41.0 - tsutils: 3.21.0(typescript@4.9.3) - typescript: 4.9.3 + tsutils: 3.21.0(typescript@5.1.6) + typescript: 5.1.6 transitivePeerDependencies: - supports-color dev: true @@ -1906,7 +1912,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@typescript-eslint/typescript-estree@5.10.1(typescript@4.9.3): + /@typescript-eslint/typescript-estree@5.10.1(typescript@5.1.6): resolution: {integrity: sha512-PwIGnH7jIueXv4opcwEbVGDATjGPO1dx9RkUl5LlHDSe+FXxPwFL5W/qYd5/NHr7f6lo/vvTrAzd0KlQtRusJQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1921,13 +1927,13 @@ packages: globby: 11.1.0 is-glob: 4.0.3 semver: 7.5.1 - tsutils: 3.21.0(typescript@4.9.3) - typescript: 4.9.3 + tsutils: 3.21.0(typescript@5.1.6) + typescript: 5.1.6 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/typescript-estree@5.59.11(typescript@4.9.3): + /@typescript-eslint/typescript-estree@5.59.11(typescript@5.1.6): resolution: {integrity: sha512-YupOpot5hJO0maupJXixi6l5ETdrITxeo5eBOeuV7RSKgYdU3G5cxO49/9WRnJq9EMrB7AuTSLH/bqOsXi7wPA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1942,13 +1948,13 @@ packages: globby: 11.1.0 is-glob: 4.0.3 semver: 7.5.1 - tsutils: 3.21.0(typescript@4.9.3) - typescript: 4.9.3 + tsutils: 3.21.0(typescript@5.1.6) + typescript: 5.1.6 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/utils@5.59.11(eslint@8.41.0)(typescript@4.9.3): + /@typescript-eslint/utils@5.59.11(eslint@8.41.0)(typescript@5.1.6): resolution: {integrity: sha512-didu2rHSOMUdJThLk4aZ1Or8IcO3HzCw/ZvEjTTIfjIrcdd5cvSIwwDy2AOlE7htSNp7QIZ10fLMyRCveesMLg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1959,7 +1965,7 @@ packages: '@types/semver': 7.5.0 '@typescript-eslint/scope-manager': 5.59.11 '@typescript-eslint/types': 5.59.11 - '@typescript-eslint/typescript-estree': 5.59.11(typescript@4.9.3) + '@typescript-eslint/typescript-estree': 5.59.11(typescript@5.1.6) eslint: 8.41.0 eslint-scope: 5.1.1 semver: 7.5.1 @@ -2854,7 +2860,7 @@ packages: source-map: 0.6.1 dev: true - /eslint-config-next@12.1.4(eslint@8.41.0)(next@12.2.0)(typescript@4.9.3): + /eslint-config-next@12.1.4(eslint@8.41.0)(next@12.2.0)(typescript@5.1.6): resolution: {integrity: sha512-Uj0jrVjoQbg9qerxRjSHoOOv3PEzoZxpb8G9LYct25fsflP8xIiUq0l4WEu2KSB5owuLv5hie7wSMqPEsHj+bQ==} peerDependencies: eslint: ^7.23.0 || ^8.0.0 @@ -2866,7 +2872,7 @@ packages: dependencies: '@next/eslint-plugin-next': 12.1.4 '@rushstack/eslint-patch': 1.0.8 - '@typescript-eslint/parser': 5.10.1(eslint@8.41.0)(typescript@4.9.3) + '@typescript-eslint/parser': 5.10.1(eslint@8.41.0)(typescript@5.1.6) eslint: 8.41.0 eslint-import-resolver-node: 0.3.4 eslint-import-resolver-typescript: 2.4.0(eslint-plugin-import@2.25.2)(eslint@8.41.0) @@ -2875,13 +2881,13 @@ packages: eslint-plugin-react: 7.29.1(eslint@8.41.0) eslint-plugin-react-hooks: 4.3.0(eslint@8.41.0) next: 12.2.0(@babel/core@7.22.1)(react-dom@18.2.0)(react@18.2.0) - typescript: 4.9.3 + typescript: 5.1.6 transitivePeerDependencies: - eslint-import-resolver-webpack - supports-color dev: true - /eslint-config-next@13.4.3(eslint@8.41.0)(typescript@4.9.3): + /eslint-config-next@13.4.3(eslint@8.41.0)(typescript@5.1.6): resolution: {integrity: sha512-1lXwdFi29fKxzeugof/TUE7lpHyJQt5+U4LaUHyvQfHjvsWO77vFNicJv5sX6k0VDVSbnfz0lw+avxI+CinbMg==} peerDependencies: eslint: ^7.23.0 || ^8.0.0 @@ -2892,7 +2898,7 @@ packages: dependencies: '@next/eslint-plugin-next': 13.4.3 '@rushstack/eslint-patch': 1.3.0 - '@typescript-eslint/parser': 5.59.11(eslint@8.41.0)(typescript@4.9.3) + '@typescript-eslint/parser': 5.59.11(eslint@8.41.0)(typescript@5.1.6) eslint: 8.41.0 eslint-import-resolver-node: 0.3.7 eslint-import-resolver-typescript: 3.5.5(@typescript-eslint/parser@5.59.11)(eslint-import-resolver-node@0.3.7)(eslint-plugin-import@2.27.5)(eslint@8.41.0) @@ -2900,7 +2906,7 @@ packages: eslint-plugin-jsx-a11y: 6.7.1(eslint@8.41.0) eslint-plugin-react: 7.32.2(eslint@8.41.0) eslint-plugin-react-hooks: 4.6.0(eslint@8.41.0) - typescript: 4.9.3 + typescript: 5.1.6 transitivePeerDependencies: - eslint-import-resolver-webpack - supports-color @@ -2997,7 +3003,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 5.10.1(eslint@8.41.0)(typescript@4.9.3) + '@typescript-eslint/parser': 5.10.1(eslint@8.41.0)(typescript@5.1.6) debug: 3.2.7 eslint: 8.41.0 eslint-import-resolver-node: 0.3.7 @@ -3027,7 +3033,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 5.59.11(eslint@8.41.0)(typescript@4.9.3) + '@typescript-eslint/parser': 5.59.11(eslint@8.41.0)(typescript@5.1.6) debug: 3.2.7 eslint: 8.41.0 eslint-import-resolver-node: 0.3.7 @@ -3046,7 +3052,7 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 5.10.1(eslint@8.41.0)(typescript@4.9.3) + '@typescript-eslint/parser': 5.10.1(eslint@8.41.0)(typescript@5.1.6) array-includes: 3.1.6 array.prototype.flat: 1.3.1 debug: 2.6.9 @@ -3077,7 +3083,7 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 5.59.11(eslint@8.41.0)(typescript@4.9.3) + '@typescript-eslint/parser': 5.59.11(eslint@8.41.0)(typescript@5.1.6) array-includes: 3.1.6 array.prototype.flat: 1.3.1 array.prototype.flatmap: 1.3.1 @@ -4134,7 +4140,7 @@ packages: pretty-format: 29.5.0 slash: 3.0.0 strip-json-comments: 3.1.1 - ts-node: 10.8.0(@types/node@17.0.29)(typescript@4.9.3) + ts-node: 10.8.0(@types/node@17.0.29)(typescript@5.1.6) transitivePeerDependencies: - supports-color dev: true @@ -4174,7 +4180,7 @@ packages: pretty-format: 29.5.0 slash: 3.0.0 strip-json-comments: 3.1.1 - ts-node: 10.8.0(@types/node@17.0.29)(typescript@4.9.3) + ts-node: 10.8.0(@types/node@17.0.29)(typescript@5.1.6) transitivePeerDependencies: - supports-color dev: true @@ -4686,6 +4692,13 @@ packages: yallist: 4.0.0 dev: true + /magic-string@0.30.1: + resolution: {integrity: sha512-mbVKXPmS0z0G4XqFDCTllmDQ6coZzn94aMlb0o/A4HEHJCKcanlDZwYJgwnkmgD3jyWhUgj9VsPrfd972yPffA==} + engines: {node: '>=12'} + dependencies: + '@jridgewell/sourcemap-codec': 1.4.15 + dev: true + /make-dir@3.1.0: resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==} engines: {node: '>=8'} @@ -5371,6 +5384,15 @@ packages: glob: 7.2.3 dev: true + /rollup-plugin-preserve-directives@0.2.0(rollup@3.26.0): + resolution: {integrity: sha512-KUwbBaFvD1zFIDNnOkR+u64sSod3m0l6q46/SzTOa4GTQ6hp6w0FRr2u7x99YkY9qhlna5panmTmuLWeJ/2KWw==} + peerDependencies: + rollup: 2.x || 3.x + dependencies: + magic-string: 0.30.1 + rollup: 3.26.0 + dev: true + /rollup@3.26.0: resolution: {integrity: sha512-YzJH0eunH2hr3knvF3i6IkLO/jTjAEwU4HoMUbQl4//Tnl3ou0e7P5SjxdDr8HQJdeUJShlbEHXrrnEHy1l7Yg==} engines: {node: '>=14.18.0', npm: '>=8.0.0'} @@ -5730,7 +5752,7 @@ packages: punycode: 2.3.0 dev: true - /ts-jest@29.1.0(@babel/core@7.22.1)(jest@29.1.0)(typescript@4.9.3): + /ts-jest@29.1.0(@babel/core@7.22.1)(jest@29.1.0)(typescript@5.1.6): resolution: {integrity: sha512-ZhNr7Z4PcYa+JjMl62ir+zPiNJfXJN6E8hSLnaUKhOgqcn8vb3e537cpkd0FuAfRK3sR1LSqM1MOhliXNgOFPA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} hasBin: true @@ -5760,11 +5782,11 @@ packages: lodash.memoize: 4.1.2 make-error: 1.3.6 semver: 7.5.1 - typescript: 4.9.3 + typescript: 5.1.6 yargs-parser: 21.1.1 dev: true - /ts-node@10.8.0(@types/node@17.0.29)(typescript@4.9.3): + /ts-node@10.8.0(@types/node@17.0.29)(typescript@5.1.6): resolution: {integrity: sha512-/fNd5Qh+zTt8Vt1KbYZjRHCE9sI5i7nqfD/dzBBRDeVXZXS6kToW6R7tTU6Nd4XavFs0mAVCg29Q//ML7WsZYA==} hasBin: true peerDependencies: @@ -5790,7 +5812,7 @@ packages: create-require: 1.1.1 diff: 4.0.2 make-error: 1.3.6 - typescript: 4.9.3 + typescript: 5.1.6 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 dev: true @@ -5811,14 +5833,14 @@ packages: /tslib@2.5.2: resolution: {integrity: sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA==} - /tsutils@3.21.0(typescript@4.9.3): + /tsutils@3.21.0(typescript@5.1.6): resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} engines: {node: '>= 6'} peerDependencies: typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta' dependencies: tslib: 1.14.1 - typescript: 4.9.3 + typescript: 5.1.6 dev: true /turbo-darwin-64@1.9.9: @@ -5919,9 +5941,9 @@ packages: is-typed-array: 1.1.10 dev: true - /typescript@4.9.3: - resolution: {integrity: sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA==} - engines: {node: '>=4.2.0'} + /typescript@5.1.6: + resolution: {integrity: sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==} + engines: {node: '>=14.17'} hasBin: true dev: true