-
Notifications
You must be signed in to change notification settings - Fork 581
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into feat/gh-action-ci
- Loading branch information
Showing
977 changed files
with
10,960 additions
and
3,102 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,7 @@ | |
| "scripts": { | ||
| "bootstrap": "lerna bootstrap", | ||
| "clean": "lerna clean", | ||
| "bootstrap:china": "lerna bootstrap --registry=https://registry.npm.taobao.org", | ||
| "bootstrap:china": "lerna bootstrap --registry=https://registry.npmmirror.com", | ||
| "rn:generate": "lerna run --scope @ant-design/icons-react-native generate", | ||
| "icons:generate": "lerna run --scope @ant-design/icons-svg generate", | ||
| "icons:build": "lerna run --scope @ant-design/icons-svg build", | ||
|
|
@@ -20,5 +20,6 @@ | |
| "devDependencies": { | ||
| "lerna": "^3.4.0" | ||
| }, | ||
| "license": "MIT" | ||
| "license": "MIT", | ||
| "repository": "[email protected]:ant-design/ant-design-icons.git" | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| { | ||
| "root": true, | ||
| "ignorePatterns": [ | ||
| "projects/**/*" | ||
| ], | ||
| "overrides": [ | ||
| { | ||
| "files": [ | ||
| "*.ts" | ||
| ], | ||
| "parserOptions": { | ||
| "project": [ | ||
| "tsconfig.json" | ||
| ], | ||
| "createDefaultProgram": true | ||
| }, | ||
| "extends": [ | ||
| "plugin:@angular-eslint/recommended", | ||
| "plugin:@angular-eslint/template/process-inline-templates" | ||
| ], | ||
| "rules": { | ||
| "@angular-eslint/component-selector": [ | ||
| "error", | ||
| { | ||
| "prefix": "app", | ||
| "style": "kebab-case", | ||
| "type": "element" | ||
| } | ||
| ], | ||
| "@angular-eslint/directive-selector": [ | ||
| "error", | ||
| { | ||
| "prefix": "app", | ||
| "style": "camelCase", | ||
| "type": "attribute" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "files": [ | ||
| "*.html" | ||
| ], | ||
| "extends": [ | ||
| "plugin:@angular-eslint/template/recommended" | ||
| ], | ||
| "rules": {} | ||
| } | ||
| ] | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ./src/README.md |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
4 changes: 2 additions & 2 deletions
4
packages/icons-angular/examples/app/app-interceptor.module.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| import { Injectable } from '@angular/core'; | ||
| import { HttpInterceptor, HttpRequest, HttpHandler, HttpEvent } from '@angular/common/http'; | ||
| import { Observable } from 'rxjs'; | ||
| import { mapTo } from 'rxjs/operators'; | ||
| import { map } from 'rxjs/operators'; | ||
|
|
||
| @Injectable() | ||
| export class AppInterceptor implements HttpInterceptor { | ||
| intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> { | ||
| return next.handle(req).pipe(mapTo(null)); | ||
| return next.handle(req).pipe(map(() => null)); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| i { | ||
| span { | ||
| font-size: 36px; | ||
| color: #1890ff; | ||
| margin: 0 12px; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| <h1>@ant-design/icons-angular</h1> | ||
| <h1>@ant-design/icons-angular</h1> | ||
|
|
||
| <h2>Ant Design Icons</h2> | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1,25 @@ | ||
| import { BrowserModule } from '@angular/platform-browser'; | ||
| import { CommonModule } from '@angular/common'; | ||
| import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http'; | ||
| import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; | ||
| import { NgModule } from '@angular/core'; | ||
| import { FormsModule } from '@angular/forms'; | ||
|
|
||
| import { AppInterceptor } from './app-interceptor.module'; | ||
| import { IconModule } from '@ant-design/icons-angular'; | ||
| import { AppComponent } from './app.component'; | ||
|
|
||
| @NgModule({ | ||
| declarations: [ | ||
| AppComponent | ||
| ], | ||
| imports: [ | ||
| CommonModule, | ||
| FormsModule, | ||
| BrowserModule, | ||
| IconModule, | ||
| HttpClientModule | ||
| ], | ||
| providers: [ | ||
| { | ||
| provide : HTTP_INTERCEPTORS, | ||
| useClass: AppInterceptor, | ||
| multi : true | ||
| }, | ||
| ], | ||
| bootstrap: [ AppComponent ] | ||
| }) | ||
| @NgModule({ declarations: [ | ||
| AppComponent | ||
| ], | ||
| bootstrap: [AppComponent], imports: [CommonModule, | ||
| FormsModule, | ||
| BrowserModule, | ||
| IconModule], providers: [ | ||
| { | ||
| provide: HTTP_INTERCEPTORS, | ||
| useClass: AppInterceptor, | ||
| multi: true | ||
| }, | ||
| provideHttpClient(withInterceptorsFromDi()), | ||
| ] }) | ||
| export class AppModule { } |
Oops, something went wrong.