FortAwesome
/
angular-fontawesome
mirror of https://github.com/FortAwesome/angular-fontawesome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Angular 16 

Fixes #401
This commit is contained in:
Arjen Brandenburgh 2023-05-04 19:57:34 +02:00 committed by GitHub
parent f91fa20046
commit 8820f412ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 2778 additions and 2020 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.eslintrc.json
View File

@ -1,6 +1,8 @@
{
"root": true,
"ignorePatterns": ["projects/**/*"],
"parser": "@typescript-eslint/parser",
"plugins": ["@typescript-eslint"],
"overrides": [
{
"files": ["*.ts"],

4
.github/workflows/check.yml vendored
View File

@ -8,7 +8,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: '16'
node-version: '18'
- uses: actions/cache@v2
with:
path: .yarn/cache
@ -31,7 +31,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: '16'
node-version: '18'
- uses: actions/cache@v2
with:
path: .yarn/cache

2
DEVELOPER.md
View File

@ -5,7 +5,7 @@ Thanks for taking the time to consider contributing to the project. You will fin
## Prerequisites
* [git](https://git-scm.com/downloads)
* [node 16+](https://nodejs.org/en/download/)
* [node 18+](https://nodejs.org/en/download/)
## Setting up the local environment

8
angular.json
View File

@ -161,5 +161,13 @@
},
"cli": {
"analytics": false
},
"schematics": {
"@angular-eslint/schematics:application": {
"setParserOptionsProject": true
},
"@angular-eslint/schematics:library": {
"setParserOptionsProject": true
}
}
}

50
package.json
View File

@ -25,30 +25,30 @@
},
"homepage": "https://github.com/FortAwesome/angular-fontawesome",
"devDependencies": {
"@angular-devkit/build-angular": "^15.0.0",
"@angular-devkit/core": "^15.0.0",
"@angular-devkit/schematics": "^15.0.0",
"@angular-eslint/builder": "^15.0.0-alpha.0",
"@angular-eslint/eslint-plugin": "^15.0.0-alpha.0",
"@angular-eslint/eslint-plugin-template": "^15.0.0-alpha.0",
"@angular-eslint/schematics": "15.0.0-alpha.0",
"@angular-eslint/template-parser": "^15.0.0-alpha.0",
"@angular/cli": "^15.0.0",
"@angular/common": "^15.0.0",
"@angular/compiler": "^15.0.0",
"@angular/compiler-cli": "^15.0.0",
"@angular/core": "^15.0.0",
"@angular/language-service": "^15.0.0",
"@angular/platform-browser": "^15.0.0",
"@angular/platform-browser-dynamic": "^15.0.0",
"@angular-devkit/build-angular": "^16.0.0",
"@angular-devkit/core": "^16.0.0",
"@angular-devkit/schematics": "^16.0.0",
"@angular-eslint/builder": "^16.0.1",
"@angular-eslint/eslint-plugin": "^16.0.1",
"@angular-eslint/eslint-plugin-template": "^16.0.1",
"@angular-eslint/schematics": "16.0.1",
"@angular-eslint/template-parser": "^16.0.1",
"@angular/cli": "^16.0.0",
"@angular/common": "^16.0.0",
"@angular/compiler": "^16.0.0",
"@angular/compiler-cli": "^16.0.0",
"@angular/core": "^16.0.0",
"@angular/language-service": "^16.0.0",
"@angular/platform-browser": "^16.0.0",
"@angular/platform-browser-dynamic": "^16.0.0",
"@fortawesome/fontawesome-svg-core": "^6.2.0",
"@fortawesome/free-regular-svg-icons": "^6.2.0",
"@fortawesome/free-solid-svg-icons": "^6.2.0",
"@types/jasmine": "~4.3.0",
"@types/node": "~16.18.3",
"@typescript-eslint/eslint-plugin": "5.42.1",
"@typescript-eslint/parser": "5.42.1",
"eslint": "^8.27.0",
"@types/node": "~18.16.3",
"@typescript-eslint/eslint-plugin": "^5.59.2",
"@typescript-eslint/parser": "^5.59.2",
"eslint": "^8.39.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-jsdoc": "^39.6.2",
@ -60,13 +60,13 @@
"karma-coverage": "~2.2.0",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "^2.0.0",
"ng-packagr": "^15.0.0",
"ng-packagr": "^16.0.0",
"prettier": "2.7.1",
"protractor": "~7.0.0",
"rxjs": "^7.5.7",
"ts-node": "~10.9.1",
"typescript": "~4.8.4",
"zone.js": "~0.11.5"
"typescript": "~5.0.4",
"zone.js": "~0.13.0"
},
"dependencies": {
"tslib": "^2.4.1"
@ -80,9 +80,9 @@
"svg"
],
"peerDependencies": {
"@angular/core": "^15.0.0",
"@angular/core": "^16.0.0",
"@fortawesome/fontawesome-svg-core": "~1.2.27 || ~1.3.0-beta2 || ^6.1.0"
},
"schematics": "./schematics/collection.json",
"packageManager": "yarn@3.2.4"
"packageManager": "yarn@3.5.1"
}

70
projects/schematics/src/ng-add/index.spec.ts
View File

@ -10,7 +10,7 @@ describe('ng-add', () => {
it('adds v6 dependencies to package.json', async () => {
const { runner, appTree } = await setup();
const tree = await runner.runSchematicAsync<Schema>('ng-add', { project: 'test-app' }, appTree).toPromise();
const tree = await runner.runSchematic<Schema>('ng-add', { project: 'test-app' }, appTree);
const packageJson = JSON.parse(tree.readContent('package.json'));
expect(packageJson.dependencies).toBeDefined();
@ -25,9 +25,7 @@ describe('ng-add', () => {
it('adds v5 dependencies to package.json', async () => {
const { runner, appTree } = await setup();
const tree = await runner
.runSchematicAsync<Schema>('ng-add', { project: 'test-app', version: '5' }, appTree)
.toPromise();
const tree = await runner.runSchematic<Schema>('ng-add', { project: 'test-app', version: '5' }, appTree);
const packageJson = JSON.parse(tree.readContent('package.json'));
expect(packageJson.dependencies).toBeDefined();
@ -42,7 +40,7 @@ describe('ng-add', () => {
it('adds FontAwesomeModule import to the AppModule', async () => {
const { runner, appTree } = await setup();
const tree = await runner.runSchematicAsync<Schema>('ng-add', { project: 'test-app' }, appTree).toPromise();
const tree = await runner.runSchematic<Schema>('ng-add', { project: 'test-app' }, appTree);
const contents = tree.readContent('src/app/app.module.ts');
@ -52,7 +50,7 @@ describe('ng-add', () => {
it('installs @fortawesome/free-solid-svg-icons package by default', async () => {
const { runner, appTree } = await setup();
const tree = await runner.runSchematicAsync<Schema>('ng-add', { project: 'test-app' }, appTree).toPromise();
const tree = await runner.runSchematic<Schema>('ng-add', { project: 'test-app' }, appTree);
const packageJson = JSON.parse(tree.readContent('package.json'));
expect(packageJson.dependencies).toBeDefined();
@ -64,17 +62,14 @@ describe('ng-add', () => {
it('allows to install several @fortawesome/*-svg-icons packages', async () => {
const { runner, appTree } = await setup();
const tree = await runner
.runSchematicAsync<Schema>(
'ng-add',
{
project: 'test-app',
iconPackages: ['free-solid', 'free-brands', 'free-regular'],
},
appTree,
)
.toPromise();
const tree = await runner.runSchematic<Schema>(
'ng-add',
{
project: 'test-app',
iconPackages: ['free-solid', 'free-brands', 'free-regular'],
},
appTree,
);
const packageJson = JSON.parse(tree.readContent('package.json'));
expect(packageJson.dependencies).toBeDefined();
@ -87,17 +82,14 @@ describe('ng-add', () => {
it('allows to install no icon packages', async () => {
const { runner, appTree } = await setup();
const tree = await runner
.runSchematicAsync<Schema>(
'ng-add',
{
project: 'test-app',
iconPackages: [],
},
appTree,
)
.toPromise();
const tree = await runner.runSchematic<Schema>(
'ng-add',
{
project: 'test-app',
iconPackages: [],
},
appTree,
);
const packageJson = JSON.parse(tree.readContent('package.json'));
expect(packageJson.dependencies).toBeDefined();
@ -109,18 +101,16 @@ describe('ng-add', () => {
const setup = async () => {
const runner = new SchematicTestRunner('schematics', collectionPath);
const appTree = await runner
.runExternalSchematicAsync(
'@schematics/angular',
'ng-new',
{
name: 'test-app',
version: '9.0.0-rc.6',
directory: '.',
},
Tree.empty(),
)
.toPromise();
const appTree = await runner.runExternalSchematic(
'@schematics/angular',
'ng-new',
{
name: 'test-app',
version: '9.0.0-rc.6',
directory: '.',
},
Tree.empty(),
);
return { runner, appTree };
};

4662
yarn.lock
View File

File diff suppressed because it is too large Load Diff