From d45efac373d9e8ef8a083aba7cd6f5d61fa5f304 Mon Sep 17 00:00:00 2001 From: CloudNiner Date: Tue, 5 Dec 2017 11:41:57 -0500 Subject: [PATCH] Update Angular project package dependencies Much fun here. Updates dependencies to the latest version of Angular 4. This caused a few build issues: One is that climate-change-components specifies versions of Angular to use while building. If the Angular versions here don't match that, we get build issues that look like: "Error encountered resolving symbol values statically. Calling function 'InjectionToken', function calls are not supported." To address this it is possible to force our project's typescript compiler to always use the versions of certain packages via the "files" config of tsconfig.json. This gives us a little flexibility in which Angular version gets used in the parent project. We still should respect the Angular version requirements of the components lib, but that restriction is far more lax than the specific Angular version the components lib is built with. Another build issue was caused by ng2nouislider being updated to 1.7.5 based on the ^1.6.2 restriction in package.json. 1.7.5. is built with a version of Angular CLI designed for use with Angular 5. This led to the error: "ERROR in Error: Metadata version mismatch for module /opt/planit/angular/planit/node_modules/ng2-nouislider/src/nouislider.d.ts, found version 4, expected 3, resolving symbol SharedModule in /opt/planit/angular/planit/src/app/shared/shared.module.ts, resolving symbol SharedModule in /opt/planit/angular/planit/src/app/shared/shared.module.ts" A GitHub issue on a different project with the same issue provided enough info to pinpoint the solution, which was to use a version of ng2nouislider built with Angular CLI compatible with Angular 4. https://github.com/primefaces/primeng/issues/4401 --- src/angular/planit/package.json | 30 +- src/angular/planit/tsconfig.json | 14 +- src/angular/planit/yarn.lock | 519 ++++++++++++++++++++++++------- 3 files changed, 428 insertions(+), 135 deletions(-) diff --git a/src/angular/planit/package.json b/src/angular/planit/package.json index 7eee00b4a..83e01a462 100644 --- a/src/angular/planit/package.json +++ b/src/angular/planit/package.json @@ -14,31 +14,31 @@ }, "private": true, "dependencies": { - "@angular/animations": "^4.4.6", - "@angular/common": "^4.4.6", - "@angular/compiler": "^4.4.6", - "@angular/core": "^4.4.6", - "@angular/forms": "^4.4.6", - "@angular/http": "^4.4.6", - "@angular/platform-browser": "^4.4.6", - "@angular/platform-browser-dynamic": "^4.4.6", - "@angular/router": "^4.4.6", + "@angular/animations": "~4.4.5", + "@angular/common": "~4.4.5", + "@angular/compiler": "~4.4.5", + "@angular/core": "~4.4.5", + "@angular/forms": "~4.4.5", + "@angular/http": "~4.4.5", + "@angular/platform-browser": "~4.4.5", + "@angular/platform-browser-dynamic": "~4.4.5", + "@angular/router": "~4.4.5", "bootstrap": "^3.3.7", "bootstrap-sass": "^3.3.7", - "climate-change-components": "^0.2.1", + "climate-change-components": "^0.2.2", "core-js": "^2.4.1", "ngx-bootstrap": "^2.0.0-beta.7", "rxjs": "^5.4.2", "webpack-sources": "^1.0.2", "zone.js": "^0.8.14", "lodash.clonedeep": "^4.5.0", - "ng2-nouislider": "^1.6.2", + "ng2-nouislider": "~1.6.2", "nouislider": "^10.1.0" }, "devDependencies": { - "@angular/cli": "1.4.2", - "@angular/compiler-cli": "^4.4.6", - "@angular/language-service": "^4.4.6", + "@angular/cli": "~1.4.2", + "@angular/compiler-cli": "~4.4.5", + "@angular/language-service": "~4.4.5", "@types/jasmine": "~2.5.53", "@types/jasminewd2": "~2.0.2", "@types/node": "~6.0.60", @@ -54,6 +54,6 @@ "protractor": "~5.1.2", "ts-node": "~3.2.0", "tslint": "~5.3.2", - "typescript": "~2.3.3" + "typescript": "~2.3.4" } } diff --git a/src/angular/planit/tsconfig.json b/src/angular/planit/tsconfig.json index a6c016bf3..865e31fc2 100644 --- a/src/angular/planit/tsconfig.json +++ b/src/angular/planit/tsconfig.json @@ -14,6 +14,18 @@ "lib": [ "es2017", "dom" - ] + ], + "paths": { + "@angular/animations": ["../node_modules/@angular/animations"], + "@angular/common": ["../node_modules/@angular/common"], + "@angular/compiler": ["../node_modules/@angular/compiler"], + "@angular/core": ["../node_modules/@angular/core"], + "@angular/forms": ["../node_modules/@angular/forms"], + "@angular/http": ["../node_modules/@angular/http"], + "@angular/platform-browser": ["../node_modules/@angular/platform-browser"], + "@angular/platform-browser-dynamic": ["../node_modules/@angular/platform-browser-dynamic"], + "@angular/router": ["../node_modules/@angular/router"], + "typescript": ["../node_modules/typescript"] + } } } diff --git a/src/angular/planit/yarn.lock b/src/angular/planit/yarn.lock index b7b325b21..1c6a35495 100644 --- a/src/angular/planit/yarn.lock +++ b/src/angular/planit/yarn.lock @@ -2,13 +2,13 @@ # yarn lockfile v1 -"@angular-devkit/build-optimizer@~0.0.18": - version "0.0.27" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.0.27.tgz#66369d4b0d3ce21dd1f918a948ff60579695f279" +"@angular-devkit/build-optimizer@~0.0.28": + version "0.0.34" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.0.34.tgz#47a0482f5687db79d102cf9d416cf6fa6774d702" dependencies: loader-utils "^1.1.0" source-map "^0.5.6" - typescript "^2.3.3" + typescript "~2.6.1" webpack-sources "^1.0.1" "@angular-devkit/core@0.0.20": @@ -17,35 +17,41 @@ dependencies: source-map "^0.5.6" -"@angular-devkit/schematics@~0.0.21": - version "0.0.33" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.0.33.tgz#25c460bfde10a414bb6af65c89bea7a5cbff46ff" +"@angular-devkit/core@0.0.22": + version "0.0.22" + resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-0.0.22.tgz#e90f46bf7ff47d260a767959267bc65ffee39ef1" dependencies: - "@angular-devkit/core" "0.0.20" + source-map "^0.5.6" + +"@angular-devkit/schematics@~0.0.34": + version "0.0.39" + resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.0.39.tgz#8821482d21f3d16798474983599c592063c881e7" + dependencies: + "@angular-devkit/core" "0.0.22" "@ngtools/json-schema" "^1.1.0" minimist "^1.2.0" - rxjs "^5.4.2" + rxjs "^5.5.2" -"@angular/animations@^4.2.4": - version "4.4.5" - resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-4.4.5.tgz#5a5a551d757e5a5560098f6f8535c102d93954d7" +"@angular/animations@^4.3.6", "@angular/animations@~4.4.5": + version "4.4.6" + resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-4.4.6.tgz#fa661899a8a4e38cb7c583c7a5c97ce65d592a35" dependencies: tslib "^1.7.1" -"@angular/cli@1.4.2": - version "1.4.2" - resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-1.4.2.tgz#220a54c7e12303157cc289f4306fa46d080705ac" +"@angular/cli@~1.4.2": + version "1.4.9" + resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-1.4.9.tgz#cd5cd7a8f3bf3a1c28dfcdc523a011f0fcebfb96" dependencies: - "@angular-devkit/build-optimizer" "~0.0.18" - "@angular-devkit/schematics" "~0.0.21" + "@angular-devkit/build-optimizer" "~0.0.28" + "@angular-devkit/schematics" "~0.0.34" "@ngtools/json-schema" "1.1.0" - "@ngtools/webpack" "1.7.1" - "@schematics/angular" "~0.0.30" + "@ngtools/webpack" "1.7.4" + "@schematics/angular" "~0.0.46" autoprefixer "^6.5.3" chalk "^2.0.1" circular-dependency-plugin "^3.0.0" common-tags "^1.3.1" - copy-webpack-plugin "^4.0.1" + copy-webpack-plugin "^4.1.1" core-object "^3.1.0" css-loader "^0.28.1" cssnano "^3.10.0" @@ -53,12 +59,9 @@ ember-cli-string-utils "^1.0.0" exports-loader "^0.6.3" extract-text-webpack-plugin "3.0.0" - file-loader "^0.10.0" + file-loader "^1.1.5" fs-extra "^4.0.0" - get-caller-file "^1.0.0" glob "^7.0.3" - heimdalljs "^0.2.4" - heimdalljs-logger "^0.1.9" html-webpack-plugin "^2.29.0" istanbul-instrumenter-loader "^2.0.0" karma-source-map-support "^1.2.0" @@ -85,79 +88,80 @@ stylus "^0.54.5" stylus-loader "^3.0.1" typescript ">=2.0.0 <2.6.0" - url-loader "^0.5.7" - webpack "~3.5.5" + url-loader "^0.6.2" + webpack "~3.7.1" webpack-concat-plugin "1.4.0" webpack-dev-middleware "~1.12.0" webpack-dev-server "~2.7.1" webpack-merge "^4.1.0" + webpack-sources "^1.0.0" zone.js "^0.8.14" optionalDependencies: node-sass "^4.3.0" -"@angular/common@^4.2.4": - version "4.4.5" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-4.4.5.tgz#bd5179dc922adbf4c3ea6dfb19e73cb849ffdc37" +"@angular/common@^4.3.6", "@angular/common@~4.4.5": + version "4.4.6" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-4.4.6.tgz#4b81420724e0828a0e839b95a55eb1a7e83918f2" dependencies: tslib "^1.7.1" -"@angular/compiler-cli@^4.2.4": - version "4.4.5" - resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-4.4.5.tgz#61fa0336acd1a208c5f1c5c6d4df679e99953248" +"@angular/compiler-cli@~4.4.5": + version "4.4.6" + resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-4.4.6.tgz#bafd3d1e260e99087eb9a8cf7532dbd603abb9b1" dependencies: - "@angular/tsc-wrapped" "4.4.5" + "@angular/tsc-wrapped" "4.4.6" minimist "^1.2.0" reflect-metadata "^0.1.2" -"@angular/compiler@^4.2.4": - version "4.4.5" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-4.4.5.tgz#8721a5910f2bb52f09e2d404cad264f35ede5902" +"@angular/compiler@^4.3.6", "@angular/compiler@~4.4.5": + version "4.4.6" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-4.4.6.tgz#2ee1faf25b757e1d128979074be7fae529b3bc20" dependencies: tslib "^1.7.1" -"@angular/core@^4.2.4": - version "4.4.5" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-4.4.5.tgz#54acbcbda11719f883c786a906974abeb132f1a0" +"@angular/core@^4.3.6", "@angular/core@~4.4.5": + version "4.4.6" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-4.4.6.tgz#13031fd10dcfe438875419b38f21120958bc2354" dependencies: tslib "^1.7.1" -"@angular/forms@^4.2.4": - version "4.4.5" - resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-4.4.5.tgz#e9552086232aab2ce1d08ef198b62204ea13c43b" +"@angular/forms@^4.3.6", "@angular/forms@~4.4.5": + version "4.4.6" + resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-4.4.6.tgz#fe64ace42435c1b80f49034b7c41ce8caf14a44a" dependencies: tslib "^1.7.1" -"@angular/http@^4.2.4": - version "4.4.5" - resolved "https://registry.yarnpkg.com/@angular/http/-/http-4.4.5.tgz#2c735ed842401fc2356419268e288dcf2396e84f" +"@angular/http@^4.3.6", "@angular/http@~4.4.5": + version "4.4.6" + resolved "https://registry.yarnpkg.com/@angular/http/-/http-4.4.6.tgz#0af680c6710bdc026d940e225cfd0f6a5c005d0c" dependencies: tslib "^1.7.1" -"@angular/language-service@^4.2.4": - version "4.4.5" - resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-4.4.5.tgz#ccef139b8d3e1684b01afa35c6fbf2172e2bb676" +"@angular/language-service@~4.4.5": + version "4.4.6" + resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-4.4.6.tgz#498ece95c5f6066403bf9fd3c5831af42b45618b" -"@angular/platform-browser-dynamic@^4.2.4": - version "4.4.5" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.4.5.tgz#774dbdc1d90f775dbf1e319f6ed42b260623b61f" +"@angular/platform-browser-dynamic@^4.3.6", "@angular/platform-browser-dynamic@~4.4.5": + version "4.4.6" + resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.4.6.tgz#4d3d9a6a7bf2cf3de4058a615ae059eff641fa36" dependencies: tslib "^1.7.1" -"@angular/platform-browser@^4.2.4": - version "4.4.5" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-4.4.5.tgz#74eb91c0b758126f26d53ee56c7cf4668bd9cac5" +"@angular/platform-browser@^4.3.6", "@angular/platform-browser@~4.4.5": + version "4.4.6" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-4.4.6.tgz#a9839c547e1b654fa1d24a89780c8ba6ab8dcce0" dependencies: tslib "^1.7.1" -"@angular/router@^4.2.4": - version "4.4.5" - resolved "https://registry.yarnpkg.com/@angular/router/-/router-4.4.5.tgz#f73130cf487d9a32cc1988afda59665f44a28a89" +"@angular/router@^4.3.6", "@angular/router@~4.4.5": + version "4.4.6" + resolved "https://registry.yarnpkg.com/@angular/router/-/router-4.4.6.tgz#0f6ad29ae0ff8d2c9ea379bd320447217b7ec866" dependencies: tslib "^1.7.1" -"@angular/tsc-wrapped@4.4.5": - version "4.4.5" - resolved "https://registry.yarnpkg.com/@angular/tsc-wrapped/-/tsc-wrapped-4.4.5.tgz#30a0cbb43a663aa75dca984894be4813778ddc9c" +"@angular/tsc-wrapped@4.4.6": + version "4.4.6" + resolved "https://registry.yarnpkg.com/@angular/tsc-wrapped/-/tsc-wrapped-4.4.6.tgz#16787cbbf50bdc7e738123b19c32527f244e178d" dependencies: tsickle "^0.21.0" @@ -165,18 +169,24 @@ version "1.1.0" resolved "https://registry.yarnpkg.com/@ngtools/json-schema/-/json-schema-1.1.0.tgz#c3a0c544d62392acc2813a42c8a0dc6f58f86922" -"@ngtools/webpack@1.7.1": - version "1.7.1" - resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-1.7.1.tgz#383ddd689845cf42fc755975f6440f75535f5016" +"@ngtools/webpack@1.7.4": + version "1.7.4" + resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-1.7.4.tgz#5015c47ebd339045dd89a1bef0497f4524d2c8ed" dependencies: enhanced-resolve "^3.1.0" loader-utils "^1.0.2" magic-string "^0.22.3" source-map "^0.5.6" -"@schematics/angular@~0.0.30": - version "0.0.45" - resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-0.0.45.tgz#830df863b9677c42d7220cfaf28741c06789f1e0" +"@schematics/angular@~0.0.46": + version "0.0.49" + resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-0.0.49.tgz#c00ca573756d6a79ee518b05eab5fe6e7b73f341" + dependencies: + "@angular-devkit/core" "0.0.20" + +"@types/geojson@^1.0.3": + version "1.0.6" + resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-1.0.6.tgz#3e02972728c69248c2af08d60a48cbb8680fffdf" "@types/jasmine@*": version "2.6.0" @@ -857,7 +867,7 @@ chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0: +chalk@^2.0.0, chalk@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e" dependencies: @@ -865,6 +875,14 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0: escape-string-regexp "^1.0.5" supports-color "^4.0.0" +chalk@^2.0.1: + version "2.3.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba" + dependencies: + ansi-styles "^3.1.0" + escape-string-regexp "^1.0.5" + supports-color "^4.0.0" + charenc@~0.0.1: version "0.0.2" resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667" @@ -907,6 +925,29 @@ clean-css@4.1.x: dependencies: source-map "0.5.x" +climate-change-components@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/climate-change-components/-/climate-change-components-0.2.2.tgz#e23109e40eac93b67c540eebd26d6b903f0c85ce" + dependencies: + "@angular/animations" "^4.3.6" + "@angular/common" "^4.3.6" + "@angular/compiler" "^4.3.6" + "@angular/core" "^4.3.6" + "@angular/forms" "^4.3.6" + "@angular/http" "^4.3.6" + "@angular/platform-browser" "^4.3.6" + "@angular/platform-browser-dynamic" "^4.3.6" + "@angular/router" "^4.3.6" + "@types/geojson" "^1.0.3" + core-js "^2.5.0" + d3 "^4.10.0" + jquery "^3.2.1" + lodash "^4.17.4" + moment "^2.18.1" + ngx-bootstrap "^1.9.3" + rxjs "^5.4.3" + zone.js "^0.8.17" + cliui@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1" @@ -954,9 +995,9 @@ code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" -codelyzer@~3.1.1: - version "3.1.2" - resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-3.1.2.tgz#9ff1f041fb9b5ee5dbeb45ba866dfaf04983af04" +codelyzer@~3.2.0: + version "3.2.2" + resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-3.2.2.tgz#abbd4e5956c435677740846e5858c915f89679c3" dependencies: app-root-path "^2.0.1" css-selector-tokenizer "^0.7.0" @@ -1013,6 +1054,10 @@ combined-stream@^1.0.5, combined-stream@~1.0.5: dependencies: delayed-stream "~1.0.0" +commander@2: + version "2.12.2" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555" + commander@2.11.x, commander@~2.11.0: version "2.11.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563" @@ -1108,20 +1153,18 @@ cookie@0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb" -copy-webpack-plugin@^4.0.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.1.1.tgz#53ae69e04955ebfa9fda411f54cbb968531d71fd" +copy-webpack-plugin@^4.1.1: + version "4.2.3" + resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.2.3.tgz#4a3c61089f3b635777f0f0af346c338b39d63755" dependencies: bluebird "^3.5.1" - fs-extra "^4.0.2" glob "^7.1.2" is-glob "^4.0.0" loader-utils "^0.2.15" lodash "^4.3.0" minimatch "^3.0.4" - node-dir "^0.1.10" -core-js@^2.2.0, core-js@^2.4.0, core-js@^2.4.1: +core-js@^2.2.0, core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0: version "2.5.1" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.1.tgz#ae6874dc66937789b80754ff5428df66819ca50b" @@ -1332,6 +1375,216 @@ custom-event@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425" +d3-array@1, d3-array@1.2.1, d3-array@^1.2.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.1.tgz#d1ca33de2f6ac31efadb8e050a021d7e2396d5dc" + +d3-axis@1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-1.0.8.tgz#31a705a0b535e65759de14173a31933137f18efa" + +d3-brush@1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.0.4.tgz#00c2f238019f24f6c0a194a26d41a1530ffe7bc4" + dependencies: + d3-dispatch "1" + d3-drag "1" + d3-interpolate "1" + d3-selection "1" + d3-transition "1" + +d3-chord@1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/d3-chord/-/d3-chord-1.0.4.tgz#7dec4f0ba886f713fe111c45f763414f6f74ca2c" + dependencies: + d3-array "1" + d3-path "1" + +d3-collection@1, d3-collection@1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.4.tgz#342dfd12837c90974f33f1cc0a785aea570dcdc2" + +d3-color@1, d3-color@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.0.3.tgz#bc7643fca8e53a8347e2fbdaffa236796b58509b" + +d3-dispatch@1, d3-dispatch@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-1.0.3.tgz#46e1491eaa9b58c358fce5be4e8bed626e7871f8" + +d3-drag@1, d3-drag@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.2.1.tgz#df8dd4c502fb490fc7462046a8ad98a5c479282d" + dependencies: + d3-dispatch "1" + d3-selection "1" + +d3-dsv@1, d3-dsv@1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.0.8.tgz#907e240d57b386618dc56468bacfe76bf19764ae" + dependencies: + commander "2" + iconv-lite "0.4" + rw "1" + +d3-ease@1, d3-ease@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.3.tgz#68bfbc349338a380c44d8acc4fbc3304aa2d8c0e" + +d3-force@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-1.1.0.tgz#cebf3c694f1078fcc3d4daf8e567b2fbd70d4ea3" + dependencies: + d3-collection "1" + d3-dispatch "1" + d3-quadtree "1" + d3-timer "1" + +d3-format@1, d3-format@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.2.1.tgz#4e19ecdb081a341dafaf5f555ee956bcfdbf167f" + +d3-geo@1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.9.0.tgz#15c7d7a8ea9346e59ed150dc7b1f7f95479056e9" + dependencies: + d3-array "1" + +d3-hierarchy@1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-1.1.5.tgz#a1c845c42f84a206bcf1c01c01098ea4ddaa7a26" + +d3-interpolate@1, d3-interpolate@1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.1.6.tgz#2cf395ae2381804df08aa1bf766b7f97b5f68fb6" + dependencies: + d3-color "1" + +d3-path@1, d3-path@1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.5.tgz#241eb1849bd9e9e8021c0d0a799f8a0e8e441764" + +d3-polygon@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-1.0.3.tgz#16888e9026460933f2b179652ad378224d382c62" + +d3-quadtree@1, d3-quadtree@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-1.0.3.tgz#ac7987e3e23fe805a990f28e1b50d38fcb822438" + +d3-queue@3.0.7: + version "3.0.7" + resolved "https://registry.yarnpkg.com/d3-queue/-/d3-queue-3.0.7.tgz#c93a2e54b417c0959129d7d73f6cf7d4292e7618" + +d3-random@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/d3-random/-/d3-random-1.1.0.tgz#6642e506c6fa3a648595d2b2469788a8d12529d3" + +d3-request@1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/d3-request/-/d3-request-1.0.6.tgz#a1044a9ef4ec28c824171c9379fae6d79474b19f" + dependencies: + d3-collection "1" + d3-dispatch "1" + d3-dsv "1" + xmlhttprequest "1" + +d3-scale@1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-1.0.7.tgz#fa90324b3ea8a776422bd0472afab0b252a0945d" + dependencies: + d3-array "^1.2.0" + d3-collection "1" + d3-color "1" + d3-format "1" + d3-interpolate "1" + d3-time "1" + d3-time-format "2" + +d3-selection@1, d3-selection@1.2.0, d3-selection@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.2.0.tgz#1b8ec1c7cedadfb691f2ba20a4a3cfbeb71bbc88" + +d3-shape@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.2.0.tgz#45d01538f064bafd05ea3d6d2cb748fd8c41f777" + dependencies: + d3-path "1" + +d3-time-format@2, d3-time-format@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.1.1.tgz#85b7cdfbc9ffca187f14d3c456ffda268081bb31" + dependencies: + d3-time "1" + +d3-time@1, d3-time@1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.0.8.tgz#dbd2d6007bf416fe67a76d17947b784bffea1e84" + +d3-timer@1, d3-timer@1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.7.tgz#df9650ca587f6c96607ff4e60cc38229e8dd8531" + +d3-transition@1, d3-transition@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.1.1.tgz#d8ef89c3b848735b060e54a39b32aaebaa421039" + dependencies: + d3-color "1" + d3-dispatch "1" + d3-ease "1" + d3-interpolate "1" + d3-selection "^1.1.0" + d3-timer "1" + +d3-voronoi@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/d3-voronoi/-/d3-voronoi-1.1.2.tgz#1687667e8f13a2d158c80c1480c5a29cb0d8973c" + +d3-zoom@1.7.1: + version "1.7.1" + resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-1.7.1.tgz#02f43b3c3e2db54f364582d7e4a236ccc5506b63" + dependencies: + d3-dispatch "1" + d3-drag "1" + d3-interpolate "1" + d3-selection "1" + d3-transition "1" + +d3@^4.10.0: + version "4.12.0" + resolved "https://registry.yarnpkg.com/d3/-/d3-4.12.0.tgz#75eccb39ea40f6018de8cfa2752905bee7daa46f" + dependencies: + d3-array "1.2.1" + d3-axis "1.0.8" + d3-brush "1.0.4" + d3-chord "1.0.4" + d3-collection "1.0.4" + d3-color "1.0.3" + d3-dispatch "1.0.3" + d3-drag "1.2.1" + d3-dsv "1.0.8" + d3-ease "1.0.3" + d3-force "1.1.0" + d3-format "1.2.1" + d3-geo "1.9.0" + d3-hierarchy "1.1.5" + d3-interpolate "1.1.6" + d3-path "1.0.5" + d3-polygon "1.0.3" + d3-quadtree "1.0.3" + d3-queue "3.0.7" + d3-random "1.1.0" + d3-request "1.0.6" + d3-scale "1.0.7" + d3-selection "1.2.0" + d3-shape "1.2.0" + d3-time "1.0.8" + d3-time-format "2.1.1" + d3-timer "1.0.7" + d3-transition "1.1.1" + d3-voronoi "1.1.2" + d3-zoom "1.7.1" + d@1: version "1.0.0" resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f" @@ -1910,11 +2163,12 @@ faye-websocket@~0.11.0: dependencies: websocket-driver ">=0.5.1" -file-loader@^0.10.0: - version "0.10.1" - resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.10.1.tgz#815034119891fc6441fb5a64c11bc93c22ddd842" +file-loader@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.5.tgz#91c25b6b6fbe56dae99f10a425fd64933b5c9daa" dependencies: loader-utils "^1.0.2" + schema-utils "^0.3.0" filename-regex@^2.0.0: version "2.0.1" @@ -2041,7 +2295,7 @@ fs-extra@^0.23.1: path-is-absolute "^1.0.0" rimraf "^2.2.8" -fs-extra@^4.0.0, fs-extra@^4.0.2: +fs-extra@^4.0.0: version "4.0.2" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.2.tgz#f91704c53d1b461f893452b0c307d9997647ab6b" dependencies: @@ -2100,7 +2354,7 @@ gaze@^1.0.0: dependencies: globule "^1.0.0" -get-caller-file@^1.0.0, get-caller-file@^1.0.1: +get-caller-file@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5" @@ -2310,19 +2564,6 @@ he@1.1.x: version "1.1.1" resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd" -heimdalljs-logger@^0.1.9: - version "0.1.9" - resolved "https://registry.yarnpkg.com/heimdalljs-logger/-/heimdalljs-logger-0.1.9.tgz#d76ada4e45b7bb6f786fc9c010a68eb2e2faf176" - dependencies: - debug "^2.2.0" - heimdalljs "^0.2.0" - -heimdalljs@^0.2.0, heimdalljs@^0.2.4: - version "0.2.5" - resolved "https://registry.yarnpkg.com/heimdalljs/-/heimdalljs-0.2.5.tgz#6aa54308eee793b642cff9cf94781445f37730ac" - dependencies: - rsvp "~3.2.1" - hmac-drbg@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" @@ -2460,7 +2701,7 @@ https-proxy-agent@^1.0.0: debug "2" extend "3" -iconv-lite@0.4.19: +iconv-lite@0.4, iconv-lite@0.4.19: version "0.4.19" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b" @@ -2837,7 +3078,15 @@ jasminewd2@^2.1.0: version "2.2.0" resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.2.0.tgz#e37cf0b17f199cce23bea71b2039395246b4ec4e" -js-base64@^2.1.5, js-base64@^2.1.8, js-base64@^2.1.9: +jquery@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.2.1.tgz#5c4d9de652af6cd0a770154a631bba12b015c787" + +js-base64@^2.1.5: + version "2.4.0" + resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.0.tgz#9e566fee624751a1d720c966cd6226d29d4025aa" + +js-base64@^2.1.8, js-base64@^2.1.9: version "2.3.2" resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.3.2.tgz#a79a923666372b580f8e27f51845c6f7e8fbfbaf" @@ -3291,14 +3540,14 @@ mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.16, dependencies: mime-db "~1.30.0" -mime@1.3.x: - version "1.3.6" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0" - mime@1.4.1, mime@^1.2.11, mime@^1.3.4: version "1.4.1" resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6" +mime@^1.4.1: + version "1.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" + mimic-fn@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18" @@ -3342,6 +3591,10 @@ mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkd dependencies: minimist "0.0.8" +moment@^2.18.1: + version "2.19.3" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.3.tgz#bdb99d270d6d7fda78cc0fbace855e27fe7da69f" + ms@0.7.1: version "0.7.1" resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098" @@ -3379,6 +3632,14 @@ negotiator@0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" +ng2-nouislider@~1.6.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/ng2-nouislider/-/ng2-nouislider-1.6.2.tgz#cacf2983afda6fd3dcdc94493cd1ddddfffa2cc5" + +ngx-bootstrap@^1.9.3: + version "1.9.3" + resolved "https://registry.yarnpkg.com/ngx-bootstrap/-/ngx-bootstrap-1.9.3.tgz#28e75d14fb1beaee609383d7694de4eb3ba03b26" + ngx-bootstrap@^2.0.0-beta.7: version "2.0.0-beta.8" resolved "https://registry.yarnpkg.com/ngx-bootstrap/-/ngx-bootstrap-2.0.0-beta.8.tgz#3209c818e89a4b4ea88c7c45fc53cebf000c0699" @@ -3389,12 +3650,6 @@ no-case@^2.2.0: dependencies: lower-case "^1.1.1" -node-dir@^0.1.10: - version "0.1.17" - resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.17.tgz#5f5665d93351335caabef8f1c554516cf5f1e4e5" - dependencies: - minimatch "^3.0.2" - node-forge@0.6.33: version "0.6.33" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.6.33.tgz#463811879f573d45155ad6a9f43dc296e8e85ebc" @@ -3528,6 +3783,10 @@ normalize-url@^1.4.0: query-string "^4.1.0" sort-keys "^1.0.0" +nouislider@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/nouislider/-/nouislider-10.1.0.tgz#7bdd0411fd62d4584bfe88cb92bb8d06e64c6b47" + npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" @@ -4546,9 +4805,9 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^2.0.0" inherits "^2.0.1" -rsvp@~3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.2.1.tgz#07cb4a5df25add9e826ebc67dcc9fd89db27d84a" +rw@1: + version "1.3.3" + resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4" rxjs@^5.4.2: version "5.4.3" @@ -4556,6 +4815,12 @@ rxjs@^5.4.2: dependencies: symbol-observable "^1.0.1" +rxjs@^5.4.3, rxjs@^5.5.2: + version "5.5.3" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.3.tgz#b62227e74b84f4e77bdf440e50b5ee01a1bc7dcd" + dependencies: + symbol-observable "^1.0.1" + safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" @@ -5257,14 +5522,18 @@ type-is@~1.6.15: media-typer "0.3.0" mime-types "~2.1.15" -"typescript@>=2.0.0 <2.6.0", typescript@^2.3.3: +"typescript@>=2.0.0 <2.6.0": version "2.5.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.5.3.tgz#df3dcdc38f3beb800d4bc322646b04a3f6ca7f0d" -typescript@~2.3.3: +typescript@~2.3.4: version "2.3.4" resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.3.4.tgz#3d38321828231e434f287514959c37a82b629f42" +typescript@~2.6.1: + version "2.6.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4" + uglify-js@3.1.x: version "3.1.4" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.1.4.tgz#8e1efa1244b207588e525c9c1835a33458b90aee" @@ -5335,12 +5604,13 @@ upper-case@^1.1.1: version "1.1.3" resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598" -url-loader@^0.5.7: - version "0.5.9" - resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.5.9.tgz#cc8fea82c7b906e7777019250869e569e995c295" +url-loader@^0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.6.2.tgz#a007a7109620e9d988d14bce677a1decb9a993f7" dependencies: loader-utils "^1.0.2" - mime "1.3.x" + mime "^1.4.1" + schema-utils "^0.3.0" url-parse@1.0.x: version "1.0.5" @@ -5531,6 +5801,13 @@ webpack-merge@^4.1.0: dependencies: lodash "^4.17.4" +webpack-sources@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54" + dependencies: + source-list-map "^2.0.0" + source-map "~0.6.1" + webpack-sources@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.0.1.tgz#c7356436a4d13123be2e2426a05d1dad9cbe65cf" @@ -5545,9 +5822,9 @@ webpack-sources@^1.0.2: source-list-map "^2.0.0" source-map "~0.6.1" -webpack@~3.5.5: - version "3.5.6" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.5.6.tgz#a492fb6c1ed7f573816f90e00c8fbb5a20cc5c36" +webpack@~3.7.1: + version "3.7.1" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.7.1.tgz#6046b5c415ff7df7a0dc54c5b6b86098e8b952da" dependencies: acorn "^5.0.0" acorn-dynamic-import "^2.0.0" @@ -5682,6 +5959,10 @@ xmlhttprequest-ssl@1.5.3: version "1.5.3" resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz#185a888c04eca46c3e4070d99f7b49de3528992d" +xmlhttprequest@1: + version "1.8.0" + resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc" + xtend@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" @@ -5783,6 +6064,6 @@ yn@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a" -zone.js@^0.8.14: +zone.js@^0.8.14, zone.js@^0.8.17: version "0.8.18" resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.18.tgz#8cecb3977fcd1b3090562ff4570e2847e752b48d"