Skip to content

Commit 678a2e0

Browse files
authored
Merge pull request #1 from ABenassi87/release-0.5.0
Release 0.5.0
2 parents 547c050 + 391a201 commit 678a2e0

33 files changed

+1460
-277
lines changed

.prettierrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"printWidth": 140,
3+
"tabWidth": 2,
4+
"singleQuote": true
5+
}

.travis.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
language: node_js
2+
dist: trusty
3+
sudo: required
4+
node_js:
5+
- '8'
6+
before_install:
7+
- npm install -g @angular/cli @angular/compiler-cli typescript
8+
install: npm install
9+
branches:
10+
only:
11+
- master
12+
- staging
13+
- dev
14+
- release-0.5.0
15+
after_script:
16+
- chmod +x publish-gh-pages.sh && ./publish-gh-pages.sh
17+
addons:
18+
chrome: stable
19+
deploy:
20+
provider: heroku
21+
api_key:
22+
secure: $HEROKU_AUTH_TOKEN
23+
app: ngx-text-diff
24+
on:
25+
repo: ABenassi87/ngx-text-diff
26+
branch: release-0.5.0

Procfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
web: node server.js

README.md

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,7 @@
1-
# NgxTextDiffApp
1+
# NgxTextDiff
22

3-
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 6.2.4.
3+
[![Build Status](https://travis-ci.org/ABenassi87/ngx-text-diff.svg?branch=release-0.5.0)](https://travis-ci.org/ABenassi87/ngx-text-diff)
44

5-
## Development server
5+
## Demo Page
66

7-
Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
8-
9-
## Code scaffolding
10-
11-
Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
12-
13-
## Build
14-
15-
Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.
16-
17-
## Running unit tests
18-
19-
Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
20-
21-
## Running end-to-end tests
22-
23-
Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
24-
25-
## Further help
26-
27-
To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
7+
[Demo](https://ngx-text-diff.herokuapp.com/home)

angular.json

Lines changed: 12 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,9 @@
1818
"main": "src/main.ts",
1919
"polyfills": "src/polyfills.ts",
2020
"tsConfig": "src/tsconfig.app.json",
21-
"assets": [
22-
"src/favicon.ico",
23-
"src/assets"
24-
],
25-
"styles": [
26-
"src/styles.css"
27-
],
28-
"scripts": []
21+
"assets": ["src/favicon.ico", "src/assets"],
22+
"styles": ["src/styles.css", "node_modules/bootstrap/dist/css/bootstrap.min.css", "node_modules/codemirror/lib/codemirror.css"],
23+
"scripts": ["node_modules/codemirror/lib/codemirror.js"]
2924
},
3025
"configurations": {
3126
"production": {
@@ -71,26 +66,16 @@
7166
"polyfills": "src/polyfills.ts",
7267
"tsConfig": "src/tsconfig.spec.json",
7368
"karmaConfig": "src/karma.conf.js",
74-
"styles": [
75-
"src/styles.css"
76-
],
77-
"scripts": [],
78-
"assets": [
79-
"src/favicon.ico",
80-
"src/assets"
81-
]
69+
"styles": ["src/styles.css"],
70+
"scripts": ["node_modules/codemirror/lib/codemirror.js"],
71+
"assets": ["src/favicon.ico", "src/assets"]
8272
}
8373
},
8474
"lint": {
8575
"builder": "@angular-devkit/build-angular:tslint",
8676
"options": {
87-
"tsConfig": [
88-
"src/tsconfig.app.json",
89-
"src/tsconfig.spec.json"
90-
],
91-
"exclude": [
92-
"**/node_modules/**"
93-
]
77+
"tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"],
78+
"exclude": ["**/node_modules/**"]
9479
}
9580
}
9681
}
@@ -115,9 +100,7 @@
115100
"builder": "@angular-devkit/build-angular:tslint",
116101
"options": {
117102
"tsConfig": "e2e/tsconfig.e2e.json",
118-
"exclude": [
119-
"**/node_modules/**"
120-
]
103+
"exclude": ["**/node_modules/**"]
121104
}
122105
}
123106
}
@@ -146,17 +129,12 @@
146129
"lint": {
147130
"builder": "@angular-devkit/build-angular:tslint",
148131
"options": {
149-
"tsConfig": [
150-
"projects/ngx-text-diff/tsconfig.lib.json",
151-
"projects/ngx-text-diff/tsconfig.spec.json"
152-
],
153-
"exclude": [
154-
"**/node_modules/**"
155-
]
132+
"tsConfig": ["projects/ngx-text-diff/tsconfig.lib.json", "projects/ngx-text-diff/tsconfig.spec.json"],
133+
"exclude": ["**/node_modules/**"]
156134
}
157135
}
158136
}
159137
}
160138
},
161139
"defaultProject": "ngx-text-diff-app"
162-
}
140+
}

0 commit comments

Comments
 (0)