fix: resolve ivy compatibility issues

sibiraj-s · Apr 23, 2020 · 30b513c · 30b513c
1 parent cbadf8a
commit 30b513c
Show file tree

Hide file tree

Showing 103 changed files with 356 additions and 420 deletions.
diff --git a/.compodocrc.json b/.compodocrc.json
@@ -3,13 +3,14 @@
   "name": "NgxEditor",
   "output": "./docs/",
   "tsconfig": "./tsconfig.docs.json",
-  "customFavicon": "./src/favicon.ico",
-  "includes": "./extras",
+  "customFavicon": "./demo/src/favicon.ico",
+  "includes": "./wiki",
   "includesName": "Wiki",
   "disableLifeCycleHooks": true,
   "disablePrivate": true,
   "disableProtected": true,
   "disableInternal": true,
   "disableCoverage": true,
-  "hideGenerator": true
+  "hideGenerator": true,
+  "assetsFolder": "sketch"
 }
diff --git a/.gitignore b/.gitignore
@@ -46,5 +46,4 @@ testem.log
 Thumbs.db
 
 # Output directories
-build/
-docs/
+/docs
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 <p align="center">
   <a href="https://github.com/sibiraj-s/ngx-editor">
-   <img src="https://raw.githubusercontent.com/sibiraj-s/ngx-editor/master/src/assets/icons/ngx-editor.png" alt="ngxEditor">
+   <img src="./sketch/ngx-editor.png" alt="ngxEditor">
   </a>
 </p>
 <p align="center">A Simple WYSIWYG Editor for Angular 6 Applications.</p>

diff --git a/angular.json b/angular.json
@@ -4,40 +4,80 @@
   "newProjectRoot": "projects",
   "projects": {
     "ngx-editor": {
+      "projectType": "library",
+      "root": "",
+      "sourceRoot": "src",
+      "prefix": "lib",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-ng-packagr:build",
+          "options": {
+            "tsConfig": "src/tsconfig.lib.json",
+            "project": "src/ng-package.json"
+          },
+          "configurations": {
+            "production": {
+              "tsConfig": "src/tsconfig.lib.prod.json"
+            }
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/test.ts",
+            "tsConfig": "src/tsconfig.spec.json",
+            "karmaConfig": "src/karma.conf.js"
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "src/tsconfig.lib.json",
+              "src/tsconfig.spec.json"
+            ],
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    },
+    "demo": {
       "projectType": "application",
       "schematics": {
         "@schematics/angular:component": {
           "style": "scss"
         }
       },
-      "root": "",
-      "sourceRoot": "src",
-      "prefix": "",
+      "root": "demo",
+      "sourceRoot": "demo/src",
+      "prefix": "app",
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "outputPath": "dist/ngx-editor",
-            "index": "src/index.html",
-            "main": "src/main.ts",
-            "polyfills": "src/polyfills.ts",
-            "tsConfig": "tsconfig.app.json",
+            "outputPath": "dist/demo",
+            "index": "demo/src/index.html",
+            "main": "demo/src/main.ts",
+            "polyfills": "demo/src/polyfills.ts",
+            "tsConfig": "demo/tsconfig.app.json",
             "aot": true,
             "assets": [
-              "src/favicon.ico",
-              "src/assets"
+              "demo/src/favicon.ico",
+              "demo/src/assets"
             ],
             "styles": [
-              "src/styles.scss"
+              "demo/src/styles.scss"
             ],
             "scripts": []
           },
           "configurations": {
             "production": {
               "fileReplacements": [
                 {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.prod.ts"
+                  "replace": "demo/src/environments/environment.ts",
+                  "with": "demo/src/environments/environment.prod.ts"
                 }
               ],
               "optimization": true,
@@ -66,33 +106,33 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "ngx-editor:build"
+            "browserTarget": "demo:build"
           },
           "configurations": {
             "production": {
-              "browserTarget": "ngx-editor:build:production"
+              "browserTarget": "demo:build:production"
             }
           }
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "ngx-editor:build"
+            "browserTarget": "demo:build"
           }
         },
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "src/test.ts",
-            "polyfills": "src/polyfills.ts",
-            "tsConfig": "tsconfig.spec.json",
-            "karmaConfig": "karma.conf.js",
+            "main": "demo/src/test.ts",
+            "polyfills": "demo/src/polyfills.ts",
+            "tsConfig": "demo/tsconfig.spec.json",
+            "karmaConfig": "demo/karma.conf.js",
             "assets": [
-              "src/favicon.ico",
-              "src/assets"
+              "demo/src/favicon.ico",
+              "demo/src/assets"
             ],
             "styles": [
-              "src/styles.scss"
+              "demo/src/styles.scss"
             ],
             "scripts": []
           }
@@ -101,9 +141,9 @@
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": [
-              "tsconfig.app.json",
-              "tsconfig.spec.json",
-              "e2e/tsconfig.json"
+              "demo/tsconfig.app.json",
+              "demo/tsconfig.spec.json",
+              "demo/e2e/tsconfig.json"
             ],
             "exclude": [
               "**/node_modules/**"
@@ -113,16 +153,17 @@
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
-            "protractorConfig": "e2e/protractor.conf.js",
-            "devServerTarget": "ngx-editor:serve"
+            "protractorConfig": "demo/e2e/protractor.conf.js",
+            "devServerTarget": "demo:serve"
           },
           "configurations": {
             "production": {
-              "devServerTarget": "ngx-editor:serve:production"
+              "devServerTarget": "demo:serve:production"
             }
           }
         }
       }
-    }},
-  "defaultProject": "ngx-editor"
+    }
+  },
+  "defaultProject": "demo"
 }
diff --git a/browserslist → demo/browserslist b/browserslist → demo/browserslist
diff --git a/e2e/protractor.conf.js → demo/e2e/protractor.conf.js b/e2e/protractor.conf.js → demo/e2e/protractor.conf.js
diff --git a/e2e/src/app.e2e-spec.ts → demo/e2e/src/app.e2e-spec.ts b/e2e/src/app.e2e-spec.ts → demo/e2e/src/app.e2e-spec.ts
diff --git a/e2e/src/app.po.ts → demo/e2e/src/app.po.ts b/e2e/src/app.po.ts → demo/e2e/src/app.po.ts
diff --git a/e2e/tsconfig.json → demo/e2e/tsconfig.json b/e2e/tsconfig.json → demo/e2e/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../out-tsc/e2e",
     "module": "commonjs",

diff --git a/karma.conf.js → demo/karma.conf.js b/karma.conf.js → demo/karma.conf.js
@@ -16,7 +16,7 @@ module.exports = function (config) {
       clearContext: false // leave Jasmine Spec Runner output visible in browser
     },
     coverageIstanbulReporter: {
-      dir: require('path').join(__dirname, './coverage/ngx-editor'),
+      dir: require('path').join(__dirname, '../coverage/demo'),
       reports: ['html', 'lcovonly', 'text-summary'],
       fixWebpackSourcePaths: true
     },

diff --git a/src/app/app.component.html → demo/src/app/app.component.html b/src/app/app.component.html → demo/src/app/app.component.html
@@ -2,7 +2,7 @@
   <div class="content">
     <div class="display">
       <div class="logo">
-        <img src="../assets/icons/ngx-editor.svg" />
+        <img src="../assets/ngx-editor.svg" />
         <div class="subtitle">A Simple WYSIWYG Editor for Angular Applications.</div>
       </div>
       <div class="badges" *ngIf="isProdMode">

diff --git a/src/app/app.component.scss → demo/src/app/app.component.scss b/src/app/app.component.scss → demo/src/app/app.component.scss
diff --git a/src/app/app.component.spec.ts → demo/src/app/app.component.spec.ts b/src/app/app.component.spec.ts → demo/src/app/app.component.spec.ts
@@ -1,9 +1,9 @@
 import { TestBed, async, ComponentFixture } from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
+import { NgxEditorModule } from 'ngx-editor';
 
 import { AppComponent } from './app.component';
-import { NgxEditorModule } from './ngx-editor/ngx-editor.module';
 import { DebugElement } from '@angular/core';
 
 describe('AppComponent', () => {

diff --git a/src/app/app.component.ts → demo/src/app/app.component.ts b/src/app/app.component.ts → demo/src/app/app.component.ts
diff --git a/src/app/app.module.ts → demo/src/app/app.module.ts b/src/app/app.module.ts → demo/src/app/app.module.ts
@@ -3,7 +3,7 @@ import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 
 import { AppComponent } from './app.component';
-import { NgxEditorModule } from './ngx-editor/ngx-editor.module';
+import { NgxEditorModule } from '../../../src/lib/ngx-editor.module';
 
 @NgModule({
   declarations: [

diff --git a/src/assets/icons/ngx-editor.svg → demo/src/assets/ngx-editor.svg b/src/assets/icons/ngx-editor.svg → demo/src/assets/ngx-editor.svg
diff --git a/src/environments/environment.prod.ts → demo/src/environments/environment.prod.ts b/src/environments/environment.prod.ts → demo/src/environments/environment.prod.ts
diff --git a/src/environments/environment.ts → demo/src/environments/environment.ts b/src/environments/environment.ts → demo/src/environments/environment.ts
diff --git a/src/favicon.ico → demo/src/favicon.ico b/src/favicon.ico → demo/src/favicon.ico
diff --git a/src/index.html → demo/src/index.html b/src/index.html → demo/src/index.html
diff --git a/src/main.ts → demo/src/main.ts b/src/main.ts → demo/src/main.ts
diff --git a/src/polyfills.ts → demo/src/polyfills.ts b/src/polyfills.ts → demo/src/polyfills.ts
diff --git a/src/styles.scss → demo/src/styles.scss b/src/styles.scss → demo/src/styles.scss
diff --git a/demo/src/test.ts b/demo/src/test.ts
@@ -0,0 +1,25 @@
+// This file is required by karma.conf.js and loads recursively all the .spec and framework files
+
+import 'zone.js/dist/zone-testing';
+import { getTestBed } from '@angular/core/testing';
+import {
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting
+} from '@angular/platform-browser-dynamic/testing';
+
+declare const require: {
+  context(path: string, deep?: boolean, filter?: RegExp): {
+    keys(): string[];
+    <T>(id: string): T;
+  };
+};
+
+// First, initialize the Angular testing environment.
+getTestBed().initTestEnvironment(
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting()
+);
+// Then we find all the tests.
+const context = require.context('./', true, /\.spec\.ts$/);
+// And load the modules.
+context.keys().map(context);
diff --git a/tsconfig.app.json → demo/tsconfig.app.json b/tsconfig.app.json → demo/tsconfig.app.json
@@ -1,7 +1,7 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "../tsconfig.json",
   "compilerOptions": {
-    "outDir": "./out-tsc/app",
+    "outDir": "../out-tsc/app",
     "types": []
   },
   "files": [

diff --git a/tsconfig.spec.json → demo/tsconfig.spec.json b/tsconfig.spec.json → demo/tsconfig.spec.json
@@ -1,7 +1,7 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "../tsconfig.json",
   "compilerOptions": {
-    "outDir": "./out-tsc/spec",
+    "outDir": "../out-tsc/spec",
     "types": [
       "jasmine",
       "node"

diff --git a/demo/tslint.json b/demo/tslint.json
@@ -0,0 +1,17 @@
+{
+  "extends": "../tslint.json",
+  "rules": {
+    "directive-selector": [
+      true,
+      "attribute",
+      "app",
+      "camelCase"
+    ],
+    "component-selector": [
+      true,
+      "element",
+      "app",
+      "kebab-case"
+    ]
+  }
+}
diff --git a/package-lock.json b/package-lock.json