diff --git a/.pnp.cjs b/.pnp.cjs index 39fa7067..d94a8e9d 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -18,22 +18,6 @@ const RAW_RUNTIME_STATE = "name": "@atls/next-identity-integration",\ "reference": "workspace:packages/identity-integration"\ },\ - {\ - "name": "@atls/next-document-with-gtag",\ - "reference": "workspace:packages/next-document-with-gtag"\ - },\ - {\ - "name": "@atls/next-document-with-helmet",\ - "reference": "workspace:packages/next-document-with-helmet"\ - },\ - {\ - "name": "@atls/next-document-with-icons",\ - "reference": "workspace:packages/next-document-with-icons"\ - },\ - {\ - "name": "@atls/next-document-with-opengraph",\ - "reference": "workspace:packages/next-document-with-opengraph"\ - },\ {\ "name": "@atls/next-sitemap-generator",\ "reference": "workspace:packages/next-sitemap-generator"\ @@ -43,10 +27,6 @@ const RAW_RUNTIME_STATE = "ignorePatternData": "(^(?:\\\\.yarn\\\\/sdks(?:\\\\/(?!\\\\.{1,2}(?:\\\\/|$))(?:(?:(?!(?:^|\\\\/)\\\\.{1,2}(?:\\\\/|$)).)*?)|$))$)",\ "pnpZipBackend": "libzip",\ "fallbackExclusionList": [\ - ["@atls/next-document-with-gtag", ["workspace:packages/next-document-with-gtag"]],\ - ["@atls/next-document-with-helmet", ["workspace:packages/next-document-with-helmet"]],\ - ["@atls/next-document-with-icons", ["workspace:packages/next-document-with-icons"]],\ - ["@atls/next-document-with-opengraph", ["workspace:packages/next-document-with-opengraph"]],\ ["@atls/next-identity-integration", ["workspace:packages/identity-integration"]],\ ["@atls/next-sitemap-generator", ["workspace:packages/next-sitemap-generator"]],\ ["nextjs", ["workspace:."]]\ @@ -137,67 +117,6 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ - ["@atls/next-document-with-gtag", [\ - ["workspace:packages/next-document-with-gtag", {\ - "packageLocation": "./packages/next-document-with-gtag/",\ - "packageDependencies": [\ - ["@atls/next-document-with-gtag", "workspace:packages/next-document-with-gtag"],\ - ["@types/node", "npm:24.19.1"],\ - ["@types/react", "npm:19.3.0"],\ - ["@types/react-dom", "virtual:a29650b7eaad3692d1139d6ca50163f9c611de4f12c1b46473850e285251c23b9c7999b6fe9d59b5db61d9d37958f2e8c07243c0c5bbcd15ae669fb338f0d523#npm:19.3.0"],\ - ["next", "virtual:a29650b7eaad3692d1139d6ca50163f9c611de4f12c1b46473850e285251c23b9c7999b6fe9d59b5db61d9d37958f2e8c07243c0c5bbcd15ae669fb338f0d523#npm:16.4.0"],\ - ["react", "npm:19.3.0"],\ - ["react-dom", "virtual:a29650b7eaad3692d1139d6ca50163f9c611de4f12c1b46473850e285251c23b9c7999b6fe9d59b5db61d9d37958f2e8c07243c0c5bbcd15ae669fb338f0d523#npm:19.3.0"]\ - ],\ - "linkType": "SOFT"\ - }]\ - ]],\ - ["@atls/next-document-with-helmet", [\ - ["workspace:packages/next-document-with-helmet", {\ - "packageLocation": "./packages/next-document-with-helmet/",\ - "packageDependencies": [\ - ["@atls/next-document-with-helmet", "workspace:packages/next-document-with-helmet"],\ - ["@dr.pogodin/react-helmet", "virtual:bf8a1598fa6a66838edf04cd1858984042966b4dcd6467a6373e96df1c74a52c69bba5507bf11b15cc923202e7da164deec40286571ad0c3340926914fe509d0#patch:@dr.pogodin/react-helmet@npm%3A3.3.2#~/.yarn/patches/@dr.pogodin-react-helmet-npm-3.3.2-c27db9f3f4.patch::version=3.3.2&hash=b2334b"],\ - ["@types/node", "npm:24.19.1"],\ - ["@types/react", "npm:19.3.0"],\ - ["@types/react-dom", "virtual:a29650b7eaad3692d1139d6ca50163f9c611de4f12c1b46473850e285251c23b9c7999b6fe9d59b5db61d9d37958f2e8c07243c0c5bbcd15ae669fb338f0d523#npm:19.3.0"],\ - ["next", "virtual:a29650b7eaad3692d1139d6ca50163f9c611de4f12c1b46473850e285251c23b9c7999b6fe9d59b5db61d9d37958f2e8c07243c0c5bbcd15ae669fb338f0d523#npm:16.4.0"],\ - ["react", "npm:19.3.0"],\ - ["react-dom", "virtual:a29650b7eaad3692d1139d6ca50163f9c611de4f12c1b46473850e285251c23b9c7999b6fe9d59b5db61d9d37958f2e8c07243c0c5bbcd15ae669fb338f0d523#npm:19.3.0"]\ - ],\ - "linkType": "SOFT"\ - }]\ - ]],\ - ["@atls/next-document-with-icons", [\ - ["workspace:packages/next-document-with-icons", {\ - "packageLocation": "./packages/next-document-with-icons/",\ - "packageDependencies": [\ - ["@atls/next-document-with-icons", "workspace:packages/next-document-with-icons"],\ - ["@types/node", "npm:24.19.1"],\ - ["@types/react", "npm:19.3.0"],\ - ["@types/react-dom", "virtual:a29650b7eaad3692d1139d6ca50163f9c611de4f12c1b46473850e285251c23b9c7999b6fe9d59b5db61d9d37958f2e8c07243c0c5bbcd15ae669fb338f0d523#npm:19.3.0"],\ - ["next", "virtual:a29650b7eaad3692d1139d6ca50163f9c611de4f12c1b46473850e285251c23b9c7999b6fe9d59b5db61d9d37958f2e8c07243c0c5bbcd15ae669fb338f0d523#npm:16.4.0"],\ - ["react", "npm:19.3.0"],\ - ["react-dom", "virtual:a29650b7eaad3692d1139d6ca50163f9c611de4f12c1b46473850e285251c23b9c7999b6fe9d59b5db61d9d37958f2e8c07243c0c5bbcd15ae669fb338f0d523#npm:19.3.0"]\ - ],\ - "linkType": "SOFT"\ - }]\ - ]],\ - ["@atls/next-document-with-opengraph", [\ - ["workspace:packages/next-document-with-opengraph", {\ - "packageLocation": "./packages/next-document-with-opengraph/",\ - "packageDependencies": [\ - ["@atls/next-document-with-opengraph", "workspace:packages/next-document-with-opengraph"],\ - ["@types/node", "npm:24.19.1"],\ - ["@types/react", "npm:19.3.0"],\ - ["@types/react-dom", "virtual:a29650b7eaad3692d1139d6ca50163f9c611de4f12c1b46473850e285251c23b9c7999b6fe9d59b5db61d9d37958f2e8c07243c0c5bbcd15ae669fb338f0d523#npm:19.3.0"],\ - ["next", "virtual:a29650b7eaad3692d1139d6ca50163f9c611de4f12c1b46473850e285251c23b9c7999b6fe9d59b5db61d9d37958f2e8c07243c0c5bbcd15ae669fb338f0d523#npm:16.4.0"],\ - ["react", "npm:19.3.0"],\ - ["react-dom", "virtual:a29650b7eaad3692d1139d6ca50163f9c611de4f12c1b46473850e285251c23b9c7999b6fe9d59b5db61d9d37958f2e8c07243c0c5bbcd15ae669fb338f0d523#npm:19.3.0"]\ - ],\ - "linkType": "SOFT"\ - }]\ - ]],\ ["@atls/next-identity-integration", [\ ["workspace:packages/identity-integration", {\ "packageLocation": "./packages/identity-integration/",\ @@ -624,28 +543,6 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ - ["@dr.pogodin/react-helmet", [\ - ["patch:@dr.pogodin/react-helmet@npm%3A3.3.2#~/.yarn/patches/@dr.pogodin-react-helmet-npm-3.3.2-c27db9f3f4.patch::version=3.3.2&hash=b2334b", {\ - "packageLocation": "../.yarn/berry/cache/@dr.pogodin-react-helmet-patch-fecd1f971f-10.zip/node_modules/@dr.pogodin/react-helmet/",\ - "packageDependencies": [\ - ["@dr.pogodin/react-helmet", "patch:@dr.pogodin/react-helmet@npm%3A3.3.2#~/.yarn/patches/@dr.pogodin-react-helmet-npm-3.3.2-c27db9f3f4.patch::version=3.3.2&hash=b2334b"]\ - ],\ - "linkType": "SOFT"\ - }],\ - ["virtual:bf8a1598fa6a66838edf04cd1858984042966b4dcd6467a6373e96df1c74a52c69bba5507bf11b15cc923202e7da164deec40286571ad0c3340926914fe509d0#patch:@dr.pogodin/react-helmet@npm%3A3.3.2#~/.yarn/patches/@dr.pogodin-react-helmet-npm-3.3.2-c27db9f3f4.patch::version=3.3.2&hash=b2334b", {\ - "packageLocation": "./.yarn/__virtual__/@dr.pogodin-react-helmet-virtual-6ba2383e91/2/.yarn/berry/cache/@dr.pogodin-react-helmet-patch-fecd1f971f-10.zip/node_modules/@dr.pogodin/react-helmet/",\ - "packageDependencies": [\ - ["@dr.pogodin/react-helmet", "virtual:bf8a1598fa6a66838edf04cd1858984042966b4dcd6467a6373e96df1c74a52c69bba5507bf11b15cc923202e7da164deec40286571ad0c3340926914fe509d0#patch:@dr.pogodin/react-helmet@npm%3A3.3.2#~/.yarn/patches/@dr.pogodin-react-helmet-npm-3.3.2-c27db9f3f4.patch::version=3.3.2&hash=b2334b"],\ - ["@types/react", "npm:19.3.0"],\ - ["react", "npm:19.3.0"]\ - ],\ - "packagePeers": [\ - "@types/react",\ - "react"\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["@emnapi/runtime", [\ ["npm:1.11.3", {\ "packageLocation": "../.yarn/berry/cache/@emnapi-runtime-npm-1.11.3-92f9e84cee-10.zip/node_modules/@emnapi/runtime/",\ diff --git a/.yarn/patches/@dr.pogodin-react-helmet-npm-3.3.2-c27db9f3f4.patch b/.yarn/patches/@dr.pogodin-react-helmet-npm-3.3.2-c27db9f3f4.patch deleted file mode 100644 index 323e84a6..00000000 --- a/.yarn/patches/@dr.pogodin-react-helmet-npm-3.3.2-c27db9f3f4.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/build/types/Helmet.d.ts b/build/types/Helmet.d.ts -index acf8e34d008be053fdecb85fc62b2b0b6cae5fee..73b372f98cfbfadfc2563f44de2a558f265ee787 100644 ---- a/build/types/Helmet.d.ts -+++ b/build/types/Helmet.d.ts -@@ -1,4 +1,4 @@ - import { type FunctionComponent } from 'react'; --import type { HelmetProps } from './types'; -+import type { HelmetProps } from './types.js'; - declare const Helmet: FunctionComponent; - export default Helmet; -diff --git a/build/types/Provider.d.ts b/build/types/Provider.d.ts -index fea729bf8a7dbf106503e7c745af2d9d560dc798..71b34b08159eaac833eee719b7bd2dcec6818859 100644 ---- a/build/types/Provider.d.ts -+++ b/build/types/Provider.d.ts -@@ -1,5 +1,5 @@ - import { type FunctionComponent, type ReactNode } from 'react'; --import type { ContextValue, HelmetServerState } from './types'; -+import type { ContextValue, HelmetServerState } from './types.js'; - export declare const Context: import("react").Context; - type ProviderProps = { - children?: ReactNode; -diff --git a/build/types/client.d.ts b/build/types/client.d.ts -index 8338f3dc91451674afeee656e96fa0f004df77ae..104cc4ac9a072ee199314ec846d76286832f7e09 100644 ---- a/build/types/client.d.ts -+++ b/build/types/client.d.ts -@@ -1,2 +1,2 @@ --import type { AggregatedState } from './types'; -+import type { AggregatedState } from './types.js'; - export declare function commitTagChanges(newState: AggregatedState, firstRender: boolean): void; -diff --git a/build/types/index.d.ts b/build/types/index.d.ts -index bc260a94cb5973fc75b904ad7a3761e4ae86defc..8e609c50d8b176d8897b007663fdd89b3baf517c 100644 ---- a/build/types/index.d.ts -+++ b/build/types/index.d.ts -@@ -1,4 +1,4 @@ --export type * from './types'; --export { default as Helmet } from './Helmet'; --export { default as MetaTags } from './MetaTags'; --export { default as HelmetProvider } from './Provider'; -+export type * from './types.js'; -+export { default as Helmet } from './Helmet.js'; -+export { default as MetaTags } from './MetaTags.js'; -+export { default as HelmetProvider } from './Provider.js'; -diff --git a/build/types/server.d.ts b/build/types/server.d.ts -index c47d631dab13248745dc712fb1acc6d248afd2ba..c2d0cbe2772cee536ca369038fd0c10e4793a7f5 100644 ---- a/build/types/server.d.ts -+++ b/build/types/server.d.ts -@@ -1,2 +1,2 @@ --import type { HelmetProviderHeap, HelmetServerState } from './types'; -+import type { HelmetProviderHeap, HelmetServerState } from './types.js'; - export declare function newServerState(heap: HelmetProviderHeap): HelmetServerState; -diff --git a/build/types/utils.d.ts b/build/types/utils.d.ts -index b6421a1784e040e8fd4e72cf422bd36fb8ec648a..f4a28f18585375a25c53758136ec7a910e9df425 100644 ---- a/build/types/utils.d.ts -+++ b/build/types/utils.d.ts -@@ -1,4 +1,4 @@ --import type { AggregatedState, BaseProps, HelmetPropArrays, HelmetPropObjects, HelmetProps, PropArrayItem, RegisteredHelmetPropsArray } from './types'; -+import type { AggregatedState, BaseProps, HelmetPropArrays, HelmetPropObjects, HelmetProps, PropArrayItem, RegisteredHelmetPropsArray } from './types.js'; - type PropList = Record; - type AttributeList = string[]; - type MatchProps = Record; diff --git a/.yarn/versions/e8bfa597.yml b/.yarn/versions/e8bfa597.yml index 4b38b699..d0fb2449 100644 --- a/.yarn/versions/e8bfa597.yml +++ b/.yarn/versions/e8bfa597.yml @@ -1,7 +1,3 @@ releases: - "@atls/next-document-with-gtag": major - "@atls/next-document-with-helmet": major - "@atls/next-document-with-icons": major - "@atls/next-document-with-opengraph": major "@atls/next-identity-integration": patch "@atls/next-sitemap-generator": patch diff --git a/README.md b/README.md index 1def88d5..79a7d7f6 100755 --- a/README.md +++ b/README.md @@ -18,22 +18,6 @@ Подключение к identity-сервисам, управление потоками аутентификации, восстановления и регистрации, а также настройка их пользовательского интерфейса. -### 📊  `next-document-with-gtag` - -Интеграция Google Analytics с помощью `gtag.js` для отслеживания пользовательских событий и метрик. - -### 🎩  `next-document-with-helmet` - -Поддержка react-helmet для управления динамическими мета-тегами и другими элементами заголовка. - -### 🌟  `next-document-with-icons` - -Поддержка кастомных иконок для веб-приложений, включая favicon и другие варианты. - -### 🌐  `next-document-with-opengraph` - -Поддержка Open Graph мета-тегов для предпросмотра ссылок в социальных сетях и мессенджерах. - ### 🗺️  `next-sitemap-generator` Генератор карты сайта для Next.js приложений, обеспечивающий индексацию и оптимизацию SEO. diff --git a/package.json b/package.json index da89ef17..e707b61c 100644 --- a/package.json +++ b/package.json @@ -13,9 +13,6 @@ ], "*.{test,spec}.{ts,tsx}": "yarn test unit" }, - "resolutions": { - "@dr.pogodin/react-helmet": "patch:@dr.pogodin/react-helmet@npm%3A3.3.2#~/.yarn/patches/@dr.pogodin-react-helmet-npm-3.3.2-c27db9f3f4.patch" - }, "devDependencies": { "@atls/raijin": "latest", "@types/node": "24.19.1" diff --git a/packages/next-document-with-gtag/package.json b/packages/next-document-with-gtag/package.json deleted file mode 100644 index 94c29f8e..00000000 --- a/packages/next-document-with-gtag/package.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "name": "@atls/next-document-with-gtag", - "version": "0.1.1", - "license": "BSD-3-Clause", - "main": "src/index.ts", - "files": [ - "dist" - ], - "scripts": { - "build": "yarn library build", - "prepack": "yarn run build", - "postpack": "rm -rf dist" - }, - "devDependencies": { - "@types/node": "24.19.1", - "@types/react": "19.3.0", - "@types/react-dom": "19.3.0", - "next": "16.4.0", - "react": "19.3.0", - "react-dom": "19.3.0" - }, - "peerDependencies": { - "next": "^16.0.0", - "react": "^19.0.0", - "react-dom": "^19.0.0" - }, - "publishConfig": { - "access": "public", - "main": "dist/index.js", - "typings": "dist/index.d.ts" - }, - "typecheckSkipLibCheck": true -} diff --git a/packages/next-document-with-gtag/src/index.ts b/packages/next-document-with-gtag/src/index.ts deleted file mode 100644 index 2d6afc79..00000000 --- a/packages/next-document-with-gtag/src/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { withGtag } from './with-gtag.provider' diff --git a/packages/next-document-with-gtag/src/with-gtag.provider.tsx b/packages/next-document-with-gtag/src/with-gtag.provider.tsx deleted file mode 100644 index 62585048..00000000 --- a/packages/next-document-with-gtag/src/with-gtag.provider.tsx +++ /dev/null @@ -1,33 +0,0 @@ -/* eslint-disable @next/next/no-document-import-in-page, @next/next/next-script-for-ga */ - -import type { DocumentContext, DocumentInitialProps } from 'next/document' - -import type Document from 'next/document' - -import React from 'react' - -export const withGtag = (gaTrackingId?: string) => (TargetComponent: typeof Document) => - class WithGtag extends TargetComponent { - static override async getInitialProps(context: DocumentContext): Promise { - const props = await super.getInitialProps(context) - - if (gaTrackingId) { - props.head ??= [] - props.head.push( -