Skip to content

Commit

Permalink
Merge pull request #70 from tujlaky/master
Browse files Browse the repository at this point in the history
Fix the karma unmask bug
  • Loading branch information
molnarzs authored Dec 12, 2017
2 parents 7349c20 + a0c9e42 commit 732f098
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 12 deletions.
5 changes: 5 additions & 0 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,8 @@ COPY tsconfig.json /app/tsconfig.json

RUN echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > $HOME/.npmrc && \
scripts/install_dependencies

# NOTE: Remove this after a newer version is released to karma (current version is 1.7.1)
# This hack will remove the optional dependencies (see more about the bug: https://github.com/karma-runner/karma/issues/2593)
RUN rm -Rf /app/node_modules/bufferutil && \
rm -Rf /app/node_modules/utf-8-validate
4 changes: 2 additions & 2 deletions src/subrepos/gtrack-common-ngx/.gitrepo
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
[subrepo]
remote = https://github.com/garlictech/gtrack-common-ngx.git
branch = master
commit = f4f80e482fffeaab69e16d1a8a9bf76e0d3fe5fa
parent = 1d165692abc936c3793d3024228c1205390d80dc
commit = d7d200bf629fde996b63c5bb24e7e4e177046c9f
parent = 12586ffea570363d8abf034893c5a432b17e7f22
cmdver = 0.3.1
14 changes: 4 additions & 10 deletions src/subrepos/gtrack-common-ngx/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,7 @@
"dependencies": {
"deepstream-ngx": "file:./subrepos/deepstream-ngx",
"authentication-api-ngx": "file:./subrepos/authentication-api-ngx",
"@ngrx/effects": "^4.1.1",
"@ngrx/router-store": "^4.1.1",
"@ngrx/store": "^4.1.1",
"@turf/turf": "^5.1.3",
"@types/d3": "^4.7.0",
"@types/googlemaps": "^3.26.8",
"@types/leaflet": "^1.0.3",
"@types/lodash": "^4.14.62",
"@types/spin.js": "^2.3.0",
"promise-polyfill": "^6.0.2",
"d3": "^4.12.0",
"google-maps": "^3.2.1",
Expand All @@ -46,8 +38,10 @@
"load-google-maps-api": "1.0.0",
"moment": "^2.18.1",
"spin.js": "^2.3.2",
"lodash": "^4.17.4",
"rxjs": "5.5.0"
"@types/d3": "^4.7.0",
"@types/leaflet": "^1.0.3",
"@types/googlemaps": "^3.26.8",
"@types/spin.js": "^2.3.0"
},
"devDependencies": {}
}

0 comments on commit 732f098

Please sign in to comment.