diff --git a/libs/common/LICENSE b/libs/common/LICENSE deleted file mode 100644 index 2ee88de..0000000 --- a/libs/common/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2024 Foblex - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/libs/common/eslint.config.mjs b/libs/common/eslint.config.mjs deleted file mode 100644 index 1ccc870..0000000 --- a/libs/common/eslint.config.mjs +++ /dev/null @@ -1,5 +0,0 @@ -import baseConfig from '../../eslint.config.mjs'; - -export default [ - ...baseConfig, -]; diff --git a/libs/common/ng-package.json b/libs/common/ng-package.json deleted file mode 100644 index c049388..0000000 --- a/libs/common/ng-package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../dist/libs/mr-common", - "lib": { - "entryFile": "src/index.ts" - } -} diff --git a/libs/common/package.json b/libs/common/package.json deleted file mode 100644 index e38d5d4..0000000 --- a/libs/common/package.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "name": "@foblex/mr-common", - "version": "0.0.1", - "description": "MRender is a static site generator designed for creating fast and user-friendly documentation sites based on Markdown files. MarkEngine supports extended Markdown syntax and can render Angular components directly from Markdown files.", - "author": "Siarhei Huzarevich", - "license": "MIT", - "private": false, - "keywords": [ - "angular", - "static site generator", - "ssg", - "markdown", - "javascript", - "typescript", - "foblex" - ], - "repository": { - "type": "git", - "url": "git+https://github.com/foblex/m-render.git" - }, - "peerDependencies": { - "@angular/common": ">=12.0.0", - "@angular/core": ">=12.0.0" - }, - "dependencies": { - "tslib": ">=2.3.0" - }, - "sideEffects": false -} diff --git a/libs/common/project.json b/libs/common/project.json deleted file mode 100644 index 172e122..0000000 --- a/libs/common/project.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "name": "@foblex/mr-common", - "$schema": "../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/common/src", - "prefix": "lib", - "projectType": "library", - "release": { - "version": { - "manifestRootsToUpdate": ["dist/{projectRoot}"], - "currentVersionResolver": "git-tag", - "fallbackCurrentVersionResolver": "disk" - } - }, - "tags": [], - "targets": { - "build": { - "executor": "@nx/angular:package", - "outputs": ["{workspaceRoot}/dist/{projectRoot}"], - "options": { - "project": "libs/common/ng-package.json" - }, - "configurations": { - "production": { - "tsConfig": "libs/common/tsconfig.lib.prod.json" - }, - "development": { - "tsConfig": "libs/common/tsconfig.lib.json" - } - }, - "defaultConfiguration": "production" - } - } -} diff --git a/libs/common/src/index.ts b/libs/common/src/index.ts deleted file mode 100644 index 3342b14..0000000 --- a/libs/common/src/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './lib/utils'; - diff --git a/libs/common/tsconfig.json b/libs/common/tsconfig.json deleted file mode 100644 index 24b1249..0000000 --- a/libs/common/tsconfig.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "compilerOptions": { - "target": "es2022", - "forceConsistentCasingInFileNames": true, - "strict": true, - "noImplicitOverride": true, - "noPropertyAccessFromIndexSignature": true, - "noImplicitReturns": true, - "noFallthroughCasesInSwitch": true, - "allowSyntheticDefaultImports": true - }, - "files": [], - "include": [], - "references": [ - { - "path": "./tsconfig.lib.json" - } - ], - "extends": "../../tsconfig.base.json", - "angularCompilerOptions": { - "enableI18nLegacyMessageIdFormat": false, - "strictInjectionParameters": true, - "strictInputAccessModifiers": true, - "strictTemplates": true - } -} diff --git a/libs/common/tsconfig.lib.json b/libs/common/tsconfig.lib.json deleted file mode 100644 index 063e525..0000000 --- a/libs/common/tsconfig.lib.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../../dist/out-tsc", - "declaration": true, - "declarationMap": true, - "inlineSources": true, - "types": [] - }, - "exclude": [ - "src/**/*.spec.ts", - "src/test-setup.ts", - "jest.config.ts", - "src/**/*.test.ts" - ], - "include": ["src/**/*.ts"] -} diff --git a/libs/common/tsconfig.lib.prod.json b/libs/common/tsconfig.lib.prod.json deleted file mode 100644 index 2a2faa8..0000000 --- a/libs/common/tsconfig.lib.prod.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "./tsconfig.lib.json", - "compilerOptions": { - "declarationMap": false - }, - "angularCompilerOptions": { - "compilationMode": "partial" - } -} diff --git a/libs/highlight/LICENSE b/libs/highlight/LICENSE deleted file mode 100644 index 2ee88de..0000000 --- a/libs/highlight/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2024 Foblex - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/libs/highlight/eslint.config.mjs b/libs/highlight/eslint.config.mjs deleted file mode 100644 index 1ccc870..0000000 --- a/libs/highlight/eslint.config.mjs +++ /dev/null @@ -1,5 +0,0 @@ -import baseConfig from '../../eslint.config.mjs'; - -export default [ - ...baseConfig, -]; diff --git a/libs/highlight/ng-package.json b/libs/highlight/ng-package.json deleted file mode 100644 index a6a7e54..0000000 --- a/libs/highlight/ng-package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../dist/libs/mr-highlight", - "lib": { - "entryFile": "src/index.ts" - } -} diff --git a/libs/highlight/package.json b/libs/highlight/package.json deleted file mode 100644 index 613cdf3..0000000 --- a/libs/highlight/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@foblex/mr-highlight", - "version": "0.0.1", - "description": "MRender is a static site generator designed for creating fast and user-friendly documentation sites based on Markdown files. MarkEngine supports extended Markdown syntax and can render Angular components directly from Markdown files.", - "author": "Siarhei Huzarevich", - "license": "MIT", - "private": false, - "keywords": [ - "angular", - "static site generator", - "ssg", - "markdown", - "javascript", - "typescript", - "foblex" - ], - "repository": { - "type": "git", - "url": "git+https://github.com/foblex/m-render.git" - }, - "peerDependencies": { - "@angular/common": ">=12.0.0", - "@angular/core": ">=12.0.0", - "shiki": "^3.4.2" - }, - "dependencies": { - "tslib": ">=2.3.0" - }, - "sideEffects": false -} diff --git a/libs/highlight/project.json b/libs/highlight/project.json deleted file mode 100644 index e4249f7..0000000 --- a/libs/highlight/project.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "name": "@foblex/mr-highlight", - "$schema": "../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/highlight/src", - "prefix": "lib", - "projectType": "library", - "release": { - "version": { - "manifestRootsToUpdate": ["dist/{projectRoot}"], - "currentVersionResolver": "git-tag", - "fallbackCurrentVersionResolver": "disk" - } - }, - "tags": [], - "targets": { - "build": { - "executor": "@nx/angular:package", - "outputs": ["{workspaceRoot}/dist/{projectRoot}"], - "options": { - "project": "libs/highlight/ng-package.json" - }, - "configurations": { - "production": { - "tsConfig": "libs/highlight/tsconfig.lib.prod.json" - }, - "development": { - "tsConfig": "libs/highlight/tsconfig.lib.json" - } - }, - "defaultConfiguration": "production" - } - } -} diff --git a/libs/highlight/src/index.ts b/libs/highlight/src/index.ts deleted file mode 100644 index 52ead47..0000000 --- a/libs/highlight/src/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './lib'; - diff --git a/libs/highlight/tsconfig.json b/libs/highlight/tsconfig.json deleted file mode 100644 index 24b1249..0000000 --- a/libs/highlight/tsconfig.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "compilerOptions": { - "target": "es2022", - "forceConsistentCasingInFileNames": true, - "strict": true, - "noImplicitOverride": true, - "noPropertyAccessFromIndexSignature": true, - "noImplicitReturns": true, - "noFallthroughCasesInSwitch": true, - "allowSyntheticDefaultImports": true - }, - "files": [], - "include": [], - "references": [ - { - "path": "./tsconfig.lib.json" - } - ], - "extends": "../../tsconfig.base.json", - "angularCompilerOptions": { - "enableI18nLegacyMessageIdFormat": false, - "strictInjectionParameters": true, - "strictInputAccessModifiers": true, - "strictTemplates": true - } -} diff --git a/libs/highlight/tsconfig.lib.json b/libs/highlight/tsconfig.lib.json deleted file mode 100644 index 063e525..0000000 --- a/libs/highlight/tsconfig.lib.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../../dist/out-tsc", - "declaration": true, - "declarationMap": true, - "inlineSources": true, - "types": [] - }, - "exclude": [ - "src/**/*.spec.ts", - "src/test-setup.ts", - "jest.config.ts", - "src/**/*.test.ts" - ], - "include": ["src/**/*.ts"] -} diff --git a/libs/highlight/tsconfig.lib.prod.json b/libs/highlight/tsconfig.lib.prod.json deleted file mode 100644 index 2a2faa8..0000000 --- a/libs/highlight/tsconfig.lib.prod.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "./tsconfig.lib.json", - "compilerOptions": { - "declarationMap": false - }, - "angularCompilerOptions": { - "compilationMode": "partial" - } -} diff --git a/libs/m-render/package.json b/libs/m-render/package.json index 4123216..7fc4e5d 100644 --- a/libs/m-render/package.json +++ b/libs/m-render/package.json @@ -1,6 +1,6 @@ { "name": "@foblex/m-render", - "version": "2.7.3", + "version": "2.7.4", "description": "MRender is a static site generator designed for creating fast and user-friendly documentation sites based on Markdown files. MarkEngine supports extended Markdown syntax and can render Angular components directly from Markdown files.", "author": "Siarhei Huzarevich", "license": "MIT", diff --git a/libs/m-render/src/index.ts b/libs/m-render/src/index.ts index 3c17583..7b62b1c 100644 --- a/libs/m-render/src/index.ts +++ b/libs/m-render/src/index.ts @@ -1,6 +1,7 @@ export * from './lib/analytics'; export * from './lib/common'; export * from './lib/documentation-page'; +export * from './lib/highlight'; export * from './lib/home-page'; export * from './lib/theme'; diff --git a/libs/m-render/src/lib/analytics/cookie-popup/cookie-popup.component.ts b/libs/m-render/src/lib/analytics/cookie-popup/cookie-popup.component.ts index c4e32f6..4077371 100644 --- a/libs/m-render/src/lib/analytics/cookie-popup/cookie-popup.component.ts +++ b/libs/m-render/src/lib/analytics/cookie-popup/cookie-popup.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, computed, inject, signal } from '@angular/core'; import { GTagService } from '../g-tag.service'; -import { LOCAL_STORAGE } from '@foblex/mr-common'; +import { LOCAL_STORAGE } from '../../common'; export const F_ACCEPT_COOKIES_KEY = 'm-accepts-cookies'; diff --git a/libs/m-render/src/lib/common/index.ts b/libs/m-render/src/lib/common/index.ts index 42e710a..5ee4958 100644 --- a/libs/m-render/src/lib/common/index.ts +++ b/libs/m-render/src/lib/common/index.ts @@ -2,3 +2,4 @@ export * from './components'; export * from './directives'; export * from './domain'; export * from './services'; +export * from './utils'; diff --git a/libs/common/src/lib/utils/copy-to-clipboard.ts b/libs/m-render/src/lib/common/utils/copy-to-clipboard.ts similarity index 100% rename from libs/common/src/lib/utils/copy-to-clipboard.ts rename to libs/m-render/src/lib/common/utils/copy-to-clipboard.ts diff --git a/libs/common/src/lib/utils/document-element.ts b/libs/m-render/src/lib/common/utils/document-element.ts similarity index 100% rename from libs/common/src/lib/utils/document-element.ts rename to libs/m-render/src/lib/common/utils/document-element.ts diff --git a/libs/common/src/lib/utils/index.ts b/libs/m-render/src/lib/common/utils/index.ts similarity index 100% rename from libs/common/src/lib/utils/index.ts rename to libs/m-render/src/lib/common/utils/index.ts diff --git a/libs/common/src/lib/utils/local-storage.ts b/libs/m-render/src/lib/common/utils/local-storage.ts similarity index 100% rename from libs/common/src/lib/utils/local-storage.ts rename to libs/m-render/src/lib/common/utils/local-storage.ts diff --git a/libs/common/src/lib/utils/location.ts b/libs/m-render/src/lib/common/utils/location.ts similarity index 100% rename from libs/common/src/lib/utils/location.ts rename to libs/m-render/src/lib/common/utils/location.ts diff --git a/libs/common/src/lib/utils/platform.ts b/libs/m-render/src/lib/common/utils/platform.ts similarity index 100% rename from libs/common/src/lib/utils/platform.ts rename to libs/m-render/src/lib/common/utils/platform.ts diff --git a/libs/common/src/lib/utils/window.ts b/libs/m-render/src/lib/common/utils/window.ts similarity index 100% rename from libs/common/src/lib/utils/window.ts rename to libs/m-render/src/lib/common/utils/window.ts diff --git a/libs/m-render/src/lib/documentation-page/analytics/common-services/f-meta.service.ts b/libs/m-render/src/lib/documentation-page/analytics/common-services/f-meta.service.ts index f11618e..d87795e 100644 --- a/libs/m-render/src/lib/documentation-page/analytics/common-services/f-meta.service.ts +++ b/libs/m-render/src/lib/documentation-page/analytics/common-services/f-meta.service.ts @@ -6,7 +6,7 @@ import { FHeadTagService } from './f-head-tag.service'; import { tap } from 'rxjs/operators'; import { DOCUMENTATION_CONFIGURATION } from '../../domain'; import { INavigationGroup, INavigationItem } from '../../components'; -import { LOCATION } from '@foblex/mr-common'; +import { LOCATION } from '../../../common'; @Injectable() export class FMetaService { diff --git a/libs/m-render/src/lib/documentation-page/components/markdown-container/f-markdown/components/f-code-group/f-code-view/components/highlight.component.ts b/libs/m-render/src/lib/documentation-page/components/markdown-container/f-markdown/components/f-code-group/f-code-view/components/highlight.component.ts index d64c6dc..8653783 100644 --- a/libs/m-render/src/lib/documentation-page/components/markdown-container/f-markdown/components/f-code-group/f-code-view/components/highlight.component.ts +++ b/libs/m-render/src/lib/documentation-page/components/markdown-container/f-markdown/components/f-code-group/f-code-view/components/highlight.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, DestroyRef, ElementRef, inject, input, OnInit } from '@angular/core'; import { take } from 'rxjs/operators'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; -import { HighlightService } from '@foblex/mr-highlight'; +import { HighlightService } from '../../../../../../../../highlight'; @Component({ selector: 'highlight', diff --git a/libs/m-render/src/lib/documentation-page/components/markdown-container/f-markdown/components/f-code-group/f-code-view/f-code-view.component.ts b/libs/m-render/src/lib/documentation-page/components/markdown-container/f-markdown/components/f-code-group/f-code-view/f-code-view.component.ts index 4f7c849..82bec6e 100644 --- a/libs/m-render/src/lib/documentation-page/components/markdown-container/f-markdown/components/f-code-group/f-code-view/f-code-view.component.ts +++ b/libs/m-render/src/lib/documentation-page/components/markdown-container/f-markdown/components/f-code-group/f-code-view/f-code-view.component.ts @@ -6,9 +6,8 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { HighlightComponent } from './components/highlight.component'; import { parseLanguageFromFileExtension, parseSyntaxLanguage } from './utils/parse-language'; import { IParsedContainerData } from '../../../markdown'; -import { PopoverService } from '../../../../../../../common'; +import { copyToClipboard, PopoverService } from '../../../../../../../common'; import { coerceComponentHeight } from '../f-example-view'; -import { copyToClipboard } from '@foblex/mr-common'; @Component({ selector: 'f-code-view', diff --git a/libs/m-render/src/lib/documentation-page/components/markdown-container/f-markdown/components/f-code-group/f-code-view/utils/parse-language.ts b/libs/m-render/src/lib/documentation-page/components/markdown-container/f-markdown/components/f-code-group/f-code-view/utils/parse-language.ts index 6d6a734..127fb9b 100644 --- a/libs/m-render/src/lib/documentation-page/components/markdown-container/f-markdown/components/f-code-group/f-code-view/utils/parse-language.ts +++ b/libs/m-render/src/lib/documentation-page/components/markdown-container/f-markdown/components/f-code-group/f-code-view/utils/parse-language.ts @@ -1,4 +1,4 @@ -import { AVAILABLE_LANGUAGES } from '@foblex/mr-highlight'; +import { AVAILABLE_LANGUAGES } from '../../../../../../../../highlight'; export function parseLanguageFromFileExtension(url: string): string { const match = url.match(/\.([0-9a-z]+)(?:[\?#]|$)/i); diff --git a/libs/m-render/src/lib/documentation-page/components/markdown-container/f-markdown/components/f-markdown-footer/f-markdown-footer.component.ts b/libs/m-render/src/lib/documentation-page/components/markdown-container/f-markdown/components/f-markdown-footer/f-markdown-footer.component.ts index ab83887..80164e2 100644 --- a/libs/m-render/src/lib/documentation-page/components/markdown-container/f-markdown/components/f-markdown-footer/f-markdown-footer.component.ts +++ b/libs/m-render/src/lib/documentation-page/components/markdown-container/f-markdown/components/f-markdown-footer/f-markdown-footer.component.ts @@ -15,7 +15,7 @@ import { import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { DocumentationStore } from '../../../../../services'; import { HandleNavigationLinksHandler, HandleNavigationLinksRequest } from '../../../../../domain'; -import { WINDOW } from '@foblex/mr-common'; +import { WINDOW } from '../../../../../../common'; @Component({ selector: 'footer [f-markdown-footer]', diff --git a/libs/m-render/src/lib/documentation-page/components/markdown-container/f-markdown/f-markdown-renderer.component.ts b/libs/m-render/src/lib/documentation-page/components/markdown-container/f-markdown/f-markdown-renderer.component.ts index e9d9ab1..d4d199a 100644 --- a/libs/m-render/src/lib/documentation-page/components/markdown-container/f-markdown/f-markdown-renderer.component.ts +++ b/libs/m-render/src/lib/documentation-page/components/markdown-container/f-markdown/f-markdown-renderer.component.ts @@ -27,7 +27,7 @@ import { } from '../../scrollable-container'; import { FMarkdownFooterComponent } from './components'; import { HandleNavigationLinksHandler, HandleNavigationLinksRequest } from '../../../domain'; -import { IS_BROWSER_PLATFORM, WINDOW } from '@foblex/mr-common'; +import { IS_BROWSER_PLATFORM, WINDOW } from '../../../../common'; @Component({ selector: 'f-markdown-renderer', diff --git a/libs/m-render/src/lib/documentation-page/components/navigation-panel/navigation-panel.component.ts b/libs/m-render/src/lib/documentation-page/components/navigation-panel/navigation-panel.component.ts index 0511071..55d64a2 100644 --- a/libs/m-render/src/lib/documentation-page/components/navigation-panel/navigation-panel.component.ts +++ b/libs/m-render/src/lib/documentation-page/components/navigation-panel/navigation-panel.component.ts @@ -18,7 +18,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { TOGGLE_NAVIGATION_COMPONENT } from '../header'; import { DocumentationStore } from '../../services'; import { HandleNavigationLinksHandler, HandleNavigationLinksRequest } from '../../domain'; -import { WINDOW } from '@foblex/mr-common'; +import { WINDOW } from '../../../common'; @Component({ selector: 'f-navigation-panel', diff --git a/libs/m-render/src/lib/documentation-page/components/scrollable-container/components/table-of-content/table-of-content.component.ts b/libs/m-render/src/lib/documentation-page/components/scrollable-container/components/table-of-content/table-of-content.component.ts index 3f3d09d..20e8e8d 100644 --- a/libs/m-render/src/lib/documentation-page/components/scrollable-container/components/table-of-content/table-of-content.component.ts +++ b/libs/m-render/src/lib/documentation-page/components/scrollable-container/components/table-of-content/table-of-content.component.ts @@ -13,7 +13,7 @@ import { ScrollToElementInContainerRequest, } from '../../index'; import { ActivateTocByHashRequest } from '../../domain'; -import { WINDOW } from '@foblex/mr-common'; +import { WINDOW } from '../../../../../common'; @Component({ selector: 'aside[f-table-of-content]', diff --git a/libs/m-render/src/lib/documentation-page/components/scrollable-container/domain/calculate-hash-from-scroll-position-and-activate-toc/calculate-hash-from-scroll-position-and-activate-toc.handler.ts b/libs/m-render/src/lib/documentation-page/components/scrollable-container/domain/calculate-hash-from-scroll-position-and-activate-toc/calculate-hash-from-scroll-position-and-activate-toc.handler.ts index 42153eb..11eef22 100644 --- a/libs/m-render/src/lib/documentation-page/components/scrollable-container/domain/calculate-hash-from-scroll-position-and-activate-toc/calculate-hash-from-scroll-position-and-activate-toc.handler.ts +++ b/libs/m-render/src/lib/documentation-page/components/scrollable-container/domain/calculate-hash-from-scroll-position-and-activate-toc/calculate-hash-from-scroll-position-and-activate-toc.handler.ts @@ -6,7 +6,7 @@ import { } from '../../../index'; import { ActivateTocByHashRequest } from '../activate-toc-by-hash'; import { DocumentationStore } from '../../../../services'; -import { DOCUMENT_ELEMENT, WINDOW } from '@foblex/mr-common'; +import { DOCUMENT_ELEMENT, WINDOW } from '../../../../../common'; interface IHasTopItem { hash: string; diff --git a/libs/m-render/src/lib/documentation-page/documentation-root.component.ts b/libs/m-render/src/lib/documentation-page/documentation-root.component.ts index 85df134..db00824 100644 --- a/libs/m-render/src/lib/documentation-page/documentation-root.component.ts +++ b/libs/m-render/src/lib/documentation-page/documentation-root.component.ts @@ -20,7 +20,7 @@ import { import { DocumentationStore } from './services'; import { F_SOCIAL_LINKS_PROVIDER, - HEADER_CONFIGURATION_STORE, + HEADER_CONFIGURATION_STORE, IS_BROWSER_PLATFORM, PopoverService, ThemeService, } from '../common'; @@ -28,8 +28,7 @@ import { FMetaService } from './analytics'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { CookiePopupComponent } from '../analytics/cookie-popup/cookie-popup.component'; import { GTagService } from '../analytics'; -import { IS_BROWSER_PLATFORM } from '@foblex/mr-common'; -import { HighlightService } from '@foblex/mr-highlight'; +import { HighlightService } from '../highlight'; @Component({ selector: 'documentation-root', diff --git a/libs/highlight/src/lib/highlight.service.ts b/libs/m-render/src/lib/highlight/highlight.service.ts similarity index 97% rename from libs/highlight/src/lib/highlight.service.ts rename to libs/m-render/src/lib/highlight/highlight.service.ts index 3ae44fd..56286eb 100644 --- a/libs/highlight/src/lib/highlight.service.ts +++ b/libs/m-render/src/lib/highlight/highlight.service.ts @@ -5,7 +5,7 @@ import { BundledLanguage, BundledTheme, createHighlighter, HighlighterGeneric } import { UNIVERSAL_THEME } from './theme'; import { catchError, shareReplay } from 'rxjs/operators'; import { AVAILABLE_LANGUAGES } from './languages'; -import { IS_BROWSER_PLATFORM, WINDOW } from '@foblex/mr-common'; +import { IS_BROWSER_PLATFORM, WINDOW } from '../common'; type Highlighter = HighlighterGeneric; diff --git a/libs/highlight/src/lib/index.ts b/libs/m-render/src/lib/highlight/index.ts similarity index 100% rename from libs/highlight/src/lib/index.ts rename to libs/m-render/src/lib/highlight/index.ts diff --git a/libs/highlight/src/lib/languages.ts b/libs/m-render/src/lib/highlight/languages.ts similarity index 100% rename from libs/highlight/src/lib/languages.ts rename to libs/m-render/src/lib/highlight/languages.ts diff --git a/libs/highlight/src/lib/mark-code-focused-blocks.post-processor.ts b/libs/m-render/src/lib/highlight/mark-code-focused-blocks.post-processor.ts similarity index 100% rename from libs/highlight/src/lib/mark-code-focused-blocks.post-processor.ts rename to libs/m-render/src/lib/highlight/mark-code-focused-blocks.post-processor.ts diff --git a/libs/highlight/src/lib/theme.ts b/libs/m-render/src/lib/highlight/theme.ts similarity index 100% rename from libs/highlight/src/lib/theme.ts rename to libs/m-render/src/lib/highlight/theme.ts diff --git a/libs/m-render/src/lib/home-page/home-root.component.ts b/libs/m-render/src/lib/home-page/home-root.component.ts index 99268b4..80612eb 100644 --- a/libs/m-render/src/lib/home-page/home-root.component.ts +++ b/libs/m-render/src/lib/home-page/home-root.component.ts @@ -17,10 +17,9 @@ import { FHomePageHeroComponent, FHomePageMembershipsComponent, } from './components'; -import { HEADER_CONFIGURATION_STORE, ThemeService } from '../common'; +import { HEADER_CONFIGURATION_STORE, IS_BROWSER_PLATFORM, ThemeService } from '../common'; import { CookiePopupComponent } from '../analytics/cookie-popup/cookie-popup.component'; import { GTagService } from '../analytics'; -import { IS_BROWSER_PLATFORM } from '@foblex/mr-common'; @Component({ selector: 'home-root', diff --git a/libs/m-render/src/lib/theme/theme-button/theme-button.component.ts b/libs/m-render/src/lib/theme/theme-button/theme-button.component.ts index 14621b4..619876c 100644 --- a/libs/m-render/src/lib/theme/theme-button/theme-button.component.ts +++ b/libs/m-render/src/lib/theme/theme-button/theme-button.component.ts @@ -5,7 +5,7 @@ import { Renderer2, } from '@angular/core'; import { ThemeService } from '../theme.service'; -import { DOCUMENT_ELEMENT, IS_BROWSER_PLATFORM, LOCAL_STORAGE } from '@foblex/mr-common'; +import { DOCUMENT_ELEMENT, IS_BROWSER_PLATFORM, LOCAL_STORAGE } from '../../common'; @Component({ selector: 'button[theme-button]', diff --git a/libs/m-render/src/lib/theme/theme.service.ts b/libs/m-render/src/lib/theme/theme.service.ts index 9358621..90490b3 100644 --- a/libs/m-render/src/lib/theme/theme.service.ts +++ b/libs/m-render/src/lib/theme/theme.service.ts @@ -1,6 +1,6 @@ import { inject, Injectable } from '@angular/core'; import { Observable, Subject } from 'rxjs'; -import { DOCUMENT_ELEMENT, LOCAL_STORAGE, WINDOW } from '@foblex/mr-common'; +import { DOCUMENT_ELEMENT, LOCAL_STORAGE, WINDOW } from '../common'; @Injectable() export class ThemeService { diff --git a/libs/m-render/tsconfig.lib.prod.json b/libs/m-render/tsconfig.lib.prod.json index b1b9289..e83a434 100644 --- a/libs/m-render/tsconfig.lib.prod.json +++ b/libs/m-render/tsconfig.lib.prod.json @@ -2,10 +2,6 @@ "extends": "./tsconfig.lib.json", "compilerOptions": { "declarationMap": false, - "paths": { - "@foblex/mr-common": ["dist/libs/mr-common"], - "@foblex/mr-highlight": ["dist/libs/mr-highlight"], - } }, "angularCompilerOptions": { "compilationMode": "partial" diff --git a/package.json b/package.json index f6888d7..66e1712 100644 --- a/package.json +++ b/package.json @@ -3,10 +3,8 @@ "version": "0.0.0", "license": "MIT", "scripts": { - "build-common": "nx run @foblex/mr-common:build:production", - "build-highlight": "nx run @foblex/mr-highlight:build:production", "build-m-render": "nx run m-render:build:production", - "heroku-postbuild": "npm run build-common && npm run build-highlight && npm run build-m-render && nx build site --configuration=production && nx run site:server:production && nx run site:prerender:production" + "heroku-postbuild": "npm run build-m-render && nx build site --configuration=production && nx run site:server:production && nx run site:prerender:production" }, "engines": { "node": "20.x" diff --git a/tsconfig.base.json b/tsconfig.base.json index 1e435b1..942d2e3 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -21,12 +21,6 @@ "paths": { "@foblex/m-render": [ "libs/m-render/src/index.ts" - ], - "@foblex/mr-highlight": [ - "dist/libs/mr-highlight" - ], - "@foblex/mr-common": [ - "dist/libs/mr-common/index" ] } },