Merge pull request #25 from FalconSoft/dev

Dev

Author: ppaska

.eslintrc.json

@@ -0,0 +1,51 @@
+{
+  "root": true,
+  "ignorePatterns": [
+    "projects/**/*"
+  ],
+  "overrides": [
+    {
+      "files": [
+        "*.ts"
+      ],
+      "parserOptions": {
+        "project": [
+          "tsconfig.json",
+          "e2e/tsconfig.e2e.json"
+        ],
+        "createDefaultProgram": true
+      },
+      "extends": [
+        "plugin:@angular-eslint/ng-cli-compat",
+        "plugin:@angular-eslint/ng-cli-compat--formatting-add-on",
+        "plugin:@angular-eslint/template/process-inline-templates"
+      ],
+      "rules": {
+        "@typescript-eslint/explicit-member-accessibility": [
+          "off",
+          {
+            "accessibility": "explicit"
+          }
+        ],
+        "arrow-parens": [
+          "off",
+          "always"
+        ],
+        "import/order": "off",
+        "@typescript-eslint/member-ordering": "off",
+        "prefer-arrow/prefer-arrow-functions": "off",
+        "@angular-eslint/component-selector": "off",
+        "@angular-eslint/directive-selector": "off"
+      }
+    },
+    {
+      "files": [
+        "*.html"
+      ],
+      "extends": [
+        "plugin:@angular-eslint/template/recommended"
+      ],
+      "rules": {}
+    }
+  ]
+}

.gitignore

@@ -10,6 +10,8 @@
 # dependencies
 /node_modules
 
+package-lock.json
+
 # profiling files
 chrome-profiler-events.json
 speed-measure-plugin.json
@@ -32,6 +34,7 @@ speed-measure-plugin.json
 .history/*
 
 # misc
+/.angular/cache
 /.sass-cache
 /connect.lock
 /coverage
@@ -44,5 +47,3 @@ testem.log
 # System Files
 .DS_Store
 Thumbs.db
-
-package-lock.json

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npm run lint

README.md

@@ -7,7 +7,6 @@ Any web content can be dynamically rendered from JSON or XML based configuration
 We have three libraries to offer
   - [**@ngx-dynamic-components/core**](https://github.com/FalconSoft/ngx-dynamic-components/tree/master/projects/core) - a core dynamic rendering engine with no dependencies to any external library. And contains all basic HTML components.
   - [**@ngx-dynamic-components/bootstrap**](https://github.com/FalconSoft/ngx-dynamic-components/tree/master/projects/bootstrap) - a set of bootstrap based components. This project has dependencies to the [ngx-bootstrap](https://valor-software.com/ngx-bootstrap)
-  - [**@ngx-dynamic-components/material**](https://github.com/FalconSoft/ngx-dynamic-components/tree/master/projects/material) - a set of [Angular Material Components](https://material.angular.io/)
 
 ## Getting started
 
@@ -41,7 +40,7 @@ import { ComponentEvent } from '@ngx-dynamic-components/core';
   selector: 'app-root',
   template: `
   <ngx-dynamic-component
-    [uiModel]='uiModel'
+    [xmlUIModel]='xmlUIModel'
     [dataModel]='dataModel'
     (eventHandlers)="eventHandlers($event)">
   </ngx-dynamic-component>
@@ -80,7 +79,7 @@ import { ComponentEvent } from '@ngx-dynamic-components/core';
   encapsulation: ViewEncapsulation.None
 })
 export class AppComponent {
-  uiModel = `
+  xmlUIModel = `
   <div class="container">
     <form onSubmit="save(data)">
       <label>First Name</label>

angular.json

@@ -26,7 +26,11 @@
             "assets": [
               "src/favicon.ico",
               "src/assets",
-              { "glob": "README.md", "input": "./", "output": "/" }
+              {
+                "glob": "README.md",
+                "input": "./",
+                "output": "/"
+              }
             ],
             "styles": [
               "node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
@@ -37,22 +41,33 @@
             "scripts": [
               {
                 "input": "node_modules/ace-builds/src-noconflict/ace.js",
-                "bundleName": "ace-editor"
+                "bundleName": "ace-editor",
+                "inject": true
               },
               {
-                "input": "node_modules/ace-builds/src-noconflict/mode-json.js"
+                "input": "node_modules/ace-builds/src-noconflict/mode-json.js",
+                "inject": true
               },
               {
-                "input": "node_modules/ace-builds/src-noconflict/mode-xml.js"
+                "input": "node_modules/ace-builds/src-noconflict/mode-xml.js",
+                "inject": true
               },
               {
-                "input": "node_modules/jspython-interpreter/dist/assets/mode-jspython.js"
+                "input": "node_modules/jspython-interpreter/dist/assets/mode-jspython.js",
+                "inject": true
               },
               {
-                "input": "node_modules/ace-builds/src-noconflict/ext-language_tools.js"
+                "input": "node_modules/ace-builds/src-noconflict/ext-language_tools.js",
+                "inject": true
               },
-              "node_modules/marked/lib/marked.js"
-            ]
+              "node_modules/marked/marked.min.js"
+            ],
+            "vendorChunk": true,
+            "extractLicenses": false,
+            "buildOptimizer": false,
+            "sourceMap": true,
+            "optimization": false,
+            "namedChunks": true
           },
           "configurations": {
             "production": {
@@ -65,9 +80,7 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
-              "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
               "buildOptimizer": true,
@@ -82,8 +95,15 @@
                   "maximumWarning": "6kb"
                 }
               ]
+            },
+            "development": {
+              "tsConfig": "./tsconfig.dev.json"
+            },
+            "fix": {
+              "tsConfig": "./tsconfig.fix.json"
             }
-          }
+          },
+          "defaultConfiguration": ""
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
@@ -93,6 +113,12 @@
           "configurations": {
             "production": {
               "browserTarget": "ngx-dynamic-components:build:production"
+            },
+            "development": {
+              "browserTarget": "ngx-dynamic-components:build:development"
+            },
+            "fix": {
+              "browserTarget": "ngx-dynamic-components:build:fix"
             }
           }
         },
@@ -121,14 +147,11 @@
           }
         },
         "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
+          "builder": "@angular-eslint/builder:lint",
           "options": {
-            "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
+            "lintFilePatterns": [
+              "src/**/*.ts",
+              "src/**/*.html"
             ]
           }
         }
@@ -152,11 +175,11 @@
           }
         },
         "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
+          "builder": "@angular-eslint/builder:lint",
           "options": {
-            "tsConfig": "e2e/tsconfig.e2e.json",
-            "exclude": [
-              "**/node_modules/**"
+            "lintFilePatterns": [
+              "e2e//**/*.ts",
+              "e2e//**/*.html"
             ]
           }
         }
@@ -169,7 +192,7 @@
       "prefix": "dc",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-ng-packagr:build",
+          "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
             "tsConfig": "projects/core/tsconfig.lib.json",
             "project": "projects/core/ng-package.json"
@@ -189,54 +212,11 @@
           }
         },
         "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
+          "builder": "@angular-eslint/builder:lint",
           "options": {
-            "tsConfig": [
-              "projects/core/tsconfig.lib.json",
-              "projects/core/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
-        }
-      }
-    },
-    "material": {
-      "root": "projects/material",
-      "sourceRoot": "projects/material/src",
-      "projectType": "library",
-      "prefix": "dc",
-      "architect": {
-        "build": {
-          "builder": "@angular-devkit/build-ng-packagr:build",
-          "options": {
-            "tsConfig": "projects/material/tsconfig.lib.json",
-            "project": "projects/material/ng-package.json"
-          },
-          "configurations": {
-            "production": {
-              "tsConfig": "projects/material/tsconfig.lib.prod.json"
-            }
-          }
-        },
-        "test": {
-          "builder": "@angular-devkit/build-angular:karma",
-          "options": {
-            "main": "projects/material/src/test.ts",
-            "tsConfig": "projects/material/tsconfig.spec.json",
-            "karmaConfig": "projects/material/karma.conf.js"
-          }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "projects/material/tsconfig.lib.json",
-              "projects/material/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
+            "lintFilePatterns": [
+              "projects/core/**/*.ts",
+              "projects/core/**/*.html"
             ]
           }
         }
@@ -249,7 +229,7 @@
       "prefix": "dc",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-ng-packagr:build",
+          "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
             "tsConfig": "projects/tools/tsconfig.lib.json",
             "project": "projects/tools/ng-package.json"
@@ -270,14 +250,11 @@
           }
         },
         "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
+          "builder": "@angular-eslint/builder:lint",
           "options": {
-            "tsConfig": [
-              "projects/tools/tsconfig.lib.json",
-              "projects/tools/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
+            "lintFilePatterns": [
+              "projects/tools/**/*.ts",
+              "projects/tools/**/*.html"
             ]
           }
         }
@@ -290,7 +267,7 @@
       "prefix": "dc",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-ng-packagr:build",
+          "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
             "tsConfig": "projects/bootstrap/tsconfig.lib.json",
             "project": "projects/bootstrap/ng-package.json"
@@ -310,14 +287,11 @@
           }
         },
         "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
+          "builder": "@angular-eslint/builder:lint",
           "options": {
-            "tsConfig": [
-              "projects/bootstrap/tsconfig.lib.json",
-              "projects/bootstrap/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
+            "lintFilePatterns": [
+              "projects/bootstrap/**/*.ts",
+              "projects/bootstrap/**/*.html"
             ]
           }
         }

browserslist

@@ -8,4 +8,5 @@
 last 2 versions
 Firefox ESR
 not dead
-not IE 9-11
+not IE 9-11
+not safari 15.2-15.3