Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(travis): fix npm cache with npm5 and node v8.0 #216

Merged
merged 2 commits into from
May 31, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ before_install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh -e /etc/init.d/xvfb start; fi

before_script:
- rm -rf node_modules && npm cache clean
- rm -rf node_modules
- npm install
- npm run build.prod
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then nohup bash -c "npm run serve.prod 2>&1 &"; fi # Protractor CI
Expand Down
7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,17 @@
"angular2-notifications": "^0.4.53",
"core-js": "^2.4.1",
"hammerjs": "^2.0.8",
"igo2": "^0.4.1",
"igo2": "^0.5.0",
"intl": "^1.2.5",
"jspdf": "^1.3.3",
"md2": "0.0.18",
"ng2-translate": "^5.0.0",
"openlayers": "^4.0.1",
"proj4": "^2.4.3",
"rxjs": "^5.1.0",
"snyk": "^1.30.1",
"ts-md5": "^1.2.0",
"zone.js": "^0.8.4",
"snyk": "^1.30.1"
"zone.js": "^0.8.4"
},
"devDependencies": {
"@angular/cli": "^1.0.0",
Expand All @@ -92,7 +92,6 @@
"codelyzer": "~2.0.0",
"compodoc": "0.0.41",
"conventional-changelog-cli": "^1.3.1",
"igo2": "^0.4.3",
"jasmine-core": "~2.5.2",
"jasmine-spec-reporter": "~3.2.0",
"karma": "~1.4.1",
Expand Down
11 changes: 10 additions & 1 deletion proxy.conf.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
{

"/ws/igo_gouvouvert.fcgi": {
"target": "http://geoegl.msp.gouv.qc.ca",
"changeOrigin": true,
"secure": false
},
"/ws/adnInternetV2.fcgi": {
"target": "http://geoegl.msp.gouv.qc.ca",
"changeOrigin": true,
"secure": false
}
}
3 changes: 2 additions & 1 deletion src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { IgoModule, provideSearchSourceOptions,
provideNominatimSearchSource,
provideDataSourceSearchSource,
LanguageLoader, provideLanguageLoader,
provideContextServiceOptions } from 'igo2';
provideContextServiceOptions, RouteService } from 'igo2';

import { PortalModule } from './pages';
import { AppComponent } from './app.component';
Expand Down Expand Up @@ -37,6 +37,7 @@ export function languageLoader(http: Http) {
PortalModule
],
providers: [
RouteService,
provideSearchSourceOptions({
limit: 5
}),
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/portal/portal.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export class PortalComponent implements OnInit, OnDestroy {
this.selectedFeature$$ = this.featureService.selectedFeature$
.subscribe((feature) => this.handleFeatureSelect(feature));

this.contextService.loadContext('_default');
this.contextService.loadDefaultContext();

this.context$$ = this.contextService.context$
.subscribe((context) => this.handleContextChange(context));
Expand Down
4 changes: 4 additions & 0 deletions src/contexts/embacle.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@
"version": "1.3.0"
}
},
"metadata": {
"url": "https://www.donneesquebec.ca/recherche/fr/dataset/historique-publique-d-embacles-repertories-au-msp",
"extern": true
},
"timeFilter": {
"min": "2017-01-01",
"max": "2018-01-01",
Expand Down