Updated to versions that work together.
This commit is contained in:
		
							parent
							
								
									414c0588f7
								
							
						
					
					
						commit
						12b0c6d3d7
					
				
					 3 changed files with 41 additions and 38 deletions
				
			
		|  | @ -57,7 +57,7 @@ | ||||||
|     "karma": "^1.4.1", |     "karma": "^1.4.1", | ||||||
|     "karma-chrome-launcher": "^2.0.0", |     "karma-chrome-launcher": "^2.0.0", | ||||||
|     "karma-cli": "^1.0.1", |     "karma-cli": "^1.0.1", | ||||||
|     "karma-coverage-istanbul-reporter": "^1.0.0", |     "karma-coverage-istanbul-reporter": "^1.2.0", | ||||||
|     "karma-jasmine": "^1.1.0", |     "karma-jasmine": "^1.1.0", | ||||||
|     "karma-jasmine-html-reporter": "^0.2.2", |     "karma-jasmine-html-reporter": "^0.2.2", | ||||||
|     "karma-phantomjs-launcher": "^1.0.4", |     "karma-phantomjs-launcher": "^1.0.4", | ||||||
|  | @ -65,6 +65,6 @@ | ||||||
|     "protractor-console": "^2.0.1", |     "protractor-console": "^2.0.1", | ||||||
|     "ts-node": "^3.0.0", |     "ts-node": "^3.0.0", | ||||||
|     "tslint": "^5.0.0", |     "tslint": "^5.0.0", | ||||||
|     "typescript": "^2.2.0" |     "typescript": "~2.2.0" | ||||||
|   } |   } | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -2,7 +2,7 @@ | ||||||
| <html> | <html> | ||||||
| <head> | <head> | ||||||
|   <meta charset="utf-8"> |   <meta charset="utf-8"> | ||||||
|   <title>conv.friedli.info - Convert whatever you want!</title> |   <title>Convertorizr - Convert whatever you want!</title> | ||||||
|   <base href="/"> |   <base href="/"> | ||||||
| 
 | 
 | ||||||
|   <meta name="viewport" content="width=device-width, initial-scale=1"> |   <meta name="viewport" content="width=device-width, initial-scale=1"> | ||||||
|  |  | ||||||
							
								
								
									
										73
									
								
								yarn.lock
									
										
									
									
									
								
							
							
						
						
									
										73
									
								
								yarn.lock
									
										
									
									
									
								
							|  | @ -2577,9 +2577,9 @@ karma-cli@^1.0.1: | ||||||
|   dependencies: |   dependencies: | ||||||
|     resolve "^1.1.6" |     resolve "^1.1.6" | ||||||
| 
 | 
 | ||||||
| karma-coverage-istanbul-reporter@^1.0.0: | karma-coverage-istanbul-reporter@^1.2.0: | ||||||
|   version "1.1.0" |   version "1.2.0" | ||||||
|   resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-1.1.0.tgz#1357a534a77fe60befcfd83598383ced26c8f1b8" |   resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-1.2.0.tgz#f5ba3c5613c1b78721dff61a7765f5709e0e33cd" | ||||||
|   dependencies: |   dependencies: | ||||||
|     istanbul-api "^1.1.7" |     istanbul-api "^1.1.7" | ||||||
| 
 | 
 | ||||||
|  | @ -3957,32 +3957,7 @@ request-progress@~2.0.1: | ||||||
|   dependencies: |   dependencies: | ||||||
|     throttleit "^1.0.0" |     throttleit "^1.0.0" | ||||||
| 
 | 
 | ||||||
| request@2, request@^2.72.0, request@^2.78.0, request@^2.79.0, request@~2.79.0: | request@2, request@^2.81.0: | ||||||
|   version "2.79.0" |  | ||||||
|   resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de" |  | ||||||
|   dependencies: |  | ||||||
|     aws-sign2 "~0.6.0" |  | ||||||
|     aws4 "^1.2.1" |  | ||||||
|     caseless "~0.11.0" |  | ||||||
|     combined-stream "~1.0.5" |  | ||||||
|     extend "~3.0.0" |  | ||||||
|     forever-agent "~0.6.1" |  | ||||||
|     form-data "~2.1.1" |  | ||||||
|     har-validator "~2.0.6" |  | ||||||
|     hawk "~3.1.3" |  | ||||||
|     http-signature "~1.1.0" |  | ||||||
|     is-typedarray "~1.0.0" |  | ||||||
|     isstream "~0.1.2" |  | ||||||
|     json-stringify-safe "~5.0.1" |  | ||||||
|     mime-types "~2.1.7" |  | ||||||
|     oauth-sign "~0.8.1" |  | ||||||
|     qs "~6.3.0" |  | ||||||
|     stringstream "~0.0.4" |  | ||||||
|     tough-cookie "~2.3.0" |  | ||||||
|     tunnel-agent "~0.4.1" |  | ||||||
|     uuid "^3.0.0" |  | ||||||
| 
 |  | ||||||
| request@^2.81.0: |  | ||||||
|   version "2.81.0" |   version "2.81.0" | ||||||
|   resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" |   resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" | ||||||
|   dependencies: |   dependencies: | ||||||
|  | @ -4009,6 +3984,31 @@ request@^2.81.0: | ||||||
|     tunnel-agent "^0.6.0" |     tunnel-agent "^0.6.0" | ||||||
|     uuid "^3.0.0" |     uuid "^3.0.0" | ||||||
| 
 | 
 | ||||||
|  | request@^2.72.0, request@^2.78.0, request@^2.79.0, request@~2.79.0: | ||||||
|  |   version "2.79.0" | ||||||
|  |   resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de" | ||||||
|  |   dependencies: | ||||||
|  |     aws-sign2 "~0.6.0" | ||||||
|  |     aws4 "^1.2.1" | ||||||
|  |     caseless "~0.11.0" | ||||||
|  |     combined-stream "~1.0.5" | ||||||
|  |     extend "~3.0.0" | ||||||
|  |     forever-agent "~0.6.1" | ||||||
|  |     form-data "~2.1.1" | ||||||
|  |     har-validator "~2.0.6" | ||||||
|  |     hawk "~3.1.3" | ||||||
|  |     http-signature "~1.1.0" | ||||||
|  |     is-typedarray "~1.0.0" | ||||||
|  |     isstream "~0.1.2" | ||||||
|  |     json-stringify-safe "~5.0.1" | ||||||
|  |     mime-types "~2.1.7" | ||||||
|  |     oauth-sign "~0.8.1" | ||||||
|  |     qs "~6.3.0" | ||||||
|  |     stringstream "~0.0.4" | ||||||
|  |     tough-cookie "~2.3.0" | ||||||
|  |     tunnel-agent "~0.4.1" | ||||||
|  |     uuid "^3.0.0" | ||||||
|  | 
 | ||||||
| require-directory@^2.1.1: | require-directory@^2.1.1: | ||||||
|   version "2.1.1" |   version "2.1.1" | ||||||
|   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" |   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" | ||||||
|  | @ -4702,14 +4702,10 @@ typedarray@~0.0.5: | ||||||
|   version "0.0.6" |   version "0.0.6" | ||||||
|   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" |   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" | ||||||
| 
 | 
 | ||||||
| "typescript@>=2.0.0 <2.3.0": | "typescript@>=2.0.0 <2.3.0", typescript@~2.2.0: | ||||||
|   version "2.2.2" |   version "2.2.2" | ||||||
|   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.2.2.tgz#606022508479b55ffa368b58fee963a03dfd7b0c" |   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.2.2.tgz#606022508479b55ffa368b58fee963a03dfd7b0c" | ||||||
| 
 | 
 | ||||||
| typescript@^2.2.0: |  | ||||||
|   version "2.3.0" |  | ||||||
|   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.3.0.tgz#2e63e09284392bc8158a2444c33e2093795c0418" |  | ||||||
| 
 |  | ||||||
| uglify-js@^2.6, uglify-js@^2.7.5, uglify-js@~2.8.22: | uglify-js@^2.6, uglify-js@^2.7.5, uglify-js@~2.8.22: | ||||||
|   version "2.8.22" |   version "2.8.22" | ||||||
|   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.22.tgz#d54934778a8da14903fa29a326fb24c0ab51a1a0" |   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.22.tgz#d54934778a8da14903fa29a326fb24c0ab51a1a0" | ||||||
|  | @ -5049,13 +5045,20 @@ wrappy@1: | ||||||
|   version "1.0.2" |   version "1.0.2" | ||||||
|   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" |   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" | ||||||
| 
 | 
 | ||||||
| ws@1.1.2, ws@^1.0.1: | ws@1.1.2: | ||||||
|   version "1.1.2" |   version "1.1.2" | ||||||
|   resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.2.tgz#8a244fa052401e08c9886cf44a85189e1fd4067f" |   resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.2.tgz#8a244fa052401e08c9886cf44a85189e1fd4067f" | ||||||
|   dependencies: |   dependencies: | ||||||
|     options ">=0.0.5" |     options ">=0.0.5" | ||||||
|     ultron "1.0.x" |     ultron "1.0.x" | ||||||
| 
 | 
 | ||||||
|  | ws@^1.0.1: | ||||||
|  |   version "1.1.4" | ||||||
|  |   resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.4.tgz#57f40d036832e5f5055662a397c4de76ed66bf61" | ||||||
|  |   dependencies: | ||||||
|  |     options ">=0.0.5" | ||||||
|  |     ultron "1.0.x" | ||||||
|  | 
 | ||||||
| wtf-8@1.0.0: | wtf-8@1.0.0: | ||||||
|   version "1.0.0" |   version "1.0.0" | ||||||
|   resolved "https://registry.yarnpkg.com/wtf-8/-/wtf-8-1.0.0.tgz#392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a" |   resolved "https://registry.yarnpkg.com/wtf-8/-/wtf-8-1.0.0.tgz#392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a" | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue