Skip to content

Commit

Permalink
refactor: support ng7 (#131)
Browse files Browse the repository at this point in the history
* refactor: support ng7

* fix(module:toast): fix 0 is missing

- close #113

* fix(module:bar): fix trigger select when router changed

- close #120

* docs: tips

- #122

* fix(module:textarea): support more than 2 quantity

- close #125

* chore: fix, close #115

* fix(module:rating): fix a11y, close #129

* chore: remove explicit preserveWhitespaces setting

* fix(module:*): fix missing disabled in reactive forms, close #83

* docs: close #111
  • Loading branch information
cipchk authored Dec 4, 2018
1 parent 47aa15c commit b992ad7
Show file tree
Hide file tree
Showing 84 changed files with 754 additions and 952 deletions.
59 changes: 50 additions & 9 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,11 +1,52 @@
# http://editorconfig.org
[*]
charset=utf-8
end_of_line=lf
trim_trailing_whitespace=true
insert_final_newline=false
indent_style=space
indent_size=4

root = true
[{*.ng,*.sht,*.html,*.shtm,*.shtml,*.htm}]
indent_style=space
indent_size=2

[{.babelrc,.stylelintrc,.eslintrc,jest.config,*.json,*.jsb3,*.jsb2,*.bowerrc}]
indent_style=space
indent_size=2

[*.css]
indent_style=space
indent_size=2

[{*.applejs,*.js}]
indent_style=space
indent_size=2

[{*.ats,*.ts}]
indent_style=space
indent_size=2

[*.tsx]
indent_style=space
indent_size=2

[*.js]
indent_style=space
indent_size=2

[*.js.map]
indent_style=space
indent_size=2

[*.less]
indent_style=space
indent_size=2

[{.analysis_options,*.yml,*.yaml}]
indent_style=space
indent_size=2

[tslint.json]
indent_style=space
indent_size=2

[*]
charset = utf-8
indent_style = space
indent_size = 2
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
/node_modules
npm-debug.log
package-lock.json
publish
publish-es5
publish-es2015
yarn.lock

# misc
Expand All @@ -17,7 +14,6 @@ src/app/routes/components/examples.ts
src/app/routes/docs/meta.ts
.tmp
__gen_components/
publish-es2015/
dist/
publish/

Expand Down
Empty file removed .prettierignore
Empty file.
5 changes: 0 additions & 5 deletions .prettierrc

This file was deleted.

34 changes: 0 additions & 34 deletions .stylelintrc

This file was deleted.

21 changes: 11 additions & 10 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
// Place your settings in this file to overwrite default and user settings.
{
"javascript.implicitProjectConfig.checkJs": true,
"files.watcherExclude": {
"**/.git/objects/**": true,
"**/.git/subtree-cache/**": true,
"**/node_modules/*/**": true,
"**/dist/*/**": true,
"**/coverage/*/**": true,
"**/tools/*/**": true
}
}
"javascript.implicitProjectConfig.checkJs": true,
"files.watcherExclude": {
"**/.git/objects/**": true,
"**/.git/subtree-cache/**": true,
"**/node_modules/*/**": true,
"**/dist/*/**": true,
"**/coverage/*/**": true,
"**/tools/*/**": true
},
"tslint.autoFixOnSave": true
}
19 changes: 16 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,23 @@
# ngx-weui

[![NPM version](https://img.shields.io/npm/v/ngx-weui.svg)](https://www.npmjs.com/package/ngx-weui) [![NPM version](https://img.shields.io/npm/v/ngx-weui/next.svg)](https://www.npmjs.com/package/ngx-weui) [![npm downloads](https://img.shields.io/npm/dm/ngx-weui.svg)](https://npmjs.org/ngx-weui) [![Angular 2 Style Guide](https://mgechev.github.io/angular2-style-guide/images/badge.svg)](https://angular.io/styleguide) [![Build Status](https://travis-ci.org/cipchk/ngx-weui.svg?branch=master)](https://travis-ci.org/cipchk/ngx-weui) [![codecov](https://codecov.io/gh/cipchk/ngx-weui/branch/master/graph/badge.svg)](https://codecov.io/gh/cipchk/ngx-weui)
[![prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://prettier.io/)
<h1 align="center">
ngx-weui
</h1>

<div align="center">

[WeUI](https://github.com/weui/weui) Components build with [Angular](https://angular.io/).

[![Build Status](https://img.shields.io/travis/cipchk/ngx-weui/master.svg?style=flat-square)](https://travis-ci.org/cipchk/ngx-weui)
[![NPM version](https://img.shields.io/npm/v/ngx-weui.svg?style=flat-square)](https://www.npmjs.com/package/ngx-weui)
[![npm downloads](https://img.shields.io/npm/dm/ngx-weui.svg?style=flat-square)](https://npmjs.org/ngx-weui)
[![Codecov](https://img.shields.io/codecov/c/github/cipchk/ngx-weui.svg?style=flat-square)](https://codecov.io/gh/cipchk/ngx-weui)
[![GitHub license](https://img.shields.io/github/license/mashape/apistatus.svg?style=flat-square)](https://github.com/cipchk/ngx-weui/blob/master/LICENSE)
[![prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://prettier.io/)

</div>

[![](https://cdn-images-1.medium.com/max/3840/1*DzVxlbQups8aAEhFRuZ6dQ.png)](https://cipchk.github.io/ngx-weui/)

## Table of Contents

1. [Usage & Demo](#usage--demo)
Expand Down
76 changes: 28 additions & 48 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": 1,
"newProjectRoot": "projects",
"projects": {
"ngx-weui": {
"ngx-weui-doc": {
"root": "",
"sourceRoot": "src",
"projectType": "application",
Expand All @@ -23,6 +23,7 @@
"styles": [
"node_modules/font-awesome/css/font-awesome.css",
"node_modules/swiper/dist/css/swiper.css",
"node_modules/ngx-toastr/toastr.css",
"src/styles.less"
],
"scripts": [
Expand All @@ -41,51 +42,24 @@
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
]
"fileReplacements": [{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}]
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "ngx-weui:build"
"browserTarget": "ngx-weui-doc:build"
},
"configurations": {
"production": {
"browserTarget": "ngx-weui:build:production"
"browserTarget": "ngx-weui-doc:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "ngx-weui:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "components/test.ts",
"karmaConfig": "./karma.conf.js",
"polyfills": "src/polyfills.ts",
"tsConfig": "components/tsconfig.spec.json",
"scripts": [
"node_modules/swiper/dist/js/swiper.js",
"node_modules/g2-mobile/index.js"
],
"styles": [
],
"assets": [
"src/assets",
"src/favicon.ico"
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
Expand All @@ -95,29 +69,35 @@
}
}
},
"ngx-weui-e2e": {
"root": "",
"sourceRoot": "",
"projectType": "application",
"ngx-weui-lib": {
"root": "components",
"projectType": "library",
"prefix": "",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"options": {
"protractorConfig": "./protractor.conf.js",
"devServerTarget": "ngx-weui:serve"
"tsConfig": "components/tsconfig.lib.json",
"project": "components/ng-package.json"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"tsConfig": [],
"exclude": []
"main": "components/test.ts",
"karmaConfig": "components/karma.conf.js",
"polyfills": "components/polyfills.ts",
"tsConfig": "components/tsconfig.spec.json",
"scripts": [
"node_modules/swiper/dist/js/swiper.js",
"node_modules/g2-mobile/index.js"
]
}
}
}
}
},
"defaultProject": "ngx-weui",
"defaultProject": "ngx-weui-doc",
"schematics": {
"@schematics/angular:component": {
"prefix": "",
Expand All @@ -127,4 +107,4 @@
"prefix": ""
}
}
}
}
89 changes: 0 additions & 89 deletions build.sh

This file was deleted.

Loading

0 comments on commit b992ad7

Please sign in to comment.