Skip to content

Commit

Permalink
change build command and refactor scripts
Browse files Browse the repository at this point in the history
* Refactors npm scripts.

* Changes build command to prods

* Fixes production build

* Upgrades angular-cli due to:
angular/angular-cli#7113

* Adds bugs and repo to package.json
  • Loading branch information
harunurhan committed Oct 25, 2017
1 parent d739a6a commit cfb1d56
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 9 deletions.
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,17 @@ addons:
- google-chrome
packages:
- google-chrome-stable

before_script:
- npm run lint
- npm run build

before_install:
- npm install buffer-shims
- export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start

before_deploy: npm run build
deploy:
provider: npm
Expand Down
16 changes: 11 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
"license": "MIT",
"scripts": {
"ng": "ng",
"start": "npm run build && npm run serve",
"serve": "ng serve",
"build": "npm run lint && ng build",
"test": "npm run build && ng test --watch=false",
"start": "ng serve",
"build": "ng build --prod --output-hashing none",
"test": "ng test --watch=false",
"test-dev": "ng test",
"lint": "tslint \"src/**/*.ts\"",
"e2e": "ng e2e",
Expand Down Expand Up @@ -38,7 +37,7 @@
"zone.js": "^0.8.4"
},
"devDependencies": {
"@angular/cli": "1.0.0",
"@angular/cli": "1.2.6",
"@angular/compiler-cli": "^4.0.0",
"@types/diff": "^3.2.0",
"@types/jasmine": "2.5.38",
Expand All @@ -57,5 +56,12 @@
"ts-node": "~2.0.0",
"tslint": "~4.5.0",
"typescript": "~2.2.0"
},
"repository": {
"type": "git",
"url": "https://github.com/inspirehep/ng2-multi-record-editor.git"
},
"bugs": {
"url": "https://github.com/inspirehep/ng2-multi-record-editor/issues"
}
}
4 changes: 2 additions & 2 deletions src/app/conditions/conditions.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<div class="form-group">
<input type="text" name="value" [(ngModel)]="condition.value" class="form-control input-sm" placeholder="condition value">
</div>
<div *ngIf="canDelete" class="form-group">
<i class="fa fa-times" (click)="deleteElement()" aria-hidden="true"></i>
<div class="form-group">
<i class="fa fa-times" aria-hidden="true"></i>
</div>
</form>
1 change: 1 addition & 0 deletions src/app/conditions/conditions.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { AppGlobalsService } from '../shared/services';
})
export class ConditionsComponent {
@Input() condition: Condition;

constructor(private appGlobalsService: AppGlobalsService) { }

get matchTypes(): string[] {
Expand Down
4 changes: 2 additions & 2 deletions src/app/multi-editor/multi-editor.component.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<me-editor-toolbar-container (onSearchRecordClick)="searchRecords(query)" (onCollectionChange)="onCollectionChange($event)"></me-editor-toolbar-container>
<me-editor-toolbar-container (onCollectionChange)="onCollectionChange($event)"></me-editor-toolbar-container>
<div class="container me-container">
<me-actions></me-actions>
<div class="me-bar">
Expand All @@ -20,7 +20,7 @@ <h3>Sorry no results found</h3>
<div class="preview-border">
<button class="btn-success button" (click)="onPreviewClick()">Preview</button>
</div>
<div class="row ">
<div class="row">
<div class="col-md-2">
<span>
<input class="results-checkbox" type="checkbox" [checked]="checkedRecords.length === 0" (change)="selectAll()"> Select all results
Expand Down

0 comments on commit cfb1d56

Please sign in to comment.