Verified Commit 5a1b19e8 authored by Raphael Ochsenbein's avatar Raphael Ochsenbein
Browse files

Execute additional migrations

parent 201dff38
Pipeline #1352 canceled with stages
{
"root": true,
"ignorePatterns": [
"projects/**/*"
],
"overrides": [
{
"files": [
"*.ts"
],
"parserOptions": {
"project": [
"tsconfig.json"
],
"createDefaultProgram": true
},
"extends": [
"plugin:@angular-eslint/ng-cli-compat",
"plugin:@angular-eslint/ng-cli-compat--formatting-add-on",
"plugin:@angular-eslint/template/process-inline-templates"
],
"rules": {
"@typescript-eslint/naming-convention": "off",
"prefer-arrow/prefer-arrow-functions": "off",
"@typescript-eslint/member-ordering": "off",
"@typescript-eslint/explicit-member-accessibility": [
"off",
{
"accessibility": "explicit"
}
],
"arrow-parens": [
"off",
"always"
],
"import/order": "off"
}
},
{
"files": [
"*.html"
],
"extends": [
"plugin:@angular-eslint/template/recommended"
],
"rules": {}
}
]
}
...@@ -15,6 +15,7 @@ Supported Angular Versions ...@@ -15,6 +15,7 @@ Supported Angular Versions
| 9.x | 1.0.0 | | 9.x | 1.0.0 |
| 10.x | 2.0.0 | | 10.x | 2.0.0 |
| 11.x | 3.0.0 | | 11.x | 3.0.0 |
| 12.x | 4.0.0 |
### Step 1: Install ### Step 1: Install
......
...@@ -30,14 +30,11 @@ ...@@ -30,14 +30,11 @@
} }
}, },
"lint": { "lint": {
"builder": "@angular-devkit/build-angular:tslint", "builder": "@angular-eslint/builder:lint",
"options": { "options": {
"tsConfig": [ "lintFilePatterns": [
"projects/font-awesome-icons-lib/tsconfig.lib.json", "projects/font-awesome-icons-lib/**/*.ts",
"projects/font-awesome-icons-lib/tsconfig.spec.json" "projects/font-awesome-icons-lib/**/*.html"
],
"exclude": [
"**/node_modules/**"
] ]
} }
} }
...@@ -152,14 +149,11 @@ ...@@ -152,14 +149,11 @@
} }
}, },
"lint": { "lint": {
"builder": "@angular-devkit/build-angular:tslint", "builder": "@angular-eslint/builder:lint",
"options": { "options": {
"tsConfig": [ "lintFilePatterns": [
"projects/example-app/tsconfig.app.json", "projects/example-app//**/*.ts",
"projects/example-app/tsconfig.spec.json" "projects/example-app//**/*.html"
],
"exclude": [
"**/node_modules/**"
] ]
} }
} }
...@@ -183,16 +177,19 @@ ...@@ -183,16 +177,19 @@
} }
}, },
"lint": { "lint": {
"builder": "@angular-devkit/build-angular:tslint", "builder": "@angular-eslint/builder:lint",
"options": { "options": {
"tsConfig": "projects/example-app-e2e/tsconfig.e2e.json", "lintFilePatterns": [
"exclude": [ "projects/example-app-e2e//**/*.ts",
"**/node_modules/**" "projects/example-app-e2e//**/*.html"
] ]
} }
} }
} }
} }
}, },
"defaultProject": "font-awesome-icons-lib" "defaultProject": "font-awesome-icons-lib",
"cli": {
"defaultCollection": "@angular-eslint/schematics"
}
} }
This diff is collapsed.
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"start:app": "ng serve --project example-app --host 0.0.0.0 --aot", "start:app": "ng serve --project example-app --host 0.0.0.0 --aot",
"start:app:ie": "ng serve --project example-app --host 0.0.0.0 --aot --configuration es5", "start:app:ie": "ng serve --project example-app --host 0.0.0.0 --aot --configuration es5",
"build": "npm run build:lib && npm run build:app", "build": "npm run build:lib && npm run build:app",
"build:app": "ng build example-app --prod --progress=false", "build:app": "ng build example-app",
"build:lib": "npm run build:lib:pre && ng build font-awesome-icons-lib --prod && npm run build:lib:post", "build:lib": "npm run build:lib:pre && npm run ng build font-awesome-icons-lib && npm run build:lib:post",
"build:lib:pre": "npm run icons", "build:lib:pre": "npm run icons",
"build:lib:post": "cpx 'projects/font-awesome-icons-lib/src/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": "npm run test:lib && npm run test:example",
...@@ -145,26 +145,35 @@ ...@@ -145,26 +145,35 @@
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "~12.0.0", "@angular-devkit/build-angular": "~12.0.0",
"@angular-eslint/builder": "12.0.0",
"@angular-eslint/eslint-plugin": "12.0.0",
"@angular-eslint/eslint-plugin-template": "12.0.0",
"@angular-eslint/schematics": "12.0.0",
"@angular-eslint/template-parser": "12.0.0",
"@angular/cli": "~12.0.0", "@angular/cli": "~12.0.0",
"@angular/compiler-cli": "~12.0.0", "@angular/compiler-cli": "~12.0.0",
"@angular/language-service": "~12.0.0", "@angular/language-service": "~12.0.0",
"@types/jasmine": "~3.6.0", "@types/jasmine": "~3.6.0",
"@types/jasminewd2": "~2.0.3", "@types/jasminewd2": "~2.0.3",
"@types/node": "^12.11.1", "@types/node": "^12.11.1",
"codelyzer": "^6.0.0", "@typescript-eslint/eslint-plugin": "4.23.0",
"@typescript-eslint/parser": "4.23.0",
"cpx": "^1.5.0", "cpx": "^1.5.0",
"eslint": "^7.26.0",
"eslint-plugin-import": "latest",
"eslint-plugin-jsdoc": "latest",
"eslint-plugin-prefer-arrow": "latest",
"jasmine-core": "~3.6.0", "jasmine-core": "~3.6.0",
"jasmine-spec-reporter": "~5.0.0", "jasmine-spec-reporter": "~5.0.0",
"karma": "~6.3.2", "karma": "^6.3.2",
"karma-chrome-launcher": "~3.1.0", "karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~3.0.2", "karma-coverage": "^2.0.3",
"karma-jasmine": "~4.0.0", "karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0", "karma-jasmine-html-reporter": "^1.5.0",
"ng-packagr": "^12.0.0", "ng-packagr": "^12.0.0",
"protractor": "~7.0.0", "protractor": "~7.0.0",
"rxjs-marbles": "^5.0.2", "rxjs-marbles": "^5.0.2",
"ts-node": "~8.2.0", "ts-node": "~8.2.0",
"tslint": "~6.1.0",
"typescript": "~4.2.4", "typescript": "~4.2.4",
"webpack-bundle-analyzer": "^3.6.1" "webpack-bundle-analyzer": "^3.6.1"
} }
......
{
"extends": "../../.eslintrc.json",
"ignorePatterns": [
"!**/*"
],
"overrides": [
{
"files": [
"*.ts"
],
"parserOptions": {
"project": [
"projects/example-app-e2e/tsconfig.e2e.json"
],
"createDefaultProgram": true
},
"rules": {
"@typescript-eslint/explicit-member-accessibility": [
"off",
{
"accessibility": "explicit"
}
],
"arrow-parens": [
"off",
"always"
],
"import/order": "off"
}
},
{
"files": [
"*.html"
],
"rules": {}
}
]
}
{
"extends": "../../.eslintrc.json",
"ignorePatterns": [
"!**/*"
],
"overrides": [
{
"files": [
"*.ts"
],
"parserOptions": {
"project": [
"projects/example-app/tsconfig.app.json",
"projects/example-app/tsconfig.app.prod.json",
"projects/example-app/tsconfig-es5.app.json",
"projects/example-app/tsconfig.spec.json"
],
"createDefaultProgram": true
},
"rules": {
"@angular-eslint/component-selector": [
"error",
{
"type": "element",
"prefix": "app",
"style": "kebab-case"
}
],
"@angular-eslint/directive-selector": [
"error",
{
"type": "attribute",
"prefix": "app",
"style": "camelCase"
}
],
"@typescript-eslint/explicit-member-accessibility": [
"off",
{
"accessibility": "explicit"
}
],
"arrow-parens": [
"off",
"always"
],
"import/order": "off"
}
},
{
"files": [
"*.html"
],
"rules": {}
}
]
}
...@@ -9,7 +9,7 @@ module.exports = function (config) { ...@@ -9,7 +9,7 @@ module.exports = function (config) {
require('karma-jasmine'), require('karma-jasmine'),
require('karma-chrome-launcher'), require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'), require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'), require('karma-coverage'),
require('@angular-devkit/build-angular/plugins/karma') require('@angular-devkit/build-angular/plugins/karma')
], ],
client: { client: {
...@@ -17,8 +17,11 @@ module.exports = function (config) { ...@@ -17,8 +17,11 @@ module.exports = function (config) {
}, },
coverageIstanbulReporter: { coverageIstanbulReporter: {
dir: require('path').join(__dirname, '../../coverage/example-app'), dir: require('path').join(__dirname, '../../coverage/example-app'),
reports: ['html', 'lcovonly', 'text-summary'], subdir: '.',
fixWebpackSourcePaths: true reporters: [
{ type: 'html' },
{ type: 'text-summary' }
]
}, },
reporters: ['progress', 'kjhtml'], reporters: ['progress', 'kjhtml'],
port: 9876, port: 9876,
......
{ {
"extends": "./tsconfig.app.json", "extends": "./tsconfig.app.json",
"angularCompilerOptions": { "angularCompilerOptions": {
"enableIvy": false "enableIvy": true,
"compilationMode": "partial"
} }
} }
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
"**/*.d.ts" "**/*.d.ts"
], ],
"angularCompilerOptions": { "angularCompilerOptions": {
"enableIvy": false "enableIvy": true,
"compilationMode": "partial"
} }
} }
{
"extends": "../../tslint.json",
"rules": {
"directive-selector": [
true,
"attribute",
"app",
"camelCase"
],
"component-selector": [
true,
"element",
"app",
"kebab-case"
]
}
}
{
"extends": "../../.eslintrc.json",
"ignorePatterns": [
"!**/*"
],
"overrides": [
{
"files": [
"*.ts"
],
"parserOptions": {
"project": [
"projects/font-awesome-icons-lib/tsconfig.lib.json",
"projects/font-awesome-icons-lib/tsconfig.lib.prod.json",
"projects/font-awesome-icons-lib/tsconfig.spec.json"
],
"createDefaultProgram": true
},
"rules": {
"@angular-eslint/component-selector": [
"error",
{
"type": "element",
"prefix": "font-awesome",
"style": "kebab-case"
}
],
"@angular-eslint/directive-selector": [
"error",
{
"type": "attribute",
"prefix": "font-awesome",
"style": "camelCase"
}
],
"@typescript-eslint/explicit-member-accessibility": [
"off",
{
"accessibility": "explicit"
}
],
"arrow-parens": [
"off",
"always"
],
"import/order": "off"
}
},
{
"files": [
"*.html"
],
"rules": {}
}
]
}
...@@ -15,6 +15,7 @@ Supported Angular Versions ...@@ -15,6 +15,7 @@ Supported Angular Versions
| 9.x | 1.0.0 | | 9.x | 1.0.0 |
| 10.x | 2.0.0 | | 10.x | 2.0.0 |
| 11.x | 3.0.0 | | 11.x | 3.0.0 |
| 12.x | 4.0.0 |
### Step 1: Install ### Step 1: Install
......
...@@ -9,7 +9,7 @@ module.exports = function (config) { ...@@ -9,7 +9,7 @@ module.exports = function (config) {
require('karma-jasmine'), require('karma-jasmine'),
require('karma-chrome-launcher'), require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'), require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'), require('karma-coverage'),
require('@angular-devkit/build-angular/plugins/karma') require('@angular-devkit/build-angular/plugins/karma')
], ],
client: { client: {
...@@ -17,8 +17,11 @@ module.exports = function (config) { ...@@ -17,8 +17,11 @@ module.exports = function (config) {
}, },
coverageIstanbulReporter: { coverageIstanbulReporter: {
dir: require('path').join(__dirname, '../../coverage/font-awesome-icons-lib'), dir: require('path').join(__dirname, '../../coverage/font-awesome-icons-lib'),
reports: ['html', 'lcovonly'], subdir: '.',
fixWebpackSourcePaths: true reporters: [
{ type: 'html' },
{ type: 'text-summary' }
]
}, },
reporters: ['progress', 'kjhtml'], reporters: ['progress', 'kjhtml'],
port: 9876, port: 9876,
......
{ {
"name": "@triangular/font-awesome-icons", "name": "@triangular/font-awesome-icons",
"version": "3.0.0", "version": "4.0.0",
"peerDependencies": { "peerDependencies": {
"@angular/common": "^11.0.0", "@angular/common": "^12.0.0",
"@angular/core": "^11.0.0" "@angular/core": "^12.0.0"
}, },
"homepage": "https://font-awesome-icons.akehir.com", "homepage": "https://font-awesome-icons.akehir.com",
"license" : "MIT", "license" : "MIT",
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"extends": "../../tsconfig.json", "extends": "../../tsconfig.json",
"compilerOptions": { "compilerOptions": {
"outDir": "../../out-tsc/lib", "outDir": "../../out-tsc/lib",
"declarationMap": true, "declarationMap": false,
"target": "es2015", "target": "es2015",
"module": "es2015", "module": "es2015",
"moduleResolution": "node", "moduleResolution": "node",
...@@ -22,7 +22,9 @@ ...@@ -22,7 +22,9 @@
"strictMetadataEmit": true, "strictMetadataEmit": true,
"fullTemplateTypeCheck": true, "fullTemplateTypeCheck": true,
"strictInjectionParameters": true, "strictInjectionParameters": true,
"enableResourceInlining": true "enableResourceInlining": true,
"enableIvy": true,
"compilationMode": "partial"
}, },
"exclude": [ "exclude": [
"src/test.ts", "src/test.ts",
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
"declarationMap": false "declarationMap": false
}, },
"angularCompilerOptions": { "angularCompilerOptions": {
"enableIvy": false "enableIvy": true,
"compilationMode": "partial"
} }
} }
\ No newline at end of file
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
"**/*.d.ts" "**/*.d.ts"
], ],
"angularCompilerOptions": { "angularCompilerOptions": {
"enableIvy": false "enableIvy": true,
"compilationMode": "partial"
} }
} }
{
"extends": "../../tslint.json",
"rules": {
"directive-selector": [
true,
"attribute",
"font-awesome",
"camelCase"
],
"component-selector": [
true,
"element",
"font-awesome",
"kebab-case"
]
}
}
Supports Markdown
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