From cf65d0dd0531ff3dcded0d536639a066ca190b64 Mon Sep 17 00:00:00 2001 From: Boris Cherny Date: Wed, 22 Nov 2017 18:48:56 -0800 Subject: [PATCH] upgrade dependencies, fix license field in package.json --- package.json | 59 ++++++++++++++++++++--------------- yarn.lock | 86 ++++++++++++++++++++++------------------------------ 2 files changed, 72 insertions(+), 73 deletions(-) diff --git a/package.json b/package.json index 0a647f8..966b8db 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react2angular", - "version": "3.0.1", + "version": "3.0.2", "description": "The easiest way to embed React components in Angular 1 apps!", "main": "index.js", "main:esnext": "index.es2015.js", @@ -9,7 +9,7 @@ "build": "npm run clean; tsc -d -t es2015 && mv ./index.js ./index.es2015.js && tsc -t es5", "clean": "rm ./*.d.ts; rm ./*.map; exit 0", "pretest": "npm run build", - "prepublish": "npm test", + "prepublishOnly": "npm test", "test": "karma start --single-run", "tdd": "npm-run-all -pr watch:*", "watch:ts": "tsc -w", @@ -19,44 +19,55 @@ "type": "git", "url": "git+ssh://git@github.com/coatue-oss/react2angular.git" }, - "keywords": [], + "keywords": [ + "react", + "angular", + "interop", + "ngreact", + "combine", + "together", + "embed" + ], "author": "Boris Cherny ", - "license": "Apache2", + "license": "Apache-2.0", "bugs": { "url": "https://github.com/coatue-oss/react2angular/issues" }, "homepage": "https://github.com/coatue-oss/react2angular#readme", "peerDependencies": { - "@types/prop-types": "^15.5.2", - "@types/react": "^16.0.0", - "@types/react-dom": "^16.0.0", + "@types/prop-types": ">=15", + "@types/react": ">=16", + "@types/react-dom": ">=16", "prop-types": ">=15", "react": ">=15", "react-dom": ">=15" }, "devDependencies": { - "@types/angular-mocks": ">=1.5", - "@types/jasmine": "^2.5.53", - "@types/jquery": "^3.2.10", + "@types/angular-mocks": "^1.5.11", + "@types/jasmine": "^2.8.2", + "@types/jquery": "^3.2.16", "@types/prop-types": "^15.5.2", - "@types/react": "^16.0.0", - "@types/react-dom": "^16.0.0", - "angular-mocks": ">=1.5", + "@types/react": "^16.0.25", + "@types/react-dom": "^16.0.3", + "angular-mocks": "^1.6.6", + "angular-resource": "^1.6.6", + "browserify": "^14.5.0", "jasmine": "^2.8.0", - "karma": "^1.7.0", - "karma-browserify": "^5.1.1", + "jasmine-core": "^2.8.0", + "karma": "^1.7.1", + "karma-browserify": "^5.1.2", "karma-chrome-launcher": "^2.2.0", "karma-jasmine": "^1.1.0", - "karma-mocha-reporter": "^2.2.3", + "karma-mocha-reporter": "^2.2.5", "karma-source-map-support": "^1.2.0", - "ngimport": "^0.7.2", - "npm-run-all": "^4.0.2", - "prop-types": "^15.5.10", - "react": "^15.6.1", - "react-dom": "^15.6.1", + "ngimport": "^0.8.0", + "npm-run-all": "^4.1.2", + "prop-types": "^15.6.0", + "react": "^16.1.1", + "react-dom": "^16.1.1", "rollupify": "^0.4.0", - "tslint": "^5.7.0", - "typescript": "^2.5.2", + "tslint": "^5.8.0", + "typescript": "^2.6.1", "watchify": "^3.9.0" }, "dependencies": { @@ -64,6 +75,6 @@ "@types/lodash.frompairs": "^4.0.3", "angular": ">=1.5.11", "lodash.frompairs": "^4.0.1", - "ngcomponent": "^4.0.1" + "ngcomponent": "^4.1.0" } } diff --git a/yarn.lock b/yarn.lock index 3469a2e..18b6761 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,27 +2,27 @@ # yarn lockfile v1 -"@types/angular-mocks@>=1.5", "@types/angular-mocks@^1.5.9": +"@types/angular-mocks@^1.5.11": version "1.5.11" resolved "https://registry.yarnpkg.com/@types/angular-mocks/-/angular-mocks-1.5.11.tgz#d5bbefbf742f2196071bda0fe051878b6f4fd72c" dependencies: "@types/angular" "*" -"@types/angular-resource@^1.5.8": +"@types/angular-resource@^1.5.14": version "1.5.14" resolved "https://registry.yarnpkg.com/@types/angular-resource/-/angular-resource-1.5.14.tgz#902f34e8c98f708ae99493c6d416b39b4a22d9fe" dependencies: "@types/angular" "*" -"@types/angular@*", "@types/angular@>=1.5", "@types/angular@^1.6.18", "@types/angular@^1.6.39": +"@types/angular@*", "@types/angular@>=1.5", "@types/angular@^1.6.34", "@types/angular@^1.6.39": version "1.6.39" resolved "https://registry.yarnpkg.com/@types/angular/-/angular-1.6.39.tgz#0c34938fc546f360c14817686f2e453ebf22312f" -"@types/jasmine@^2.5.53": +"@types/jasmine@^2.8.2": version "2.8.2" resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.8.2.tgz#6ae4d8740c0da5d5a627df725b4eed71b8e36668" -"@types/jquery@^3.2.10": +"@types/jquery@^3.2.16": version "3.2.16" resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.2.16.tgz#04419c404a3194350e7d3f339a90e72c88db3111" @@ -44,14 +44,14 @@ version "15.5.2" resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.5.2.tgz#3c6b8dceb2906cc87fe4358e809f9d20c8d59be1" -"@types/react-dom@^16.0.0": +"@types/react-dom@^16.0.3": version "16.0.3" resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.0.3.tgz#8accad7eabdab4cca3e1a56f5ccb57de2da0ff64" dependencies: "@types/node" "*" "@types/react" "*" -"@types/react@*", "@types/react@^16.0.0": +"@types/react@*", "@types/react@^16.0.25": version "16.0.25" resolved "https://registry.yarnpkg.com/@types/react/-/react-16.0.25.tgz#bf696b83fe480c5e0eff4335ee39ebc95884a1ed" @@ -88,11 +88,11 @@ ajv@^4.9.1: co "^4.6.0" json-stable-stringify "^1.0.1" -angular-mocks@>=1.5: +angular-mocks@^1.6.6: version "1.6.6" resolved "https://registry.yarnpkg.com/angular-mocks/-/angular-mocks-1.6.6.tgz#c93018e7838c6dc5ceaf1a6bcf9be13c830ea515" -angular-resource@>=1.5.0: +angular-resource@^1.6.6: version "1.6.6" resolved "https://registry.yarnpkg.com/angular-resource/-/angular-resource-1.6.6.tgz#430660e969c3e7cf40c5e247e5e690f06d6efc61" @@ -402,7 +402,7 @@ browserify-zlib@~0.2.0: dependencies: pako "~1.0.5" -browserify@^14.0.0: +browserify@^14.0.0, browserify@^14.5.0: version "14.5.0" resolved "https://registry.yarnpkg.com/browserify/-/browserify-14.5.0.tgz#0bbbce521acd6e4d1d54d8e9365008efb85a9cc5" dependencies: @@ -682,14 +682,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: safe-buffer "^5.0.1" sha.js "^2.4.8" -create-react-class@^15.6.0: - version "15.6.2" - resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.2.tgz#cf1ed15f12aad7f14ef5f2dfe05e6c42f91ef02a" - dependencies: - fbjs "^0.8.9" - loose-envify "^1.3.1" - object-assign "^4.1.1" - cross-spawn@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" @@ -1032,7 +1024,7 @@ extsprintf@1.3.0, extsprintf@^1.2.0: version "1.3.0" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" -fbjs@^0.8.16, fbjs@^0.8.9: +fbjs@^0.8.16: version "0.8.16" resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db" dependencies: @@ -1490,7 +1482,7 @@ isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" -jasmine-core@~2.8.0: +jasmine-core@^2.8.0, jasmine-core@~2.8.0: version "2.8.0" resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e" @@ -1559,7 +1551,7 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" -karma-browserify@^5.1.1: +karma-browserify@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/karma-browserify/-/karma-browserify-5.1.2.tgz#48016359d722312a3530aa1dbbab7663e022d779" dependencies: @@ -1581,7 +1573,7 @@ karma-jasmine@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.0.tgz#22e4c06bf9a182e5294d1f705e3733811b810acf" -karma-mocha-reporter@^2.2.3: +karma-mocha-reporter@^2.2.5: version "2.2.5" resolved "https://registry.yarnpkg.com/karma-mocha-reporter/-/karma-mocha-reporter-2.2.5.tgz#15120095e8ed819186e47a0b012f3cd741895560" dependencies: @@ -1595,7 +1587,7 @@ karma-source-map-support@^1.2.0: dependencies: source-map-support "^0.4.1" -karma@^1.7.0: +karma@^1.7.1: version "1.7.1" resolved "https://registry.yarnpkg.com/karma/-/karma-1.7.1.tgz#85cc08e9e0a22d7ce9cca37c4a1be824f6a2b1ae" dependencies: @@ -1838,7 +1830,7 @@ negotiator@0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" -ngcomponent@^4.0.1: +ngcomponent@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/ngcomponent/-/ngcomponent-4.1.0.tgz#793e379138f552ea0cd2c767ad0aa7057678e228" dependencies: @@ -1847,15 +1839,12 @@ ngcomponent@^4.0.1: angular ">=1.5.0" lodash "^4.17.4" -ngimport@^0.7.2: - version "0.7.2" - resolved "https://registry.yarnpkg.com/ngimport/-/ngimport-0.7.2.tgz#a21743b5dd5a7056688e4394dc5c14960343eb7d" +ngimport@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/ngimport/-/ngimport-0.8.0.tgz#55c222a23d102555a649866c5004919f1ea8e408" dependencies: - "@types/angular" "^1.6.18" - "@types/angular-mocks" "^1.5.9" - "@types/angular-resource" "^1.5.8" - angular ">=1.5.0" - angular-resource ">=1.5.0" + "@types/angular" "^1.6.34" + "@types/angular-resource" "^1.5.14" node-fetch@^1.0.1: version "1.7.3" @@ -1906,7 +1895,7 @@ normalize-path@^2.0.0, normalize-path@^2.0.1: dependencies: remove-trailing-separator "^1.0.1" -npm-run-all@^4.0.2: +npm-run-all@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.2.tgz#90d62d078792d20669139e718621186656cea056" dependencies: @@ -2138,7 +2127,7 @@ promise@^7.1.1: dependencies: asap "~2.0.3" -prop-types@^15.5.10: +prop-types@^15.6.0: version "15.6.0" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856" dependencies: @@ -2236,24 +2225,23 @@ rc@^1.1.7: minimist "^1.2.0" strip-json-comments "~2.0.1" -react-dom@^15.6.1: - version "15.6.2" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730" +react-dom@^16.1.1: + version "16.1.1" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.1.1.tgz#b2e331b6d752faf1a2d31399969399a41d8d45f8" dependencies: - fbjs "^0.8.9" + fbjs "^0.8.16" loose-envify "^1.1.0" - object-assign "^4.1.0" - prop-types "^15.5.10" + object-assign "^4.1.1" + prop-types "^15.6.0" -react@^15.6.1: - version "15.6.2" - resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72" +react@^16.1.1: + version "16.1.1" + resolved "https://registry.yarnpkg.com/react/-/react-16.1.1.tgz#d5c4ef795507e3012282dd51261ff9c0e824fe1f" dependencies: - create-react-class "^15.6.0" - fbjs "^0.8.9" + fbjs "^0.8.16" loose-envify "^1.1.0" - object-assign "^4.1.0" - prop-types "^15.5.10" + object-assign "^4.1.1" + prop-types "^15.6.0" read-only-stream@^2.0.0: version "2.0.0" @@ -2747,7 +2735,7 @@ tslib@^1.7.1: version "1.8.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.8.0.tgz#dc604ebad64bcbf696d613da6c954aa0e7ea1eb6" -tslint@^5.7.0: +tslint@^5.8.0: version "5.8.0" resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.8.0.tgz#1f49ad5b2e77c76c3af4ddcae552ae4e3612eb13" dependencies: @@ -2794,7 +2782,7 @@ typedarray@~0.0.5: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" -typescript@^2.5.2: +typescript@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.1.tgz#ef39cdea27abac0b500242d6726ab90e0c846631"