Merge branch 'master' of https://github.com/ghiscoding/Angular-Slickgrid

Author: ghiscoding

.circleci/config.yml

@@ -29,10 +29,6 @@ jobs:
       - run:
           name: Website Prod Build (GitHub demo site)
           command: yarn run build:demo
-      # - run:
-      #     name: Run Web Server
-      #     command: yarn run serve:demo
-      #     background: true
       - run:
           name: Start Dev WebServer
           command: yarn start

package.json

@@ -42,34 +42,33 @@
     "bump-version": "npm --no-git-tag-version version",
     "prepare-release": "cross-env npm run changelog && npm run build && npm run doc",
     "release": "standard-version",
-    "sass-build-task:scss-compile:bootstrap": "node-sass src/app/modules/angular-slickgrid/styles/slickgrid-theme-bootstrap.scss -o dist/styles/css --output-style compressed",
-    "postsass-build-task:scss-compile:bootstrap": "postcss --no-map --use autoprefixer --output dist/styles/css/slickgrid-theme-bootstrap.css dist/styles/css/slickgrid-theme-bootstrap.css --output-style compressed",
-    "sass-build-task:scss-compile:material": "node-sass src/app/modules/angular-slickgrid/styles/slickgrid-theme-material.scss -o dist/styles/css --output-style compressed",
-    "postsass-build-task:scss-compile:material": "postcss --no-map --use autoprefixer --output dist/styles/css/slickgrid-theme-material.css dist/styles/css/slickgrid-theme-material.css --output-style compressed",
-    "sass-build-task:scss-compile:material-bare": "node-sass src/app/modules/angular-slickgrid/styles/slickgrid-theme-material.bare.scss -o dist/styles/css --output-style compressed",
-    "postsass-build-task:scss-compile:material-bare": "postcss --no-map --use autoprefixer --output dist/styles/css/slickgrid-theme-material.bare.css dist/styles/css/slickgrid-theme-material.bare.css --output-style compressed",
-    "sass-build-task:scss-compile:material-lite": "node-sass src/app/modules/angular-slickgrid/styles/slickgrid-theme-material.lite.scss -o dist/styles/css --output-style compressed",
-    "postsass-build-task:scss-compile:material-lite": "postcss --no-map --use autoprefixer --output dist/styles/css/slickgrid-theme-material.lite.css dist/styles/css/slickgrid-theme-material.lite.css --output-style compressed",
-    "sass-build-task:scss-compile:salesforce": "node-sass src/app/modules/angular-slickgrid/styles/slickgrid-theme-salesforce.scss -o dist/styles/css --output-style compressed",
-    "postsass-build-task:scss-compile:salesforce": "postcss --no-map --use autoprefixer --output dist/styles/css/slickgrid-theme-salesforce.css dist/styles/css/slickgrid-theme-salesforce.css --output-style compressed",
-    "sass-build-task:scss-compile:salesforce-bare": "node-sass src/app/modules/angular-slickgrid/styles/slickgrid-theme-salesforce.bare.scss -o dist/styles/css --output-style compressed",
-    "postsass-build-task:scss-compile:salesforce-bare": "postcss --no-map --use autoprefixer --output dist/styles/css/slickgrid-theme-salesforce.bare.css dist/styles/css/slickgrid-theme-salesforce.bare.css --output-style compressed",
-    "sass-build-task:scss-compile:salesforce-lite": "node-sass src/app/modules/angular-slickgrid/styles/slickgrid-theme-salesforce.lite.scss -o dist/styles/css --output-style compressed",
-    "postsass-build-task:scss-compile:salesforce-lite": "postcss --no-map --use autoprefixer --output dist/styles/css/slickgrid-theme-salesforce.lite.css dist/styles/css/slickgrid-theme-salesforce.lite.css --output-style compressed",
+    "sass-build-task:scss-compile:bootstrap": "sass src/app/modules/angular-slickgrid/styles/slickgrid-theme-bootstrap.scss dist/styles/css/slickgrid-theme-bootstrap.css --style=compressed",
+    "postsass-build-task:scss-compile:bootstrap": "postcss --no-map --use autoprefixer --output dist/styles/css/slickgrid-theme-bootstrap.css dist/styles/css/slickgrid-theme-bootstrap.css --style=compressed",
+    "sass-build-task:scss-compile:material": "sass src/app/modules/angular-slickgrid/styles/slickgrid-theme-material.scss dist/styles/css/slickgrid-theme-material.css --style=compressed",
+    "postsass-build-task:scss-compile:material": "postcss --no-map --use autoprefixer --output dist/styles/css/slickgrid-theme-material.css dist/styles/css/slickgrid-theme-material.css --style=compressed",
+    "sass-build-task:scss-compile:material-bare": "sass src/app/modules/angular-slickgrid/styles/slickgrid-theme-material.bare.scss dist/styles/css/slickgrid-theme-material.bare.css --style=compressed",
+    "postsass-build-task:scss-compile:material-bare": "postcss --no-map --use autoprefixer --output dist/styles/css/slickgrid-theme-material.bare.css dist/styles/css/slickgrid-theme-material.bare.css --style=compressed",
+    "sass-build-task:scss-compile:material-lite": "sass src/app/modules/angular-slickgrid/styles/slickgrid-theme-material.lite.scss dist/styles/css/slickgrid-theme-material.lite.css --style=compressed",
+    "postsass-build-task:scss-compile:material-lite": "postcss --no-map --use autoprefixer --output dist/styles/css/slickgrid-theme-material.lite.css dist/styles/css/slickgrid-theme-material.lite.css --style=compressed",
+    "sass-build-task:scss-compile:salesforce": "sass src/app/modules/angular-slickgrid/styles/slickgrid-theme-salesforce.scss dist/styles/css/slickgrid-theme-salesforce.css --style=compressed",
+    "postsass-build-task:scss-compile:salesforce": "postcss --no-map --use autoprefixer --output dist/styles/css/slickgrid-theme-salesforce.css dist/styles/css/slickgrid-theme-salesforce.css --style=compressed",
+    "sass-build-task:scss-compile:salesforce-bare": "sass src/app/modules/angular-slickgrid/styles/slickgrid-theme-salesforce.bare.scss dist/styles/css/slickgrid-theme-salesforce.bare.css --style=compressed",
+    "postsass-build-task:scss-compile:salesforce-bare": "postcss --no-map --use autoprefixer --output dist/styles/css/slickgrid-theme-salesforce.bare.css dist/styles/css/slickgrid-theme-salesforce.bare.css --style=compressed",
+    "sass-build-task:scss-compile:salesforce-lite": "sass src/app/modules/angular-slickgrid/styles/slickgrid-theme-salesforce.lite.scss dist/styles/css/slickgrid-theme-salesforce.lite.css --style=compressed",
+    "postsass-build-task:scss-compile:salesforce-lite": "postcss --no-map --use autoprefixer --output dist/styles/css/slickgrid-theme-salesforce.lite.css dist/styles/css/slickgrid-theme-salesforce.lite.css --style=compressed",
     "sass:build": "run-p sass-build-task:scss-compile:*",
     "presass:copy": "cross-env copyfiles -f src/app/modules/angular-slickgrid/styles/*.png dist/styles/css",
     "sass:copy": "cross-env copyfiles -f src/app/modules/angular-slickgrid/styles/*.scss dist/styles/sass",
     "postsass:copy": "cross-env copyfiles -f src/app/modules/angular-slickgrid/styles/*.png dist/styles/sass",
     "presass:watch:bootstrap": "cross-env npm run sass-build-task:scss-compile:bootstrap",
-    "sass:watch:bootstrap": "cross-env npm run sass-build-task:scss-compile:bootstrap -- -watch",
+    "sass:watch:bootstrap": "cross-env npm run sass-build-task:scss-compile:bootstrap -- --watch",
     "presass:watch:material": "cross-env npm run sass-build-task:scss-compile:material",
-    "sass:watch:material": "cross-env npm run sass-build-task:scss-compile:material -- -watch",
+    "sass:watch:material": "cross-env npm run sass-build-task:scss-compile:material -- --watch",
     "presass:watch:salesforce": "cross-env npm run sass-build-task:scss-compile:salesforce",
-    "sass:watch:salesforce": "cross-env npm run sass-build-task:scss-compile:salesforce -- -watch",
+    "sass:watch:salesforce": "cross-env npm run sass-build-task:scss-compile:salesforce -- --watch",
     "sass:watch": "run-p sass:watch:bootstrap sass:watch:material sass:watch:salesforce sass:copy:watch",
     "sass:copy:watch": "nodemon --ext scss --watch src/app/modules/angular-slickgrid/styles/*.scss --exec \"npm run sass:copy\"",
-    "build:demo": "ng build --configuration=production",
-    "serve:demo": "http-server ./docs -p 4300 -a localhost"
+    "build:demo": "ng build --configuration=production"
   },
   "author": "Ghislain B.",
   "repository": {
@@ -153,24 +152,19 @@
     "custom-event-polyfill": "^1.0.7",
     "del": "^6.0.0",
     "del-cli": "^3.0.1",
-    "gulp": "^4.0.2",
-    "gulp-bump": "^3.2.0",
-    "gulp-sass": "^4.1.0",
-    "gulp-yuidoc": "^0.1.2",
-    "http-server": "^0.12.3",
     "jest": "^24.9.0",
     "jest-extended": "^0.11.5",
     "jest-junit": "^6.4.0",
     "jest-preset-angular": "^6.0.1",
     "ng-packagr": "^11.2.4",
     "ngx-bootstrap": "^6.2.0",
-    "node-sass": "5.0.0",
     "npm-run-all": "^4.1.5",
     "postcss": "^8.2.9",
     "postcss-cli": "^8.3.1",
     "require-dir": "^1.2.0",
     "rimraf": "^3.0.2",
     "run-sequence": "^2.2.1",
+    "sass": "^1.32.11",
     "standard-version": "^9.1.1",
     "ts-node": "^9.1.1",
     "tslib": "^2.1.0",