@tmdjr/ngx-editor-js2 20.0.11 → 20.0.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmdjr/ngx-editor-js2",
-  "version": "20.0.11",
+  "version": "20.0.14",
   "schematics": "./schematics/collection.json",
   "peerDependencies": {
     "@angular/animations": "^20.0.4",

package/schematics/ng-add/files/demo/app.ts.template

@@ -3,17 +3,12 @@ import { AsyncPipe } from '@angular/common';
 import { MatCard, MatCardContent } from '@angular/material/card';
 import { NgxEditorJs2Component } from '@tmdjr/ngx-editor-js2';
 
-import { NgxEditorJs2 } from '../services/ngx-editor-js2';
+import { NgxEditorJs2 } from './services/ngx-editor-js2';
+import { Hero } from './components/hero';
 
 @Component({
   selector: 'app-root',
-  imports: [
-    AsyncPipe,
-    MatCard,
-    MatCardContent,
-    NgxEditorJs2Component,
-    Hero,
-  ],
+  imports: [AsyncPipe, MatCard, MatCardContent, NgxEditorJs2Component, Hero],
   template: `
     <main>
       <app-hero></app-hero>
@@ -50,7 +45,6 @@ import { NgxEditorJs2 } from '../services/ngx-editor-js2';
           flex-direction: column;
           align-items: center;
           gap: 3em;
-          margin-top: 56px;
           mat-card {
             width: 100%;
             max-width: 800px;
@@ -61,6 +55,6 @@ import { NgxEditorJs2 } from '../services/ngx-editor-js2';
     `,
   ],
 })
-export class AppComponent {
+export class App {
   ngxEditorJs2 = inject(NgxEditorJs2);
 }

package/schematics/ng-add/files/demo/components/hero.ts.template

@@ -105,7 +105,7 @@ import { of } from 'rxjs';
     `,
   ],
 })
-export class HeroComponent {
+export class Hero {
   ngxEditorJs2 = inject(NgxEditorJs2);
 
   saveValue() {

package/schematics/ng-add/index.js

@@ -31,7 +31,7 @@ const optionalBlocks = {
         package: '@tmdjr/ngx-editor-js2-mermaidjs',
         stylePath: 'dist/ngx-editor-js2-mermaidjs',
         peers: [
-            { package: 'mermaid' },
+            { package: 'mermaid', version: '^11.6.0' },
             { package: '@ctrl/ngx-codemirror' },
             { package: '@types/codemirror' },
             { package: 'codemirror', version: '5.65.9' },
@@ -94,15 +94,13 @@ function ngAdd(options) {
             const appPath = `${sourceRoot}/app`;
             if (tree.exists(appPath)) {
                 context.logger.warn(`⚠️ Deleting existing app folder at ${appPath}`);
-                // Recursively delete everything under src/app
-                tree.getDir(appPath).visit(filePath => {
-                    tree.delete(filePath);
-                });
+                // Ensure complete removal of the app directory and its content
+                tree.delete(appPath);
             }
             rules.push((0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./files/demo'), [
                 (0, schematics_1.applyTemplates)({}),
                 (0, schematics_1.move)(appPath),
-            ])));
+            ]), schematics_1.MergeStrategy.Overwrite));
             context.logger.info(`🚨 Demo files copied to ${appPath}. Existing app was replaced!`);
         }
         context.logger.info('✅ Installation setup complete.');

package/schematics/ng-add/index.ts

@@ -8,7 +8,7 @@ import {
   SchematicContext,
   Tree,
   url,
-  filter,
+  MergeStrategy,
 } from '@angular-devkit/schematics';
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
 import {
@@ -42,7 +42,7 @@ const optionalBlocks: Record<
     package: '@tmdjr/ngx-editor-js2-mermaidjs',
     stylePath: 'dist/ngx-editor-js2-mermaidjs',
     peers: [
-      { package: 'mermaid' },
+      { package: 'mermaid', version: '^11.6.0' },
       { package: '@ctrl/ngx-codemirror' },
       { package: '@types/codemirror' },
       { package: 'codemirror', version: '5.65.9' },
@@ -107,24 +107,26 @@ export function ngAdd(options: any): Rule {
     addCodeMirrorSetup(tree, blocks, context, sourceRoot);
 
     if (options.demo) {
-      const appPath = `${sourceRoot}/app`;
-      if (tree.exists(appPath)) {
-        context.logger.warn(`⚠️ Deleting existing app folder at ${appPath}`);
-        // Recursively delete everything under src/app
-        tree.getDir(appPath).visit(filePath => {
-          tree.delete(filePath);
-        });
-      }
-      rules.push(
-        mergeWith(
-          apply(url('./files/demo'), [
-            applyTemplates({}),
-            move(appPath),
-          ])
-        )
-      );
-      context.logger.info(`🚨 Demo files copied to ${appPath}. Existing app was replaced!`);
-    }
+  const appPath = `${sourceRoot}/app`;
+
+  if (tree.exists(appPath)) {
+    context.logger.warn(`⚠️ Deleting existing app folder at ${appPath}`);
+    // Ensure complete removal of the app directory and its content
+    tree.delete(appPath);
+  }
+
+  rules.push(
+    mergeWith(
+      apply(url('./files/demo'), [
+        applyTemplates({}),
+        move(appPath),
+      ]),
+      MergeStrategy.Overwrite, // Explicitly overwrite files
+    )
+  );
+
+  context.logger.info(`🚨 Demo files copied to ${appPath}. Existing app was replaced!`);
+}
 
     context.logger.info('✅ Installation setup complete.');
     return chain(rules);