Merge branch 'api' into develop

fivethree-team · Mar 23, 2020 · 99fa10b · 99fa10b
2 parents b140728 + b4493bf
commit 99fa10b
Show file tree

Hide file tree

Showing 282 changed files with 17,615 additions and 15,046 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ export class AppModule {}
 
 ## Usage Instructions
 
-To use the **UI Library** import it into a Page or Component Module. You can either import the full FivethreeCoreModule or one of the feature modules (e.g. FivGalleryModule).
+To use the **UI Library** import one of the feature modules (e.g. FivGalleryModule) into a Page or Component Module.
 
 For example:
 
@@ -66,7 +66,7 @@ import { CommonModule } from '@angular/common';
 import { IonicModule } from '@ionic/angular';
 import { FormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
-import { FivethreeCoreModule } from '@fivethree/core';
+import { FivGalleryModule } from '@fivethree/core';
 
 import { HomePage } from './home.page';
 
@@ -81,7 +81,7 @@ import { HomePage } from './home.page';
         component: HomePage
       }
     ]),
-    FivethreeCoreModule
+    FivGalleryModule
   ],
   declarations: [HomePage]
 })

diff --git a/angular.json b/angular.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "./node_modules/@angular-devkit/core/src/workspace/workspace-schema.json",
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
   "version": 1,
   "defaultProject": "app",
   "newProjectRoot": "projects",
@@ -14,12 +14,11 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "progress": false,
             "outputPath": "www",
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.app.json",
+            "tsConfig": "tsconfig.app.json",
             "assets": [
               {
                 "glob": "**/*",
@@ -37,6 +36,9 @@
               {
                 "input": "src/theme/material-theme.scss"
               },
+              {
+                "input": "src/theme/markdown.scss"
+              },
               {
                 "input": "src/theme/variables.scss"
               },
@@ -107,11 +109,9 @@
           "options": {
             "main": "src/test.ts",
             "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.spec.json",
-            "karmaConfig": "src/karma.conf.js",
-            "styles": [
-              "styles.css"
-            ],
+            "tsConfig": "tsconfig.spec.json",
+            "karmaConfig": "karma.conf.js",
+            "styles": [],
             "scripts": [],
             "assets": [
               {
@@ -132,12 +132,11 @@
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
+              "tsconfig.app.json",
+              "tsconfig.spec.json",
+              "e2e/tsconfig.json"
             ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "exclude": ["**/node_modules/**"]
           }
         },
         "ionic-cordova-build": {
@@ -181,9 +180,7 @@
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": "e2e/tsconfig.e2e.json",
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "exclude": ["**/node_modules/**"]
           }
         }
       }
@@ -221,49 +218,7 @@
               "projects/core/tsconfig.lib.json",
               "projects/core/tsconfig.spec.json"
             ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
-        }
-      }
-    },
-    "google-maps": {
-      "root": "projects/google-maps",
-      "sourceRoot": "projects/google-maps/src",
-      "projectType": "library",
-      "prefix": "fiv",
-      "architect": {
-        "build": {
-          "builder": "@angular-devkit/build-ng-packagr:build",
-          "options": {
-            "tsConfig": "projects/google-maps/tsconfig.lib.json",
-            "project": "projects/google-maps/ng-package.json"
-          },
-          "configurations": {
-            "production": {
-              "project": "projects/google-maps/ng-package.prod.json"
-            }
-          }
-        },
-        "test": {
-          "builder": "@angular-devkit/build-angular:karma",
-          "options": {
-            "main": "projects/google-maps/src/test.ts",
-            "tsConfig": "projects/google-maps/tsconfig.spec.json",
-            "karmaConfig": "projects/google-maps/karma.conf.js"
-          }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "projects/google-maps/tsconfig.lib.json",
-              "projects/google-maps/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "exclude": ["**/node_modules/**"]
           }
         }
       }
@@ -280,4 +235,4 @@
       "styleext": "scss"
     }
   }
-}
+}