Verified Commit 6ca07cbc authored by Raphael Ochsenbein's avatar Raphael Ochsenbein
Browse files

Update to angular@10

parent 511f47f3
Pipeline #1127 failed with stages
in 2 minutes and 53 seconds
......@@ -45,3 +45,4 @@ Thumbs.db
# Generated Code
projects/font-awesome-icons-lib/src/lib/icons/
projects/font-awesome-icons-lib/src/icons/
......@@ -10,9 +10,10 @@ The live demo can be found at https://font-awesome-icons.akehir.com.
If you just want to use the library, follow the following 4 simple steps. For contributing, or building the library locally, see the section on [building](#building) the library.
Supported Angular Versions
| Angular Version | Password Checker Version |
| Angular Version | Library Version |
| --------------- | ------------------------ |
| 9.x | 1.0.0 |
| 9.x | 1.0.0 |
| 10.x | 2.0.0 |
### Step 1: Install
......
......@@ -66,8 +66,7 @@
"styles": [
"projects/example-app/src/styles.css"
],
"scripts": [],
"es5BrowserSupport": true
"scripts": []
},
"configurations": {
"es5": {
......
This diff is collapsed.
......@@ -10,7 +10,7 @@
"build:app": "ng build example-app --prod --progress=false",
"build:lib": "npm run build:lib:pre && ng build font-awesome-icons-lib --prod && npm run build:lib:post",
"build:lib:pre": "npm run icons",
"build:lib:post": "cpx 'projects/font-awesome-icons-lib/src/lib/icons/**/*.{d.ts,js}' dist/font-awesome-icons/icons",
"build:lib:post": "cpx 'projects/font-awesome-icons-lib/src/icons/**/*.{d.ts,js}' dist/font-awesome-icons/icons",
"test": "npm run test:lib && npm run test:example",
"test:lib": "ng test font-awesome-icons-lib --no-watch --progress=false --code-coverage --browsers ChromeHeadless",
"test:example": "ng test example-app --no-watch --progress=false --code-coverage --browsers ChromeHeadless",
......@@ -22,11 +22,46 @@
},
"private": true,
"svg-to-ts": {
"conversionType": "files",
"modelFileName": "font-awesome-icon.model",
"svgoConfig": {
"plugins": [
{ "cleanupAttrs": true },
{ "removeComments": true },
{ "removeMetadata": true },
{ "removeTitle": true },
{ "removeDesc": true },
{ "removeUselessDefs": true },
{ "removeEditorsNSData": true },
{ "removeEmptyAttrs": true },
{ "removeEmptyText": true },
{ "removeEmptyContainers": true },
{ "removeEmptyContainers": true },
{ "removeViewBox": false },
{ "convertStyleToAttrs": true },
{ "convertColors": true },
{ "convertTransform": true },
{ "removeUnknownsAndDefaults": true },
{ "removeNonInheritableGroupAttrs": true },
{ "removeUselessStrokeAndFill": true },
{ "removeUnusedNS": true },
{ "cleanupIDs": true },
{ "cleanupNumericValues": true },
{ "moveElemsAttrsToGroup": true },
{ "moveGroupAttrsToElems": true },
{ "collapseGroups": true },
{ "mergePaths": true },
{ "convertShapeToPath": true },
{ "sortAttrs": true },
{ "removeDimensions": true },
{ "removeAttrs": {"attrs": "(stroke|fill)"} }
]
},
"srcFiles": [
"./lib/fontawesome/svgs/solid/**/*.svg",
"./lib/fontawesome/svgs/brands/**/*.svg"
],
"outputDirectory": "./projects/font-awesome-icons-lib/src/lib/icons",
"outputDirectory": "./projects/font-awesome-icons-lib/src/icons",
"interfaceName": "FontAwesomeIcon",
"typeName": "fontAwesomeIcon",
"prefix": "fontAwesomeIcon",
......@@ -34,44 +69,44 @@
"compileSources": true
},
"dependencies": {
"@angular/animations": "~9.1.0",
"@angular/common": "~9.1.0",
"@angular/compiler": "~9.1.0",
"@angular/core": "~9.1.0",
"@angular/forms": "~9.1.0",
"@angular/platform-browser": "~9.1.0",
"@angular/platform-browser-dynamic": "~9.1.0",
"@angular/router": "~9.1.0",
"@angular/animations": "~10.0.5",
"@angular/common": "~10.0.5",
"@angular/compiler": "~10.0.5",
"@angular/core": "~10.0.5",
"@angular/forms": "~10.0.5",
"@angular/platform-browser": "~10.0.5",
"@angular/platform-browser-dynamic": "~10.0.5",
"@angular/router": "~10.0.5",
"core-js": "^3.1.3",
"rxjs": "~6.5.4",
"svg-to-ts": "^4.0.3",
"tslib": "^1.10.0",
"svg-to-ts": "^5.0.1",
"tslib": "^2.0.0",
"zone.js": "~0.10.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.901.0",
"@angular-devkit/build-ng-packagr": "~0.901.0",
"@angular/cli": "~9.1.0",
"@angular/compiler-cli": "~9.1.0",
"@angular/language-service": "~9.1.0",
"@angular-devkit/build-angular": "~0.1000.4",
"@angular-devkit/build-ng-packagr": "~0.1000.4",
"@angular/cli": "~10.0.4",
"@angular/compiler-cli": "~10.0.5",
"@angular/language-service": "~10.0.5",
"@types/jasmine": "~3.3.13",
"@types/jasminewd2": "~2.0.3",
"@types/node": "^12.11.1",
"codelyzer": "^5.1.2",
"codelyzer": "^6.0.0",
"cpx": "^1.5.0",
"jasmine-core": "~3.4.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~4.1.0",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "~2.0.5",
"karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "^1.4.2",
"ng-packagr": "^9.0.0",
"protractor": "~5.4.0",
"jasmine-core": "~3.5.0",
"jasmine-spec-reporter": "~5.0.0",
"karma": "~5.0.0",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~3.0.2",
"karma-jasmine": "~3.3.0",
"karma-jasmine-html-reporter": "^1.5.0",
"ng-packagr": "^10.0.0",
"protractor": "~7.0.0",
"rxjs-marbles": "^5.0.2",
"ts-node": "~8.2.0",
"tslint": "~5.17.0",
"typescript": "~3.7.5",
"tslint": "~6.1.0",
"typescript": "~3.9.7",
"webpack-bundle-analyzer": "^3.6.1"
}
}
{
"extends": "../../tsconfig.json",
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"outDir": "../../out-tsc/app",
"module": "commonjs",
......
{
"extends": "../../tsconfig.json",
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"outDir": "../../out-tsc/app",
"types": []
......
{
"extends": "../../tsconfig.json",
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"outDir": "../../out-tsc/spec",
"types": [
......
......@@ -10,9 +10,10 @@ The live demo can be found at https://font-awesome-icons.akehir.com.
If you just want to use the library, follow the following 4 simple steps. For contributing, or building the library locally, see the section on [building](#building) the library.
Supported Angular Versions
| Angular Version | Password Checker Version |
| Angular Version | Library Version |
| --------------- | ------------------------ |
| 9.x | 1.0.0 |
| 9.x | 1.0.0 |
| 10.x | 2.0.0 |
### Step 1: Install
......
{
"name": "@triangular/font-awesome-icons",
"version": "1.0.0",
"version": "2.0.0",
"peerDependencies": {
"@angular/common": "^9.0.0",
"@angular/core": "^9.0.0"
"@angular/common": "^10.0.0",
"@angular/core": "^10.0.0"
},
"homepage": "https://font-awesome-icons.akehir.com",
"license" : "MIT",
......@@ -17,5 +17,8 @@
"author": { "name" : "Raphael Ochsenbein"
, "email" : "raphael@ochsenbe.in"
, "url" : "https://akehir.com/"
},
"dependencies": {
"tslib": "^2.0.0"
}
}
import { Injectable } from '@angular/core';
import { FontAwesomeIcon } from './icons';
import { FontAwesomeIcon } from '../icons';
@Injectable({
providedIn: 'root'
......
{
"extends": "../../tsconfig.json",
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"outDir": "../../out-tsc/lib",
"target": "es2015",
......
{
"extends": "../../tsconfig.json",
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"outDir": "../../out-tsc/spec",
"types": [
......
{
"compileOnSave": false,
"compilerOptions": {
"baseUrl": "./",
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"module": "es2020",
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"importHelpers": true,
"target": "es2015",
"typeRoots": [
"node_modules/@types"
],
"lib": [
"es2018",
"dom"
],
"paths": {
"@triangular/font-awesome-icons": [
"dist/font-awesome-icons"
],
"@triangular/font-awesome-icons/*": [
"dist/font-awesome-icons/*"
]
}
}
}
/*
This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
It is not intended to be used to perform a compilation.
To learn more about this file see: https://angular.io/config/solution-tsconfig.
*/
{
"compileOnSave": false,
"compilerOptions": {
"baseUrl": "./",
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"module": "esnext",
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"importHelpers": true,
"target": "es2015",
"typeRoots": [
"node_modules/@types"
],
"lib": [
"es2018",
"dom"
],
"paths": {
"@triangular/font-awesome-icons": [
"dist/font-awesome-icons"
],
"@triangular/font-awesome-icons/*": [
"dist/font-awesome-icons/*"
]
"files": [],
"references": [
{
"path": "./projects/font-awesome-icons-lib/tsconfig.lib.json"
},
{
"path": "./projects/font-awesome-icons-lib/tsconfig.spec.json"
},
{
"path": "./projects/example-app/tsconfig.app.json"
},
{
"path": "./projects/example-app/tsconfig.spec.json"
},
{
"path": "./projects/example-app-e2e/tsconfig.e2e.json"
}
}
}
]
}
\ No newline at end of file
......@@ -4,15 +4,30 @@
"codelyzer"
],
"rules": {
"align": {
"options": [
"parameters",
"statements"
]
},
"array-type": false,
"arrow-parens": false,
"arrow-return-shorthand": true,
"curly": true,
"deprecation": {
"severity": "warn"
},
"eofline": true,
"import-blacklist": [
true,
"rxjs/Rx"
],
"import-spacing": true,
"indent": {
"options": [
"spaces"
]
},
"interface-name": false,
"max-classes-per-file": false,
"max-line-length": [
......@@ -48,7 +63,6 @@
"no-non-null-assertion": true,
"no-redundant-jsdoc": true,
"no-switch-case-fall-through": true,
"no-use-before-declare": true,
"no-var-requires": false,
"object-literal-key-quotes": [
true,
......@@ -60,6 +74,20 @@
true,
"single"
],
"semicolon": {
"options": [
"always"
]
},
"space-before-function-paren": {
"options": {
"anonymous": "never",
"asyncArrow": "always",
"constructor": "never",
"method": "never",
"named": "never"
}
},
"trailing-comma": false,
"no-output-on-prefix": true,
"no-inputs-metadata-property": true,
......@@ -67,9 +95,44 @@
"no-host-metadata-property": true,
"no-input-rename": true,
"no-output-rename": true,
"typedef-whitespace": {
"options": [
{
"call-signature": "nospace",
"index-signature": "nospace",
"parameter": "nospace",
"property-declaration": "nospace",
"variable-declaration": "nospace"
},
{
"call-signature": "onespace",
"index-signature": "onespace",
"parameter": "onespace",
"property-declaration": "onespace",
"variable-declaration": "onespace"
}
]
},
"use-lifecycle-interface": true,
"use-pipe-transform-interface": true,
"component-class-suffix": true,
"directive-class-suffix": true
}
, "variable-name": {
"options": [
"ban-keywords",
"check-format",
"allow-pascal-case"
]
},
"whitespace": {
"options": [
"check-branch",
"check-decl",
"check-operator",
"check-separator",
"check-type",
"check-typecast"
]
}
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment