Skip to content

Commit

Permalink
Update Angular 8 (#47)
Browse files Browse the repository at this point in the history
  • Loading branch information
jfcere authored Jun 9, 2019
1 parent 01cf698 commit 93bffdb
Show file tree
Hide file tree
Showing 14 changed files with 2,565 additions and 1,903 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2
jobs:
build:
docker:
- image: circleci/node:8-browsers
- image: circleci/node:12-browsers
steps:
# Checkout the code from the branch into the working_directory
- checkout
Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:
command: yarn build:lib --prod
deploy:
docker:
- image: circleci/node:8-browsers
- image: circleci/node:12-browsers
steps:
# Checkout the code from the branch into the working_directory
- checkout
Expand Down
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Editor configuration, see http://editorconfig.org
# Editor configuration, see https://editorconfig.org
root = true

[*]
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
# dependencies
**/node_modules

# profiling files
chrome-profiler-events.json
speed-measure-plugin.json

# IDEs and editors
/.idea
.project
Expand All @@ -24,6 +28,7 @@
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
.history/*

# misc
/.sass-cache
Expand Down
2 changes: 1 addition & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
},
"configurations": {
"production": {
"project": "lib/ng-package.prod.json"
"project": "lib/ng-package.json"
}
}
},
Expand Down
9 changes: 6 additions & 3 deletions demo/browserslist
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
# This file is currently used by autoprefixer to adjust CSS to support the below specified browsers
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries
# For IE 9-11 support, please remove 'not' from the last line of the file and adjust as needed
> 0.5%

# You can see what browsers were selected by your queries by running:
# npx browserslist

> 0.5%
last 2 versions
Firefox ESR
not dead
Expand Down
60 changes: 20 additions & 40 deletions demo/src/polyfills.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/* tslint:disable ordered-imports */

/**
* This file includes polyfills needed by Angular and is loaded before the app.
* You can add your own extra polyfills to this file.
Expand All @@ -20,64 +18,46 @@
* BROWSER POLYFILLS
*/

/** IE9, IE10 and IE11 requires all of the following polyfills. **/
import 'core-js/es6/symbol';
import 'core-js/es6/object';
import 'core-js/es6/function';
import 'core-js/es6/parse-int';
import 'core-js/es6/parse-float';
import 'core-js/es6/number';
import 'core-js/es6/math';
import 'core-js/es6/string';
import 'core-js/es6/date';
import 'core-js/es6/array';
import 'core-js/es6/regexp';
import 'core-js/es6/map';
import 'core-js/es6/weak-map';
import 'core-js/es6/set';

/**
* If the application will be indexed by Google Search, the following is required.
* Googlebot uses a renderer based on Chrome 41.
* https://developers.google.com/search/docs/guides/rendering
**/
import 'core-js/es6/array';

/** IE10 and IE11 requires the following for NgClass support on SVG elements */
// import 'classlist.js'; // Run `npm install --save classlist.js`.

/** IE10 and IE11 requires the following for the Reflect API. */
import 'core-js/es6/reflect';

/**
* Web Animations `@angular/platform-browser/animations`
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
* Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
**/
*/
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.

/**
* By default, zone.js will patch all possible macroTask and DomEvents
* user can disable parts of macroTask/DomEvents patch by setting following flags
* because those flags need to be set before `zone.js` being loaded, and webpack
* will put import in the top of bundle, so user need to create a separate file
* in this directory (for example: zone-flags.ts), and put the following flags
* into that file, and then add the following code before importing zone.js.
* import './zone-flags.ts';
*
* The flags allowed in zone-flags.ts are listed here.
*
* The following flags will work for all browsers.
*
* (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
* (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
* (window as any).__zone_symbol__UNPATCHED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
*
* in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
* with the following flag, it will bypass `zone.js` patch for IE/Edge
*
* (window as any).__Zone_enable_cross_context_check = true;
*
*/

// (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
// (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
// (window as any).__zone_symbol__BLACK_LISTED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames

/*
* in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
* with the following flag, it will bypass `zone.js` patch for IE/Edge
*/
// (window as any).__Zone_enable_cross_context_check = true;

/***************************************************************************************************
* Zone JS is required by default for Angular itself.
*/
import 'zone.js/dist/zone'; // Included with Angular CLI.



/***************************************************************************************************
* APPLICATION IMPORTS
*/
3 changes: 2 additions & 1 deletion lib/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ module.exports = function (config) {
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['Chrome'],
singleRun: false
singleRun: false,
restartOnFileChange: true
});
};
9 changes: 0 additions & 9 deletions lib/ng-package.prod.json

This file was deleted.

9 changes: 4 additions & 5 deletions lib/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-malihu-scrollbar",
"version": "7.0.0",
"version": "8.0.0-beta.0",
"description": "Angular scrollbar customization using Malihu jQuery Custom Scrollbar plugin",
"homepage": "https://github.com/jfcere/ngx-malihu-scrollbar",
"license": "MIT",
Expand All @@ -20,12 +20,11 @@
],
"dependencies": {
"@types/mcustomscrollbar": "^2.8.30",
"jquery": "^3.0.0",
"jquery": "^3.4.1",
"malihu-custom-scrollbar-plugin": "^3.1.5"
},
"peerDependencies": {
"@angular/core": "^6.0.0 || ^7.0.0",
"core-js": "^2.5.4",
"zone.js": "^0.8.26"
"@angular/core": "^7.0.0 || ^8.0.0",
"zone.js": "^0.8.26 || ^0.9.1"
}
}
1 change: 0 additions & 1 deletion lib/test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// This file is required by karma.conf.js and loads recursively all the .spec and framework files

import 'core-js/es7/reflect';
import 'zone.js/dist/zone';
import 'zone.js/dist/zone-testing';

Expand Down
70 changes: 34 additions & 36 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-malihu-scrollbar",
"version": "7.0.0",
"version": "8.0.0-beta.0",
"description": "Angular scrollbar customization using Malihu jQuery Custom Scrollbar plugin",
"homepage": "https://github.com/jfcere/ngx-malihu-scrollbar",
"license": "MIT",
Expand Down Expand Up @@ -36,50 +36,48 @@
"publish:lib": "npm publish ./dist/lib"
},
"dependencies": {
"@angular/animations": "^7.0.0",
"@angular/common": "^7.0.0",
"@angular/compiler": "^7.0.0",
"@angular/core": "^7.0.0",
"@angular/forms": "^7.0.0",
"@angular/http": "^7.0.0",
"@angular/platform-browser": "^7.0.0",
"@angular/platform-browser-dynamic": "^7.0.0",
"@angular/router": "^7.0.0",
"core-js": "^2.5.4",
"@angular/animations": "^8.0.0",
"@angular/common": "^8.0.0",
"@angular/compiler": "^8.0.0",
"@angular/core": "^8.0.0",
"@angular/forms": "^8.0.0",
"@angular/platform-browser": "^8.0.0",
"@angular/platform-browser-dynamic": "^8.0.0",
"@angular/router": "^8.0.0",
"ngx-malihu-scrollbar": "file:./lib",
"rxjs": "^6.0.0",
"zone.js": "^0.8.26"
"rxjs": "^6.5.2",
"zone.js": "^0.9.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.10.0",
"@angular-devkit/build-ng-packagr": "~0.10.0",
"@angular/cli": "~7.0.0",
"@angular/compiler-cli": "^7.0.0",
"@angular/language-service": "^7.0.0",
"@types/jasmine": "~2.8.6",
"@types/jasminewd2": "~2.0.3",
"@types/node": "~8.9.4",
"angular-cli-ghpages": "^0.5.2",
"codelyzer": "~4.5.0",
"@angular-devkit/build-angular": "~0.800.0",
"@angular-devkit/build-ng-packagr": "~0.800.0",
"@angular/cli": "^8.0.0",
"@angular/compiler-cli": "^8.0.0",
"@angular/language-service": "^8.0.0",
"@types/jasmine": "~3.3.13",
"@types/jasminewd2": "~2.0.6",
"@types/node": "~12.0.3",
"angular-cli-ghpages": "^0.5.3",
"codelyzer": "~5.0.1",
"coveralls": "^2.13.3",
"cpx": "^1.5.0",
"jasmine-core": "~2.99.1",
"jasmine-core": "~3.4.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~3.0.0",
"karma": "~4.1.0",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "~2.0.0",
"karma-jasmine": "~1.1.1",
"karma-jasmine-html-reporter": "^0.2.2",
"karma-coverage-istanbul-reporter": "~2.0.5",
"karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "^1.4.2",
"karma-junit-reporter": "^1.2.0",
"linklocal": "^2.8.2",
"ng-packagr": "^3.0.0-rc.2",
"rimraf": "^2.6.2",
"ts-node": "~7.0.0",
"tsickle": ">=0.25.5",
"tslib": "^1.7.1",
"tslint": "~5.11.0",
"ng-packagr": "^5.2.0",
"rimraf": "^2.6.3",
"ts-node": "~8.2.0",
"tsickle": ">=0.35.0",
"tslib": "^1.9.3",
"tslint": "~5.16.0",
"tslint-eslint-rules": "^5.4.0",
"tslint-microsoft-contrib": "^5.2.1",
"typescript": "~3.1.1"
"tslint-microsoft-contrib": "^6.2.0",
"typescript": "~3.4.3"
}
}
3 changes: 2 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"module": "esnext",
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"target": "es5",
"target": "es2015",
"typeRoots": [
"node_modules/@types"
],
Expand Down
6 changes: 3 additions & 3 deletions tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,9 @@
"check-type"
],
"no-output-on-prefix": true,
"use-input-property-decorator": true,
"use-output-property-decorator": true,
"use-host-property-decorator": true,
"no-inputs-metadata-property": true,
"no-outputs-metadata-property": true,
"no-host-metadata-property": true,
"no-input-rename": true,
"no-output-rename": true,
"use-life-cycle-interface": true,
Expand Down
Loading

0 comments on commit 93bffdb

Please sign in to comment.