diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a2e72af..995c4032 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,7 +47,7 @@ All notable changes to this project will be documented in this file. See [standa * Added Server Side Rendering (SSR) support ([ba73083](https://github.com/foblex/flow/commit/ba7308383ec498f2ce79718d502ec75bd220a1b8)) * Added snap connection to create functionality ([82b3872](https://github.com/foblex/flow/commit/82b38725db63093c2a126867345d2780049492c3)) * Added snap connection to reassign functionality ([37972df](https://github.com/foblex/flow/commit/37972df1ccf933d0590d8efa8cc253b17f462464)) -* Added SSR support to f-docs ([a3d6595](https://github.com/foblex/flow/commit/a3d6595fb28df1e8bfd61ccc8e989ec26e43f58d)) +* Added SSR support to m-render ([a3d6595](https://github.com/foblex/flow/commit/a3d6595fb28df1e8bfd61ccc8e989ec26e43f58d)) * Changed imports from @foblex/core to @foblex/mediator, @foblex/platform, @foblex/2d ([30a60da](https://github.com/foblex/flow/commit/30a60da2e64aa87be52e6fb90f06f780b2dc0777)) * Changed imports from @foblex/core to @foblex/utils, @foblex/drag-toolkit ([26d9631](https://github.com/foblex/flow/commit/26d96313b86d068d9912b3c6ff28ca0fa6c14039)) * Cleanup after delete @foblex/core ([9aa5717](https://github.com/foblex/flow/commit/9aa5717434849c1a9b612e503d67c1a893b6b6e3)) @@ -93,7 +93,7 @@ All notable changes to this project will be documented in this file. See [standa * Modified layers sorting functionality after adding f-group ([3c60249](https://github.com/foblex/flow/commit/3c602498df9dfdcd4a5a74bc174dd23000015eca)) * Moved external item drag and drop functionality to component directory ([8b9dbb1](https://github.com/foblex/flow/commit/8b9dbb114eec8816a10e7de9494bcc6e82187911)) * Moved selection area drag and drop functionality to component directory ([121a63e](https://github.com/foblex/flow/commit/121a63e1fdc8d5bdb7be9127c0008ba9f2de14e0)) -* Updated to f-docs v1.2.2 ([bdaa267](https://github.com/foblex/flow/commit/bdaa267a705b701cbd5bb0886940f925412a79bd)) +* Updated to m-render v1.2.2 ([bdaa267](https://github.com/foblex/flow/commit/bdaa267a705b701cbd5bb0886940f925412a79bd)) ### Bug Fixes @@ -124,7 +124,7 @@ All notable changes to this project will be documented in this file. See [standa * Add various site icons and upgrade library to Zoneless ([e561e69](https://github.com/foblex/flow/commit/e561e6972a723ea299005518057963ba260961af)) * Added minimap functionality ([f5eece6](https://github.com/foblex/flow/commit/f5eece6df6e556a0ec0bbfa26ec623ce368f60ef)) * Added Zoneless support ([a8c5812](https://github.com/foblex/flow/commit/a8c581285d8c9e6f246cbd2f2a07c346ce1ba131)) -* Update to f-docs v1.2.1 ([8067764](https://github.com/foblex/flow/commit/80677640c5d917b564964987b575d9fb28e28ce5)) +* Update to m-render v1.2.1 ([8067764](https://github.com/foblex/flow/commit/80677640c5d917b564964987b575d9fb28e28ce5)) ### Documentation diff --git a/angular.json b/angular.json index a3b26d36..cb289cba 100644 --- a/angular.json +++ b/angular.json @@ -30,7 +30,6 @@ } ], "styles": [ -// "projects/f-docs/src/assets/styles/styles.scss", "src/styles/styles.scss" ], "scripts": [], @@ -133,23 +132,23 @@ } } }, - "f-docs": { + "m-render": { "projectType": "library", - "root": "projects/f-docs", - "sourceRoot": "projects/f-docs/src", + "root": "projects/m-render", + "sourceRoot": "projects/m-render/src", "prefix": "lib", "architect": { "build": { "builder": "@angular-devkit/build-angular:ng-packagr", "options": { - "project": "projects/f-docs/ng-package.json" + "project": "projects/m-render/ng-package.json" }, "configurations": { "production": { - "tsConfig": "projects/f-docs/tsconfig.lib.prod.json" + "tsConfig": "projects/m-render/tsconfig.lib.prod.json" }, "development": { - "tsConfig": "projects/f-docs/tsconfig.lib.json" + "tsConfig": "projects/m-render/tsconfig.lib.json" } }, "defaultConfiguration": "production" @@ -157,7 +156,7 @@ "test": { "builder": "@angular-devkit/build-angular:karma", "options": { - "tsConfig": "projects/f-docs/tsconfig.spec.json", + "tsConfig": "projects/m-render/tsconfig.spec.json", "polyfills": [ "zone.js", "zone.js/testing" diff --git a/package-lock.json b/package-lock.json index 096649c1..465e841d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,7 +23,7 @@ "@cypress/angular": "^2.1.0", "@foblex/2d": "1.1.5", "@foblex/drag-toolkit": "1.1.0", - "@foblex/f-docs": "1.5.0", + "@foblex/m-render": "2.5.1", "@foblex/mediator": "1.1.0", "@foblex/platform": "1.0.4", "@foblex/utils": "1.1.0", @@ -2866,10 +2866,10 @@ "tslib": "^2.3.0" } }, - "node_modules/@foblex/f-docs": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@foblex/f-docs/-/f-docs-1.5.0.tgz", - "integrity": "sha512-clRg90PxIT8vQ/kDxCqmjyS39ebcwsbl3NI0AggZSrwS0/d2Uk1dYoWRUkv/3ZCK7mmKyspSdezhOyNhLxXipg==", + "node_modules/@foblex/m-render": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@foblex/m-render/-/m-render-2.5.1.tgz", + "integrity": "sha512-f4LVEtih++uUNlYSyy58EC98BNfJyygRb33ytr+IhhQnANZBzqjnmCPfzj48C1ZabjoCgNtGSACL4pcIPJAfow==", "dependencies": { "tslib": ">=2.3.0" }, diff --git a/package.json b/package.json index d1e6d3f6..8dc55377 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,6 @@ "start": "ng serve", "start-shared": "ng serve --host 0.0.0.0", "build": "ng build", - "build-sequence": "ng build f-docs && ng build", "watch": "ng build --watch --configuration development", "test": "ng test f-flow", "publish": "ng build f-flow && cd dist/f-flow && npm publish", @@ -69,7 +68,7 @@ "@cypress/angular": "^2.1.0", "@foblex/2d": "1.1.5", "@foblex/drag-toolkit": "1.1.0", - "@foblex/f-docs": "1.5.0", + "@foblex/m-render": "2.5.1", "@foblex/mediator": "1.1.0", "@foblex/platform": "1.0.4", "@foblex/utils": "1.1.0", diff --git a/projects/f-examples/connectors/connector-outlet/connector-outlet.component.ts b/projects/f-examples/connectors/connector-outlet/connector-outlet.component.ts index 59b08fe8..2b852dba 100644 --- a/projects/f-examples/connectors/connector-outlet/connector-outlet.component.ts +++ b/projects/f-examples/connectors/connector-outlet/connector-outlet.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ViewChild } from '@angular/core'; import { FCanvasComponent, FCreateConnectionEvent, FFlowModule } from '@foblex/flow'; -import { FCheckboxComponent } from '@foblex/f-docs'; +import { FCheckboxComponent } from '@foblex/m-render'; import { MatIcon } from '@angular/material/icon'; @Component({ diff --git a/projects/f-examples/connectors/limiting-connections/limiting-connections.component.ts b/projects/f-examples/connectors/limiting-connections/limiting-connections.component.ts index 35eaa8ed..b52b6220 100644 --- a/projects/f-examples/connectors/limiting-connections/limiting-connections.component.ts +++ b/projects/f-examples/connectors/limiting-connections/limiting-connections.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ViewChild } from '@angular/core'; import { FCanvasComponent, FCreateConnectionEvent, FFlowModule } from '@foblex/flow'; -import { FCheckboxComponent } from '@foblex/f-docs'; +import { FCheckboxComponent } from '@foblex/m-render'; import { MatIcon } from '@angular/material/icon'; @Component({ diff --git a/projects/f-examples/extensions/zoom/zoom.component.ts b/projects/f-examples/extensions/zoom/zoom.component.ts index 29086467..d63d1b9a 100644 --- a/projects/f-examples/extensions/zoom/zoom.component.ts +++ b/projects/f-examples/extensions/zoom/zoom.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ViewChild } from '@angular/core'; import { FCanvasComponent, FFlowModule, FZoomDirective } from '@foblex/flow'; -import { FCheckboxComponent } from '@foblex/f-docs'; +import { FCheckboxComponent } from '@foblex/m-render'; @Component({ selector: 'zoom', diff --git a/projects/f-examples/layouts/dagre-layout-example/dagre-layout-example.component.ts b/projects/f-examples/layouts/dagre-layout-example/dagre-layout-example.component.ts index 8df2105f..bedd411d 100644 --- a/projects/f-examples/layouts/dagre-layout-example/dagre-layout-example.component.ts +++ b/projects/f-examples/layouts/dagre-layout-example/dagre-layout-example.component.ts @@ -4,7 +4,7 @@ import * as dagre from "dagre"; import { IPoint, PointExtensions } from '@foblex/2d'; import { graphlib } from 'dagre'; import Graph = graphlib.Graph; -import { FCheckboxComponent } from '@foblex/f-docs'; +import { FCheckboxComponent } from '@foblex/m-render'; import { generateGuid } from '@foblex/utils'; interface INodeViewModel { diff --git a/projects/f-examples/layouts/elkjs-layout-example/elkjs-layout-example.component.ts b/projects/f-examples/layouts/elkjs-layout-example/elkjs-layout-example.component.ts index af1e685b..14ff914a 100644 --- a/projects/f-examples/layouts/elkjs-layout-example/elkjs-layout-example.component.ts +++ b/projects/f-examples/layouts/elkjs-layout-example/elkjs-layout-example.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core'; import { EFConnectableSide, FCanvasComponent, FFlowComponent, FFlowModule } from '@foblex/flow'; import { PointExtensions } from '@foblex/2d'; -import { FCheckboxComponent } from '@foblex/f-docs'; +import { FCheckboxComponent } from '@foblex/m-render'; import { generateGuid } from '@foblex/utils'; @Component({ diff --git a/public/markdown/examples/environment.ts b/public/markdown/examples/environment.ts index 842a85c3..9f394c4f 100644 --- a/public/markdown/examples/environment.ts +++ b/public/markdown/examples/environment.ts @@ -1,4 +1,4 @@ -import { IDocsEnvironment, INavigationGroup } from '@foblex/f-docs'; +import { IDocsEnvironment, INavigationGroup } from '@foblex/m-render'; export const EXAMPLES_ENVIRONMENT: IDocsEnvironment = createEnvironment(); diff --git a/public/markdown/guides/environment.ts b/public/markdown/guides/environment.ts index ff987db2..9d7670fb 100644 --- a/public/markdown/guides/environment.ts +++ b/public/markdown/guides/environment.ts @@ -1,4 +1,4 @@ -import { IDocsEnvironment, INavigationGroup } from '@foblex/f-docs'; +import { IDocsEnvironment, INavigationGroup } from '@foblex/m-render'; export const GUIDES_ENVIRONMENT: IDocsEnvironment = createEnvironment(); diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 7916ca3b..467de545 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -4,7 +4,7 @@ import { MatIconRegistry } from '@angular/material/icon'; import { Subscription } from 'rxjs'; import { BrowserService } from '@foblex/platform'; import { takeScreenshot } from './take-screenshot'; -import { CookiePopup, FAnalyticsService, FMetaService, IMetaData } from '@foblex/f-docs'; +import { CookiePopup, FAnalyticsService, FMetaService, IMetaData } from '@foblex/m-render'; import { GUIDES_ENVIRONMENT } from '../../public/markdown/guides/environment'; import { EXAMPLES_ENVIRONMENT } from '../../public/markdown/examples/environment'; diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts index 834112b9..4d23ae33 100644 --- a/src/app/app.routes.ts +++ b/src/app/app.routes.ts @@ -1,7 +1,7 @@ import { Routes } from '@angular/router'; import { GUIDES_ENVIRONMENT } from '../../public/markdown/guides/environment'; import { EXAMPLES_ENVIRONMENT } from '../../public/markdown/examples/environment'; -import { F_ENVIRONMENT } from '@foblex/f-docs'; +import { F_ENVIRONMENT } from '@foblex/m-render'; export const routes: Routes = [ { @@ -13,14 +13,14 @@ export const routes: Routes = [ providers: [ { provide: F_ENVIRONMENT, useValue: GUIDES_ENVIRONMENT } ], - loadChildren: () => import('@foblex/f-docs').then(m => m.F_DOCUMENTATION_ROUTES) + loadChildren: () => import('@foblex/m-render').then(m => m.F_DOCUMENTATION_ROUTES) }, { path: 'examples', providers: [ { provide: F_ENVIRONMENT, useValue: EXAMPLES_ENVIRONMENT } ], - loadChildren: () => import('@foblex/f-docs').then(m => m.F_DOCUMENTATION_ROUTES) + loadChildren: () => import('@foblex/m-render').then(m => m.F_DOCUMENTATION_ROUTES) }, { path: '**', diff --git a/src/app/home/footer/footer.component.html b/src/app/home/footer/footer.component.html index f97c243d..8c0d1808 100644 --- a/src/app/home/footer/footer.component.html +++ b/src/app/home/footer/footer.component.html @@ -1,7 +1,7 @@
-
Created with Foblex MarkEngine
+
Created with Foblex MRender
MIT License | Copyright © 2022 - Present
diff --git a/src/app/home/header/header.component.ts b/src/app/home/header/header.component.ts index c13c21d7..be3afe02 100644 --- a/src/app/home/header/header.component.ts +++ b/src/app/home/header/header.component.ts @@ -2,7 +2,7 @@ import { Component } from '@angular/core'; import { NgOptimizedImage } from '@angular/common'; import { FThemeButtonComponent -} from '@foblex/f-docs'; +} from '@foblex/m-render'; @Component({ selector: 'header[header]', diff --git a/src/styles/styles.scss b/src/styles/styles.scss index 69b90f5c..9e0157d4 100644 --- a/src/styles/styles.scss +++ b/src/styles/styles.scss @@ -3,7 +3,7 @@ @include mat.core(); @import "@angular/material/prebuilt-themes/indigo-pink.css"; -@import "@foblex/f-docs/assets/styles/styles.scss"; +@import "@foblex/m-render/assets/styles/styles.scss"; .f-zoom-in-icon { mask: url('data:image/svg+xml;utf8,'); diff --git a/tsconfig.json b/tsconfig.json index 1722921c..eea8e63d 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,10 +4,6 @@ "outDir": "./dist/out-tsc", "strict": true, "paths": { -// "@foblex/f-docs": [ -// "./projects/f-docs/src/public-api.ts" -//// "./dist/f-docs" -// ], "@foblex/flow": [ "./projects/f-flow/src/public-api.ts" ],