Merge pull request #243 from SQ-UI/develop

Develop
SQ-UI · Jul 14, 2019 · 7eaf97b · 7eaf97b
2 parents 54efc10 + d8bc530
commit 7eaf97b
Show file tree

Hide file tree

Showing 56 changed files with 3,284 additions and 11,856 deletions.
diff --git a/README.md b/README.md
@@ -77,7 +77,9 @@ Need a grid? [We've got you covered](https://sq-ui.github.io/sq-grid/)!
   "src/styles.css",
   "./node_modules/@sq-ui/ng-sq-common/sq-ui-theme.scss",
   "./node_modules/@sq-ui/ng-sq-ui/styles/form-elements.scss",
-  "./node_modules/font-awesome/scss/font-awesome.scss"
+  "./node_modules/@fortawesome/fontawesome-free/css/fontawesome.min.css",
+  "./node_modules/@fortawesome/fontawesome-free/css/solid.min.css",
+  "./node_modules/@fortawesome/fontawesome-free/css/regular.min.css",
 ],
 ```
 
@@ -104,20 +106,19 @@ font-awesome and immutable.js (both will be installed with ng-sq-ui)
 ```
 git clone git@github.com:SQ-UI/ng-sq-ui.git
 npm i
-npm run build:libs
-ng serve [--open]
+npm start
 ```
 
 -- or --
 
 ```
 git clone git@github.com:SQ-UI/ng-sq-ui.git
 yarn install
-yarn build:libs
-ng serve [--open]
+npm start
 ```
 
-Every time you make changes to any of the libraries, you should run `npm run build-libs` to compile the latest versions of them before serving the main app.
+The libraries are watched automatically when you run `npm start`:
+* The TypeScript compiler for this project is configured to look for the libraries under `dist/` and if `dist/` does not exist, it refers to the libraries' source code. That is why you should run `npm start` instead of just `ng serve --open` - `npm start` removes `dist/` (if it exists) and then runs `ng serve --open`. This prepares the compiler to listen for changes under the `projects/` directory.
 
 ## Support
 

diff --git a/angular.json b/angular.json
@@ -22,9 +22,9 @@
               "src/assets"
             ],
             "styles": [
-              "dist/ng-sq-common/sq-ui-theme.scss",
-              "dist/ng-sq-ui/styles/form-elements.scss",
-              "node_modules/font-awesome/css/font-awesome.css",
+              "node_modules/@fortawesome/fontawesome-free/css/fontawesome.min.css",
+              "node_modules/@fortawesome/fontawesome-free/css/solid.min.css",
+              "node_modules/@fortawesome/fontawesome-free/css/regular.min.css",
               "src/styles.scss"
             ],
             "scripts": []
@@ -136,11 +136,6 @@
           "options": {
             "tsConfig": "projects/ng-sq-ui/tsconfig.lib.json",
             "project": "projects/ng-sq-ui/ng-package.json"
-          },
-          "configurations": {
-            "production": {
-              "project": "projects/ng-sq-ui/ng-package.prod.json"
-            }
           }
         },
         "test": {
@@ -177,11 +172,6 @@
           "options": {
             "tsConfig": "projects/ng-datetime-picker/tsconfig.lib.json",
             "project": "projects/ng-datetime-picker/ng-package.json"
-          },
-          "configurations": {
-            "production": {
-              "project": "projects/ng-datetime-picker/ng-package.prod.json"
-            }
           }
         },
         "test": {
@@ -218,11 +208,6 @@
           "options": {
             "tsConfig": "projects/ng-datatable/tsconfig.lib.json",
             "project": "projects/ng-datatable/ng-package.json"
-          },
-          "configurations": {
-            "production": {
-              "project": "projects/ng-datatable/ng-package.prod.json"
-            }
           }
         },
         "test": {
@@ -259,11 +244,6 @@
           "options": {
             "tsConfig": "projects/ng-sq-common/tsconfig.lib.json",
             "project": "projects/ng-sq-common/ng-package.json"
-          },
-          "configurations": {
-            "production": {
-              "project": "projects/ng-sq-common/ng-package.prod.json"
-            }
           }
         },
         "test": {
@@ -300,11 +280,6 @@
           "options": {
             "tsConfig": "projects/ng-modal/tsconfig.lib.json",
             "project": "projects/ng-modal/ng-package.json"
-          },
-          "configurations": {
-            "production": {
-              "project": "projects/ng-modal/ng-package.prod.json"
-            }
           }
         },
         "test": {

diff --git a/src/browserslist → browserslist b/src/browserslist → browserslist
diff --git a/docs/installation.md b/docs/installation.md
@@ -42,7 +42,9 @@ export class AppModule {}
 "styles": [
   "src/styles.css",
   "./node_modules/@sq-ui/ng-sq-ui/sq-ui-theme.scss",
-  "./node_modules/font-awesome/scss/font-awesome.scss"
+  "./node_modules/@fortawesome/fontawesome-free/css/fontawesome.min.css",
+  "./node_modules/@fortawesome/fontawesome-free/css/solid.min.css",
+  "./node_modules/@fortawesome/fontawesome-free/css/regular.min.css",
 ],
 ```
 

diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md
@@ -18,6 +18,8 @@ Two possible reasons:
   "src/styles.css",
   "./node_modules/@sq-ui/ng-sq-common/sq-ui-theme.scss",
   "./node_modules/@sq-ui/ng-sq-ui/styles/form-elements.scss",
-  "./node_modules/font-awesome/scss/font-awesome.scss"
+  "./node_modules/@fortawesome/fontawesome-free/css/fontawesome.min.css",
+  "./node_modules/@fortawesome/fontawesome-free/css/solid.min.css",
+  "./node_modules/@fortawesome/fontawesome-free/css/regular.min.css",
 ],
 ```