From d3b547360f2aad6eb6117a4b93e2cf862f85f198 Mon Sep 17 00:00:00 2001 From: Dovydas Navickas Date: Mon, 26 Jun 2017 13:39:40 +0300 Subject: [PATCH 01/81] RadioProps now extends BaseContainerProps. (#110) * RadioProps now extends BaseContainerProps. * Import path updated. --- common/config/rush/npm-shrinkwrap.json | 161 +++++++++--------- .../react-forms-dom/src/components/radio.tsx | 8 +- 2 files changed, 83 insertions(+), 86 deletions(-) diff --git a/common/config/rush/npm-shrinkwrap.json b/common/config/rush/npm-shrinkwrap.json index e7c4b7d..1c72e5e 100644 --- a/common/config/rush/npm-shrinkwrap.json +++ b/common/config/rush/npm-shrinkwrap.json @@ -51,9 +51,9 @@ "integrity": "sha512-cSHtjB7Qgy6TvoYXVSRQJdsiUba62cwlAxvQ5mah2nfnuqcWcSZk1svZZu1JbWPWwQrwqvzDmjoozDhsKW6ewQ==" }, "@types/enzyme": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/@types/enzyme/-/enzyme-2.8.0.tgz", - "integrity": "sha1-hMYgTPiYMSI6iattw/SQseCIY1I=" + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/@types/enzyme/-/enzyme-2.8.1.tgz", + "integrity": "sha512-qWU1EAw3/5HwmhrmsuOzaIf/Ck48QZcTZOFrUVQ5wD7hF5TyuzZHz6FT01tNM/yqoDVepJqt4GhoqQT0DqSvig==" }, "@types/fbemitter": { "version": "2.0.32", @@ -61,9 +61,9 @@ "integrity": "sha1-jtIE2g9U6cjq7DGx7skeJRMtCCw=" }, "@types/flux": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@types/flux/-/flux-3.1.0.tgz", - "integrity": "sha1-X8s3UCGVduXjiizbT+dzXOqGHFU=" + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@types/flux/-/flux-3.1.1.tgz", + "integrity": "sha512-CVXwlWbwhOptFs1hXD+0fZWZzoiBymIZPMV589LfcqpW3rtPz6A/792cfjuhFVzwZrUIkQ39Fl0V4BnwVMNtuA==" }, "@types/glob": { "version": "5.0.30", @@ -81,9 +81,9 @@ "integrity": "sha512-5hGc57snkSvGEkUQ42tcYAQmQrU9E41XQJNglP6FtDg7ou9QGyF1HfPZ5POGnrl7ee7uYq0Om0gh1bAmykxaxA==" }, "@types/jest": { - "version": "20.0.1", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-20.0.1.tgz", - "integrity": "sha512-ykR6tgrA3NbL1MebczwTrFL6KnqUDH9SRQjB3FBvwPSb3QqWi/J0MGL6lF5lxUosZ3Y35PWDgAe1xqr8wZM2iA==" + "version": "20.0.2", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-20.0.2.tgz", + "integrity": "sha512-r9D5PKnwZiGcxkT7cej+7kq+pobFcCsj5TlWlO+AmlbwIo8u6vCWhGd0DPo8f7ANskwQaQ6vB6GqGN/DUoL3zQ==" }, "@types/minimatch": { "version": "2.0.29", @@ -111,14 +111,14 @@ "integrity": "sha1-Hs9SYhKZ5luFU3Qzf7Ef0tEGb8E=" }, "@types/react": { - "version": "15.0.30", - "resolved": "https://registry.npmjs.org/@types/react/-/react-15.0.30.tgz", - "integrity": "sha512-Az6oT3g1sep2hl37L5x1PYEJeuJ2xd3olCT7AhY2rjhXmGX+sYO0q120HJMg6EkK+GZnVNJF84puz75f4KHlGg==" + "version": "15.0.31", + "resolved": "https://registry.npmjs.org/@types/react/-/react-15.0.31.tgz", + "integrity": "sha512-SCeEnC+1K3ZftVjBJMXmKkoCbC4VsDUL4q0HyvnYj6FqiVvg+Klambc8FhroRyGCi6zb5V21F+41DXyio5rpdA==" }, "@types/react-dom": { - "version": "15.5.0", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-15.5.0.tgz", - "integrity": "sha1-f0+5YT1AURQXcyQve2tfGkazS9k=" + "version": "15.5.1", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-15.5.1.tgz", + "integrity": "sha512-4c+e/QPfvSa48YhgGOcQWoHishTo6BuJqka0Bh8qeLdnK1jS+1Nz8W/w1G17AIjtLxONYFUqmi8qyt+8p/yMFA==" }, "@types/sinon": { "version": "2.3.1", @@ -360,9 +360,9 @@ "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=" }, "async": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/async/-/async-2.4.1.tgz", - "integrity": "sha1-YqVrJ5yYoR0JhwlqAcw+6463u9c=" + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz", + "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==" }, "async-done": { "version": "1.2.2", @@ -504,9 +504,9 @@ "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, "base64-js": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz", - "integrity": "sha1-o5mS1yNYSBGYK+XikLtqU9hnAPE=" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz", + "integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw==" }, "bcrypt-pbkdf": { "version": "1.0.1", @@ -731,9 +731,9 @@ "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=" }, "commander": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", - "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=" + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.10.0.tgz", + "integrity": "sha512-q/r9trjmuikWDRJNTBHAVnWhuU6w+z80KgBq7j9YDclik5E7X4xi0KnlZBNFA1zOQ+SH/vHMWd2mC9QTOz7GpA==" }, "concat-map": { "version": "0.0.1", @@ -1022,14 +1022,14 @@ "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=" }, "enzyme": { - "version": "2.8.2", - "resolved": "https://registry.npmjs.org/enzyme/-/enzyme-2.8.2.tgz", - "integrity": "sha1-bIvLBQEqvEqkvDIT+yN4C5tbFxQ=" + "version": "2.9.1", + "resolved": "https://registry.npmjs.org/enzyme/-/enzyme-2.9.1.tgz", + "integrity": "sha1-B9XOaRJBJA+4F78sSxjW5TAkDfY=" }, "enzyme-matchers": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/enzyme-matchers/-/enzyme-matchers-3.2.0.tgz", - "integrity": "sha1-Rxh3mjuetejrrUaAT40+ZgRdAYE=" + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/enzyme-matchers/-/enzyme-matchers-3.3.0.tgz", + "integrity": "sha512-59dLTPOxsx9sljHdvn5O2A7jbwO14mxXkTrlg+HClRRw+OE6FbcyFtejuDzKl3per3uR651vyMauaKGHjzVakg==" }, "enzyme-to-json": { "version": "1.5.1", @@ -2433,9 +2433,9 @@ "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, "istanbul-api": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.1.9.tgz", - "integrity": "sha512-zV14oa+hjBNP3gJTM/BzNdJpInHKbZ9cLIEwVasuaTUA1ebF9TBOIfcC5SDAE3C11rXxOw3KSimKGMiFz6PpWQ==" + "version": "1.1.10", + "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.1.10.tgz", + "integrity": "sha1-8n5ecSXI3hP2qAZhr3j1EuVDmys=" }, "istanbul-lib-coverage": { "version": "1.1.1", @@ -2448,9 +2448,9 @@ "integrity": "sha512-3U2HB9y1ZV9UmFlE12Fx+nPtFqIymzrqCksrXujm3NVbAZIJg/RfYgO1XiIa0mbmxTjWpVEVlkIZJ25xVIAfkQ==" }, "istanbul-lib-instrument": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.2.tgz", - "integrity": "sha512-lPgUY+Pa5dlq2/l0qs1PJZ54QPSfo+s4+UZdkb2d0hbOyrEIAbUJphBLFjEyXBdeCONgGRADFzs3ojfFtmuwFA==" + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.3.tgz", + "integrity": "sha1-klsjkWPqvdaMxASPUsL6T4mez6c=" }, "istanbul-lib-report": { "version": "1.1.1", @@ -2582,9 +2582,9 @@ "integrity": "sha1-1Ii8RhKvLCRumG6K52caCZFj1AM=" }, "jest-enzyme": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/jest-enzyme/-/jest-enzyme-3.2.0.tgz", - "integrity": "sha1-zA6jIKn+mFSAl/h/lyzCJVcf6xM=" + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/jest-enzyme/-/jest-enzyme-3.3.0.tgz", + "integrity": "sha512-bqTP/7JfKmSetyf79Ht38P6hSW6V3t3jTwq+UKmtoAl8PCn4OTvzWZcKtdKrmrcmZKyDTxjngfNdWG0WPjUsyQ==" }, "jest-haste-map": { "version": "20.0.4", @@ -2757,9 +2757,9 @@ "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" }, "json-schema-traverse": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.0.tgz", - "integrity": "sha1-ABbAscoe/kbUTTdUG838Gdz64Ns=" + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", + "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=" }, "json-stable-stringify": { "version": "1.0.1", @@ -3636,9 +3636,9 @@ "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=" }, "readable-stream": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.0.tgz", - "integrity": "sha512-c7KMXGd4b48nN3OJ1U9qOsn6pXNzf6kLd3kdZCkg2sxAcoiufInqF0XckwEnlrcwuaYwonlNK8GQUIOC/WC7sg==" + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.2.tgz", + "integrity": "sha1-WgTfBeT1f+Pw3Gj90R3FyXx+b00=" }, "readdirp": { "version": "2.1.0", @@ -3688,14 +3688,7 @@ "request": { "version": "2.81.0", "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", - "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", - "dependencies": { - "uuid": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", - "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==" - } - } + "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=" }, "require-directory": { "version": "2.1.1", @@ -3733,9 +3726,9 @@ "integrity": "sha1-D0WEKVxTo2KK9+bXmsohzlfRxuc=" }, "safe-buffer": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.0.tgz", - "integrity": "sha512-aSLEDudu6OoRr/2rU609gRmnYboRLxgDG1z9o2Q0os7236FwvcqIOO8r8U5JUEwivZOhDaKlFO4SbPTJYyBEyQ==" + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" }, "samsam": { "version": "1.2.1", @@ -3765,9 +3758,9 @@ } }, "sax": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.2.tgz", - "integrity": "sha1-/YYxojvHgmvvXYcb24c3jJVkeCg=" + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" }, "semver": { "version": "5.3.0", @@ -3931,16 +3924,9 @@ "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=" }, "string_decoder": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.2.tgz", - "integrity": "sha1-sp4fThEl+pehA4K4pTNze3SR4Xk=", - "dependencies": { - "safe-buffer": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz", - "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=" - } - } + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==" }, "string-length": { "version": "1.0.1", @@ -4139,9 +4125,9 @@ "integrity": "sha1-OcKBDAXW9pCNrBWSna4ga0lLc/Q=" }, "ts-loader": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-2.1.0.tgz", - "integrity": "sha1-Wo78xccsBvxJ1putachWF8YZT3c=", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-2.2.0.tgz", + "integrity": "sha512-+NdvTzGoE2pee3U2Arg1DB6VVKxGmog7QEARiQxMh5v5ewDxXMpnfVvMt4YxJsB+XVXtaZGtaWnsCINXT3oXxw==", "dependencies": { "loader-utils": { "version": "1.1.0", @@ -4207,14 +4193,21 @@ "integrity": "sha1-PTgyGCgjHkNPKHUUlZw3qCtin0I=" }, "ua-parser-js": { - "version": "0.7.12", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.12.tgz", - "integrity": "sha1-BMgamb3V3FImPqKdJMa/jUgYpLs=" + "version": "0.7.13", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.13.tgz", + "integrity": "sha1-zZ3S+GSTs/RNvu7zeA/adMXuFL4=" }, "uglify-js": { - "version": "3.0.18", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.18.tgz", - "integrity": "sha512-0M/KeXO8bPYtlqnwIYpO4R6om1mrScMzPuWn2UPfUYOaowIhQmmFpL9Q5tlD18ulKLRKD12GQ0IiYDKJS/si1w==" + "version": "3.0.20", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.20.tgz", + "integrity": "sha512-O/c2/N97k1Ms+23VRx6gIAfGdijuW53SlASmXy0FVapK63rQrduHyE+5X6hUtqNiSLLao9Uv6ijotpNe8t991Q==", + "dependencies": { + "commander": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", + "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=" + } + } }, "uglify-to-browserify": { "version": "1.0.2", @@ -4346,9 +4339,9 @@ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "uuid": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", - "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=" + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", + "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==" }, "v8flags": { "version": "2.1.1", @@ -4366,9 +4359,9 @@ "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=" }, "validator": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/validator/-/validator-7.0.0.tgz", - "integrity": "sha1-x03rgGNRL6w1VHk45vCxUEooL9I=" + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/validator/-/validator-7.1.0.tgz", + "integrity": "sha512-FQoOpdJUMXEHZnXBQ2UmSsUOBs6cJUqVt8gpfTQv3yorqZA/v3rT/xH/5Zd9EKndXPL0Am3Qi6t8udKiaJuMfA==" }, "verror": { "version": "1.3.6", diff --git a/packages/react-forms-dom/src/components/radio.tsx b/packages/react-forms-dom/src/components/radio.tsx index ae37e9d..72ad235 100644 --- a/packages/react-forms-dom/src/components/radio.tsx +++ b/packages/react-forms-dom/src/components/radio.tsx @@ -1,7 +1,11 @@ import * as React from "react"; import * as PropTypes from "prop-types"; -import { BaseContainer, BaseContainerParentContext } from "@simplr/react-forms"; +import { + BaseContainer, + BaseContainerParentContext, + BaseContainerProps +} from "@simplr/react-forms"; import { FormStoreStateRecord, FieldValue, @@ -19,7 +23,7 @@ import { DomComponentData } from "../contracts/field"; -export interface RadioProps extends HTMLElementProps { +export interface RadioProps extends BaseContainerProps, HTMLElementProps { value: string; template?: DomFieldTemplateCallback; From b19442d5b0a4041da532478d19eaef5db362e818 Mon Sep 17 00:00:00 2001 From: Dovydas Navickas Date: Mon, 26 Jun 2017 13:53:09 +0300 Subject: [PATCH 02/81] v4.1.1 --- packages/react-forms-dom/package.json | 4 ++-- packages/react-forms-validation/package.json | 4 ++-- packages/react-forms/package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/react-forms-dom/package.json b/packages/react-forms-dom/package.json index dcc7038..5a6c83e 100644 --- a/packages/react-forms-dom/package.json +++ b/packages/react-forms-dom/package.json @@ -1,6 +1,6 @@ { "name": "@simplr/react-forms-dom", - "version": "4.1.0", + "version": "4.1.1", "description": "DOM components for @simplr/react-forms.", "repository": "SimplrJS/react-forms", "homepage": "https://github.com/SimplrJS/react-forms", @@ -61,7 +61,7 @@ "prop-types": "^15.5.10", "react": "^15.6.1", "react-dom": "^15.6.1", - "@simplr/react-forms": "^4.0.0", + "@simplr/react-forms": "^4.1.1", "tslib": "^1.7.1", "typed-immutable-record": "^0.0.6" }, diff --git a/packages/react-forms-validation/package.json b/packages/react-forms-validation/package.json index 9adcf9a..f0edd35 100644 --- a/packages/react-forms-validation/package.json +++ b/packages/react-forms-validation/package.json @@ -1,6 +1,6 @@ { "name": "@simplr/react-forms-validation", - "version": "4.1.0", + "version": "4.1.1", "description": "Validation library for @simplr/react-forms.", "repository": "SimplrJS/react-forms", "homepage": "https://github.com/SimplrJS/react-forms", @@ -58,7 +58,7 @@ "action-emitter": "^0.2.1", "immutable": "^3.8.1", "react": "^15.6.1", - "@simplr/react-forms": "^4.0.0", + "@simplr/react-forms": "^4.1.1", "tslib": "^1.7.1", "validator": "^7.0.0" }, diff --git a/packages/react-forms/package.json b/packages/react-forms/package.json index fb77707..480d630 100644 --- a/packages/react-forms/package.json +++ b/packages/react-forms/package.json @@ -1,6 +1,6 @@ { "name": "@simplr/react-forms", - "version": "4.1.0", + "version": "4.1.1", "description": "Shared @simplr/react-forms logic.", "repository": "SimplrJS/react-forms", "homepage": "https://github.com/SimplrJS/react-forms", From 32816b6f073ff4920c626a5e8b3852a0cd9c3653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20=C5=BDilinskas?= Date: Sat, 8 Jul 2017 17:24:17 +0300 Subject: [PATCH 03/81] Updated dependencies (#111) * Bumped dep versions. * Updated contracts with newest yargs types. * Updated npm-shrinkwrap. * Removed unused imports. * Changed from Promise to Promise. * Fixed rush-tools ts. --- common/config/rush/npm-shrinkwrap.json | 172 +++++++++--------- package.json | 10 +- packages/react-forms-dom/package.json | 22 +-- packages/react-forms-validation/package.json | 24 +-- .../src/subscribers/form-store-subscriber.ts | 2 - packages/react-forms/package.json | 26 +-- packages/react-forms/src/stores/form-store.ts | 4 +- tools/mvdir/dist/contracts.d.ts | 3 +- tools/mvdir/package.json | 6 +- tools/mvdir/src/contracts.ts | 4 +- tools/rush-tools.ts | 2 +- 11 files changed, 143 insertions(+), 132 deletions(-) diff --git a/common/config/rush/npm-shrinkwrap.json b/common/config/rush/npm-shrinkwrap.json index 1c72e5e..951aff3 100644 --- a/common/config/rush/npm-shrinkwrap.json +++ b/common/config/rush/npm-shrinkwrap.json @@ -41,9 +41,9 @@ "integrity": "sha1-5NEKueQ6c3A6F8b0FDi+3ih2k0A=" }, "@types/cheerio": { - "version": "0.22.1", - "resolved": "https://registry.npmjs.org/@types/cheerio/-/cheerio-0.22.1.tgz", - "integrity": "sha1-dAxM2MTT8wdPg7mrYucR6sLHZM4=" + "version": "0.22.2", + "resolved": "https://registry.npmjs.org/@types/cheerio/-/cheerio-0.22.2.tgz", + "integrity": "sha512-7YJQbllem83umRzZ+ry6RZFAbBWNoHvbiW6tE5VEAJIoX6F22hrKrBw3ibRvHm2zPnOhZGrZJusAbp1zZKcLzQ==" }, "@types/chokidar": { "version": "1.7.0", @@ -101,9 +101,9 @@ "integrity": "sha1-pNgMCC/v5x5Ap8DwfR5lVbu8e1I=" }, "@types/node": { - "version": "7.0.32", - "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.32.tgz", - "integrity": "sha512-7+0Ai8r8Xt6NNVM0Eo+XSqiZsBUYXg2yrCwyBhQzSfFHTGQWzFv/pk9106vPR8HWjKmGK+zzUj244POs4xfO2g==" + "version": "8.0.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.7.tgz", + "integrity": "sha512-fuCPLPe4yY0nv6Z1rTLFCEC452jl0k7i3gF/c8hdEKpYtEpt6Sk67hTGbxx8C0wmifFGPvKYd/O8CvS6dpgxMQ==" }, "@types/prop-types": { "version": "15.5.1", @@ -111,9 +111,9 @@ "integrity": "sha1-Hs9SYhKZ5luFU3Qzf7Ef0tEGb8E=" }, "@types/react": { - "version": "15.0.31", - "resolved": "https://registry.npmjs.org/@types/react/-/react-15.0.31.tgz", - "integrity": "sha512-SCeEnC+1K3ZftVjBJMXmKkoCbC4VsDUL4q0HyvnYj6FqiVvg+Klambc8FhroRyGCi6zb5V21F+41DXyio5rpdA==" + "version": "15.0.34", + "resolved": "https://registry.npmjs.org/@types/react/-/react-15.0.34.tgz", + "integrity": "sha512-BDSzuTYvOJAknO4qSIFb1Y0+BREhwhBDNMrVAu8JPRjosc94jBQJwIZ++H9uK6EInKIrk0PxNVstmwT02H7E/A==" }, "@types/react-dom": { "version": "15.5.1", @@ -121,9 +121,9 @@ "integrity": "sha512-4c+e/QPfvSa48YhgGOcQWoHishTo6BuJqka0Bh8qeLdnK1jS+1Nz8W/w1G17AIjtLxONYFUqmi8qyt+8p/yMFA==" }, "@types/sinon": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-2.3.1.tgz", - "integrity": "sha512-WXpK6gOice0sdhfrAtRaDNtg0E0e04MRuCKYuqtCmc8O1P9P+ia3Z5zuMf4cDVB27s9w4UjjML5/6vjkiI2gNA==" + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-2.3.2.tgz", + "integrity": "sha512-92DKsC/9bnsfyBLdY5AP8Zk7LDbwVF0hBHsfQ3IY3kHXEo3NdJA57090wGmzcnITxupyvR3lXk278tPktM6OJw==" }, "@types/source-map": { "version": "0.5.0", @@ -166,14 +166,14 @@ "integrity": "sha1-c7ISuxg49f/xQ0Hj436VbwVgABs=" }, "@types/webpack": { - "version": "2.2.16", - "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-2.2.16.tgz", - "integrity": "sha512-RWL7Qrf9dE2Y3SPR8FZ2ATIJzKzvzvpfAhXs2A+2YpAYufoBqc94766Dv7TLB8zj7P6NK8t4KMrGNnYFJGKGiQ==" + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-3.0.1.tgz", + "integrity": "sha512-rvxpZw2k+u9aesdM39jN+a1f1g/6DeVIYU3601uyiSFMnfHCv+/iHJQiyGzuf4pSZ35LLIamzt9S+ccunuqEZg==" }, "@types/yargs": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-6.6.0.tgz", - "integrity": "sha1-kfjiWAqAgwSfeDEcBZqlfWlJ32s=" + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-8.0.0.tgz", + "integrity": "sha512-HR3mkr3OuDvlbT0jtB5mkqOALEXik2mMz0kDNRRXBp7S83rbylqAKcTw+eY0yeTu8Nl7oVLf1nCI7zoJ4j+JMg==" }, "abab": { "version": "1.0.3", @@ -731,9 +731,9 @@ "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=" }, "commander": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.10.0.tgz", - "integrity": "sha512-q/r9trjmuikWDRJNTBHAVnWhuU6w+z80KgBq7j9YDclik5E7X4xi0KnlZBNFA1zOQ+SH/vHMWd2mC9QTOz7GpA==" + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", + "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==" }, "concat-map": { "version": "0.0.1", @@ -1012,9 +1012,9 @@ "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=" }, "enhanced-resolve": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz", - "integrity": "sha1-n0tib1dyRe3PSyrYPYbhf09CHew=" + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.3.0.tgz", + "integrity": "sha512-2qbxE7ek3YxPJ1ML6V+satHkzHpJQKWkRHmRx6mfAoW59yP8YH8BFplbegSP+u2hBd6B6KCOpvJQ3dZAP+hkpg==" }, "entities": { "version": "1.1.1", @@ -1027,9 +1027,9 @@ "integrity": "sha1-B9XOaRJBJA+4F78sSxjW5TAkDfY=" }, "enzyme-matchers": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/enzyme-matchers/-/enzyme-matchers-3.3.0.tgz", - "integrity": "sha512-59dLTPOxsx9sljHdvn5O2A7jbwO14mxXkTrlg+HClRRw+OE6FbcyFtejuDzKl3per3uR651vyMauaKGHjzVakg==" + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/enzyme-matchers/-/enzyme-matchers-3.4.0.tgz", + "integrity": "sha1-SMLbPVxwyKw7CZP3smczZ0V+6pw=" }, "enzyme-to-json": { "version": "1.5.1", @@ -2151,9 +2151,9 @@ "integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE=" }, "hash.js": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.1.tgz", - "integrity": "sha512-I2TYCUjYQMmqmRMCp6jKMC5bvdXxGIZ/heITRR/0F1u0OP920ImEj/cXt3WgcTKBnNYGn7enxUzdai3db829JA==" + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", + "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==" }, "hawk": { "version": "3.1.3", @@ -2181,9 +2181,9 @@ "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=" }, "hosted-git-info": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz", - "integrity": "sha1-AHa59GonBQbduq6lZJaJdGBhKmc=" + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", + "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==" }, "html-encoding-sniffer": { "version": "1.0.1", @@ -2341,9 +2341,9 @@ "integrity": "sha1-wVvz5LZrYtcu+vKSWEhmPsvGGbY=", "dependencies": { "isobject": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.0.tgz", - "integrity": "sha1-OVZSF/NmF4nooKDAgNX35rxG4aA=" + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" } } }, @@ -2582,9 +2582,9 @@ "integrity": "sha1-1Ii8RhKvLCRumG6K52caCZFj1AM=" }, "jest-enzyme": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/jest-enzyme/-/jest-enzyme-3.3.0.tgz", - "integrity": "sha512-bqTP/7JfKmSetyf79Ht38P6hSW6V3t3jTwq+UKmtoAl8PCn4OTvzWZcKtdKrmrcmZKyDTxjngfNdWG0WPjUsyQ==" + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/jest-enzyme/-/jest-enzyme-3.4.0.tgz", + "integrity": "sha1-wZvIzEjNj6py5QQHflwakYe7k+I=" }, "jest-haste-map": { "version": "20.0.4", @@ -2721,9 +2721,9 @@ "integrity": "sha1-0M/R3k9XnymEhJJcKA+PHZTsPKs=" }, "js-tokens": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz", - "integrity": "sha1-COnxMkhKLEWjCQfp3E1VZ7fxFNc=" + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=" }, "js-yaml": { "version": "3.8.4", @@ -2777,9 +2777,9 @@ "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=" }, "jsonfile": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.0.tgz", - "integrity": "sha1-kufHRE5f/V+jLmqa6LhQNN+DR9A=" + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz", + "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=" }, "jsonify": { "version": "0.0.0", @@ -3199,9 +3199,9 @@ "integrity": "sha1-L6nhJgX6EACdRFSdb82KY93g5P8=" }, "normalize-package-data": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz", - "integrity": "sha1-2Bntoqne29H/pWPqQHHZNngilbs=" + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", + "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==" }, "normalize-path": { "version": "2.1.1", @@ -3274,9 +3274,9 @@ "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=" }, "isobject": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.0.tgz", - "integrity": "sha1-OVZSF/NmF4nooKDAgNX35rxG4aA=" + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" } } }, @@ -3636,9 +3636,9 @@ "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=" }, "readable-stream": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.2.tgz", - "integrity": "sha1-WgTfBeT1f+Pw3Gj90R3FyXx+b00=" + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==" }, "readdirp": { "version": "2.1.0", @@ -3815,9 +3815,9 @@ "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" }, "sinon": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-2.3.5.tgz", - "integrity": "sha1-mi/A/41SbacW8wlTqixl1RiRf2w=" + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-2.3.6.tgz", + "integrity": "sha1-lTeOfg+XapcS6bRZH/WznnPcPd4=" }, "slash": { "version": "1.0.0", @@ -3934,14 +3934,24 @@ "integrity": "sha1-VpcPscOFWOnnC3KL894mmsRa36w=" }, "string-width": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.0.0.tgz", - "integrity": "sha1-Y1xUNsxypuDDh87KJ41OLuxSaH4=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.0.tgz", + "integrity": "sha1-AwZkVh/BRslCPsfZeP4kV0N/5tA=", "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" + }, "is-fullwidth-code-point": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=" } } }, @@ -4125,9 +4135,9 @@ "integrity": "sha1-OcKBDAXW9pCNrBWSna4ga0lLc/Q=" }, "ts-loader": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-2.2.0.tgz", - "integrity": "sha512-+NdvTzGoE2pee3U2Arg1DB6VVKxGmog7QEARiQxMh5v5ewDxXMpnfVvMt4YxJsB+XVXtaZGtaWnsCINXT3oXxw==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-2.2.2.tgz", + "integrity": "sha512-HiusedxruMeHN1/BzpijS/rXSdup2P/IopamX235tLS3OuPU+eSXNyN3YgbHKzYEe71YkUhnm7X+VY4oOAGLtg==", "dependencies": { "loader-utils": { "version": "1.1.0", @@ -4152,9 +4162,9 @@ "integrity": "sha1-dhyEArgONHt3M6BDkKdXslNYBGc=" }, "tsutils": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.4.0.tgz", - "integrity": "sha1-rUzm26Dlo+2934Ymt8oEB4IYn+o=" + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.5.1.tgz", + "integrity": "sha1-wgATkMee7Bpcz6esEtWZY5aD4M8=" }, "tty-browserify": { "version": "0.0.0", @@ -4188,9 +4198,9 @@ "integrity": "sha1-A6wGNqNIGRRPvL4K4u2av2wZqQg=" }, "typescript": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.3.4.tgz", - "integrity": "sha1-PTgyGCgjHkNPKHUUlZw3qCtin0I=" + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.4.1.tgz", + "integrity": "sha1-w8yxbdqgsjFN4DHn5v7onlujRrw=" }, "ua-parser-js": { "version": "0.7.13", @@ -4198,9 +4208,9 @@ "integrity": "sha1-zZ3S+GSTs/RNvu7zeA/adMXuFL4=" }, "uglify-js": { - "version": "3.0.20", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.20.tgz", - "integrity": "sha512-O/c2/N97k1Ms+23VRx6gIAfGdijuW53SlASmXy0FVapK63rQrduHyE+5X6hUtqNiSLLao9Uv6ijotpNe8t991Q==", + "version": "3.0.23", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.23.tgz", + "integrity": "sha512-miLHbO2QcdQGxL/q1wLcUr6TGIRHhMnpKyywUbAdZRkJMqCeZCDmBsgYu1Wlj26xHBXN+sU5tHaWh38QsN208g==", "dependencies": { "commander": { "version": "2.9.0", @@ -4359,9 +4369,9 @@ "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=" }, "validator": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/validator/-/validator-7.1.0.tgz", - "integrity": "sha512-FQoOpdJUMXEHZnXBQ2UmSsUOBs6cJUqVt8gpfTQv3yorqZA/v3rT/xH/5Zd9EKndXPL0Am3Qi6t8udKiaJuMfA==" + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/validator/-/validator-7.2.0.tgz", + "integrity": "sha512-c8NGTUYeBEcUIGeMppmNVKHE7wwfm3mYbNZxV+c5mlv9fDHI7Ad3p07qfNrn/CvpdkK2k61fOLRO2sTEhgQXmg==" }, "verror": { "version": "1.3.6", @@ -4416,9 +4426,9 @@ "integrity": "sha1-7pvOvyEkf3FTy0EBaMq0XjpZ1Nc=", "dependencies": { "acorn": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz", - "integrity": "sha1-xGDfCEkUY/AozLguqzcwvwEIez0=" + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.0.tgz", + "integrity": "sha512-WXZ0VTJT8EE25BmZjc+wr0qIwG7QaEna9csPKHS6WQp8gDo4V376wUWi222LXRiuAF6CAS4Ejv736DdRwuPK9g==" }, "ajv": { "version": "5.2.0", @@ -4557,9 +4567,9 @@ "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=" }, "worker-farm": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.3.1.tgz", - "integrity": "sha1-QzMRK7SbF6oFC4eJXKayys9A5f8=" + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.4.1.tgz", + "integrity": "sha512-tgFAtgOYLPutkAyzgpS6VJFL5HY+0ui1Tvua+fITgz8ByaJTMFGtazR6xxQfwfiAcbwE+2fLG/K49wc2TfwCNw==" }, "wrap-ansi": { "version": "2.1.0", diff --git a/package.json b/package.json index 39754dc..ce63571 100644 --- a/package.json +++ b/package.json @@ -10,14 +10,14 @@ "publish": "npm run rush-tools -- publish --access public" }, "devDependencies": { - "@microsoft/rush": "^3.0.9", - "@microsoft/rush-lib": "^3.0.9", + "@microsoft/rush": "^3.0.11", + "@microsoft/rush-lib": "^3.0.11", "@types/shelljs": "^0.7.2", - "@types/yargs": "^6.6.0", + "@types/yargs": "^8.0.0", "mz": "^2.6.0", "shelljs": "^0.7.8", - "ts-node": "^3.0.6", - "typescript": "^2.3.4", + "ts-node": "^3.1.0", + "typescript": "^2.4.1", "yargs": "^8.0.2" } } diff --git a/packages/react-forms-dom/package.json b/packages/react-forms-dom/package.json index 5a6c83e..1e1296f 100644 --- a/packages/react-forms-dom/package.json +++ b/packages/react-forms-dom/package.json @@ -32,31 +32,31 @@ ], "devDependencies": { "@types/chokidar": "^1.7.0", - "@types/enzyme": "^2.8.0", + "@types/enzyme": "^2.8.1", "@types/gulp": "^4.0.4", - "@types/jest": "^20.0.1", - "@types/sinon": "^2.3.1", + "@types/jest": "^20.0.2", + "@types/sinon": "^2.3.2", "@types/undertaker": "^1.1.2", "@types/vinyl-fs": "^2.4.5", - "@types/webpack": "^2.2.16", - "enzyme": "^2.8.2", + "@types/webpack": "^3.0.1", + "enzyme": "^2.9.1", "gulp": "github:gulpjs/gulp#4.0", "jest": "^20.0.4", - "jest-enzyme": "^3.2.0", + "jest-enzyme": "^3.4.0", "react-test-renderer": "^15.6.1", "@simplr/mvdir": "0.0.2", - "sinon": "^2.3.5", + "sinon": "^2.3.6", "source-map-loader": "^0.2.1", "ts-jest": "^20.0.6", - "ts-loader": "^2.1.0", + "ts-loader": "^2.2.2", "tslint": "^5.4.3", - "typescript": "^2.3.4", - "uglify-js": "^3.0.18", + "typescript": "^2.4.1", + "uglify-js": "^3.0.23", "webpack": "^3.0.0" }, "dependencies": { "@types/prop-types": "^15.5.1", - "@types/react": "^15.0.29", + "@types/react": "^15.0.34", "immutable": "^3.8.1", "prop-types": "^15.5.10", "react": "^15.6.1", diff --git a/packages/react-forms-validation/package.json b/packages/react-forms-validation/package.json index f0edd35..ac620b0 100644 --- a/packages/react-forms-validation/package.json +++ b/packages/react-forms-validation/package.json @@ -32,35 +32,35 @@ ], "devDependencies": { "@types/gulp": "^4.0.4", - "@types/webpack": "^2.2.16", - "@types/enzyme": "^2.8.0", - "@types/jest": "^20.0.1", - "@types/sinon": "^2.3.1", + "@types/webpack": "^3.0.1", + "@types/enzyme": "^2.8.1", + "@types/jest": "^20.0.2", + "@types/sinon": "^2.3.2", "gulp": "github:gulpjs/gulp#4.0", "@simplr/mvdir": "0.0.2", - "enzyme": "^2.8.2", + "enzyme": "^2.9.1", "jest": "^20.0.4", - "jest-enzyme": "^3.2.0", + "jest-enzyme": "^3.4.0", "react-dom": "^15.6.1", "react-test-renderer": "^15.6.1", - "sinon": "^2.3.5", + "sinon": "^2.3.6", "ts-jest": "^20.0.6", - "ts-loader": "^2.1.0", + "ts-loader": "^2.2.2", "tslint": "^5.4.3", - "typescript": "^2.3.4", + "typescript": "^2.4.1", "uglifyjs": "^2.4.11", "webpack": "^3.0.0" }, "dependencies": { - "@types/react": "^15.0.29", - "@types/react-dom": "^15.5.0", + "@types/react": "^15.0.34", + "@types/react-dom": "^15.5.1", "@types/validator": "^6.2.0", "action-emitter": "^0.2.1", "immutable": "^3.8.1", "react": "^15.6.1", "@simplr/react-forms": "^4.1.1", "tslib": "^1.7.1", - "validator": "^7.0.0" + "validator": "^7.2.0" }, "jest": { "setupTestFrameworkScriptFile": "./node_modules/jest-enzyme/lib/index.js", diff --git a/packages/react-forms-validation/src/subscribers/form-store-subscriber.ts b/packages/react-forms-validation/src/subscribers/form-store-subscriber.ts index bcf9154..9875a73 100644 --- a/packages/react-forms-validation/src/subscribers/form-store-subscriber.ts +++ b/packages/react-forms-validation/src/subscribers/form-store-subscriber.ts @@ -2,7 +2,6 @@ import * as React from "react"; import * as ActionEmitter from "action-emitter"; import { - FieldValue, FieldValidationType } from "@simplr/react-forms/contracts"; import { FormStore } from "@simplr/react-forms/stores"; @@ -10,7 +9,6 @@ import { FieldRegistered, ValueChanged, FieldPropsChanged, - FieldActive, FieldBlurred } from "@simplr/react-forms/actions"; diff --git a/packages/react-forms/package.json b/packages/react-forms/package.json index 480d630..a2ec20b 100644 --- a/packages/react-forms/package.json +++ b/packages/react-forms/package.json @@ -32,34 +32,34 @@ ], "devDependencies": { "@types/chokidar": "^1.7.0", - "@types/enzyme": "^2.8.0", + "@types/enzyme": "^2.8.1", "@types/gulp": "^4.0.4", - "@types/jest": "^20.0.1", - "@types/sinon": "^2.3.1", + "@types/jest": "^20.0.2", + "@types/sinon": "^2.3.2", "@types/undertaker": "^1.1.2", "@types/vinyl-fs": "^2.4.5", - "@types/webpack": "^2.2.16", - "enzyme": "^2.8.2", + "@types/webpack": "^3.0.1", + "enzyme": "^2.9.1", "gulp": "github:gulpjs/gulp#4.0", "jest": "^20.0.4", - "jest-enzyme": "^3.2.0", + "jest-enzyme": "^3.4.0", "react-test-renderer": "^15.6.1", "@simplr/mvdir": "0.0.2", - "sinon": "^2.3.5", + "sinon": "^2.3.6", "source-map-loader": "^0.2.1", "ts-jest": "^20.0.6", - "ts-loader": "^2.1.0", + "ts-loader": "^2.2.2", "tslint": "^5.4.3", - "typescript": "^2.3.4", - "uglify-js": "^3.0.18", + "typescript": "^2.4.1", + "uglify-js": "^3.0.23", "webpack": "^3.0.0" }, "dependencies": { "@types/fbemitter": "^2.0.32", - "@types/flux": "^3.1.0", + "@types/flux": "^3.1.1", "@types/prop-types": "^15.5.1", - "@types/react": "^15.0.29", - "@types/react-dom": "^15.5.0", + "@types/react": "^15.0.34", + "@types/react-dom": "^15.5.1", "action-emitter": "^0.2.1", "immutable": "^3.8.1", "prop-types": "^15.5.10", diff --git a/packages/react-forms/src/stores/form-store.ts b/packages/react-forms/src/stores/form-store.ts index edec29c..c5d83d3 100644 --- a/packages/react-forms/src/stores/form-store.ts +++ b/packages/react-forms/src/stores/form-store.ts @@ -281,7 +281,7 @@ export class FormStore extends ActionEmitter { this.emit(new Actions.ValueChanged(this.FormId, fieldId)); } - public async ValidateField(fieldId: string, validationPromise: Promise): Promise { + public async ValidateField(fieldId: string, validationPromise: Promise): Promise { const field = this.State.Fields.get(fieldId); const fieldValue = field.Value; @@ -435,7 +435,7 @@ export class FormStore extends ActionEmitter { }); } - public async ValidateForm(validationPromise: Promise): Promise { + public async ValidateForm(validationPromise: Promise): Promise { const form = this.State.Form; // If form is not validating diff --git a/tools/mvdir/dist/contracts.d.ts b/tools/mvdir/dist/contracts.d.ts index d32f443..aeba678 100644 --- a/tools/mvdir/dist/contracts.d.ts +++ b/tools/mvdir/dist/contracts.d.ts @@ -1,4 +1,5 @@ -export interface ArgumentsValues { +import * as yargs from "yargs"; +export interface ArgumentsValues extends yargs.Arguments { config?: string; from: string; to: string; diff --git a/tools/mvdir/package.json b/tools/mvdir/package.json index 589dc14..c128fe4 100644 --- a/tools/mvdir/package.json +++ b/tools/mvdir/package.json @@ -24,15 +24,15 @@ "dependencies": { "@types/mkdirp": "^0.3.29", "@types/mz": "0.0.31", - "@types/node": "^7.0.31", - "@types/yargs": "^6.6.0", + "@types/node": "^8.0.7", + "@types/yargs": "^8.0.0", "mz": "^2.6.0", "yargs": "^8.0.2" }, "devDependencies": { "mkdirp": "^0.5.1", "tslint": "^5.4.3", - "typescript": "^2.3.4" + "typescript": "^2.4.1" }, "bin": { "mvdir": "dist/cli.js" diff --git a/tools/mvdir/src/contracts.ts b/tools/mvdir/src/contracts.ts index d32f443..e452622 100644 --- a/tools/mvdir/src/contracts.ts +++ b/tools/mvdir/src/contracts.ts @@ -1,4 +1,6 @@ -export interface ArgumentsValues { +import * as yargs from "yargs"; + +export interface ArgumentsValues extends yargs.Arguments { config?: string; from: string; to: string; diff --git a/tools/rush-tools.ts b/tools/rush-tools.ts index 8d45e82..537b826 100644 --- a/tools/rush-tools.ts +++ b/tools/rush-tools.ts @@ -65,7 +65,7 @@ class RushTools { } } -interface ArgumentsValues { +interface ArgumentsValues extends yargs.Arguments { config: string; exclude: string[]; From 641a4a6c07cefb73732c8f13a18e7a43a82eb03e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20=C5=BDilinskas?= Date: Tue, 11 Jul 2017 09:46:33 +0300 Subject: [PATCH 04/81] Hotfix: Container base and Submit button (#114) --- common/config/rush/npm-shrinkwrap.json | 136 ++++++++---------- .../react-forms-dom/src/components/submit.tsx | 9 ++ .../src/abstractions/base-container.ts | 13 +- 3 files changed, 83 insertions(+), 75 deletions(-) diff --git a/common/config/rush/npm-shrinkwrap.json b/common/config/rush/npm-shrinkwrap.json index 951aff3..1b0a2b4 100644 --- a/common/config/rush/npm-shrinkwrap.json +++ b/common/config/rush/npm-shrinkwrap.json @@ -101,9 +101,9 @@ "integrity": "sha1-pNgMCC/v5x5Ap8DwfR5lVbu8e1I=" }, "@types/node": { - "version": "8.0.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.7.tgz", - "integrity": "sha512-fuCPLPe4yY0nv6Z1rTLFCEC452jl0k7i3gF/c8hdEKpYtEpt6Sk67hTGbxx8C0wmifFGPvKYd/O8CvS6dpgxMQ==" + "version": "8.0.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.10.tgz", + "integrity": "sha512-ATKQAMGah+e3qNBVdJoCIJk3+RWBkPYtmlluGewO1+t/JmkXEoLnt/WDgHynfGvJyQWTKMq+N1az1E/5YASYGg==" }, "@types/prop-types": { "version": "15.5.1", @@ -111,9 +111,9 @@ "integrity": "sha1-Hs9SYhKZ5luFU3Qzf7Ef0tEGb8E=" }, "@types/react": { - "version": "15.0.34", - "resolved": "https://registry.npmjs.org/@types/react/-/react-15.0.34.tgz", - "integrity": "sha512-BDSzuTYvOJAknO4qSIFb1Y0+BREhwhBDNMrVAu8JPRjosc94jBQJwIZ++H9uK6EInKIrk0PxNVstmwT02H7E/A==" + "version": "15.0.36", + "resolved": "https://registry.npmjs.org/@types/react/-/react-15.0.36.tgz", + "integrity": "sha512-Am1s5MzORBMwPiEW8gP2v+yuRTbRkaq4WNGay4amxue0UryPzm7bI+uSYVMLxsMMCPdCP/IAfrSiA+YUnybx9w==" }, "@types/react-dom": { "version": "15.5.1", @@ -151,9 +151,9 @@ "integrity": "sha1-b2GgvnWiLp72LfaLSAxovONE/l8=" }, "@types/validator": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/@types/validator/-/validator-6.2.0.tgz", - "integrity": "sha1-AgMi/hkp9piJ62daG9tamDlLcfA=" + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/@types/validator/-/validator-6.2.1.tgz", + "integrity": "sha512-YJpvrPjb3C0BBIH9TPt4VEJZYP6yEJIEltPVhhF106d20udxrLYc49YCbT/C4qHCS+TWDF34gNwA3ZFWumFmIw==" }, "@types/vinyl": { "version": "2.0.0", @@ -166,14 +166,14 @@ "integrity": "sha1-c7ISuxg49f/xQ0Hj436VbwVgABs=" }, "@types/webpack": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-3.0.1.tgz", - "integrity": "sha512-rvxpZw2k+u9aesdM39jN+a1f1g/6DeVIYU3601uyiSFMnfHCv+/iHJQiyGzuf4pSZ35LLIamzt9S+ccunuqEZg==" + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-3.0.4.tgz", + "integrity": "sha512-+LjzDICeKZI4N3PUNtzpxPA44/YvhXRBU1bUPj4PlAsquaqahksiIGnZhgZfutwSwcXCIMMu/o0zgEUyWsSkaw==" }, "@types/yargs": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-8.0.0.tgz", - "integrity": "sha512-HR3mkr3OuDvlbT0jtB5mkqOALEXik2mMz0kDNRRXBp7S83rbylqAKcTw+eY0yeTu8Nl7oVLf1nCI7zoJ4j+JMg==" + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-8.0.1.tgz", + "integrity": "sha512-VW1LZGMLomDEF3yr5FlM38gdoKqCkFXPs0q0J57eehhOmZnFh2Z/IKN89g6Q5uQoFxFYIsR9F87+e/tZ8hwUJg==" }, "abab": { "version": "1.0.3", @@ -271,9 +271,9 @@ "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=" }, "arr-flatten": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.3.tgz", - "integrity": "sha1-onTthawIhJtr14R8RYB0XcUa37E=" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", + "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==" }, "arr-map": { "version": "2.0.2", @@ -335,9 +335,9 @@ "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=" }, "asap": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz", - "integrity": "sha1-UidltQw1EEkOUtfc/ghe+bqWlY8=" + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", + "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" }, "asn1": { "version": "0.2.3", @@ -662,9 +662,9 @@ "integrity": "sha1-3FKF8rTiUYIWg2gcOBwziPRuxTQ=" }, "cipher-base": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz", - "integrity": "sha1-7qvxlEGc6QDaMBjCB9IS8qbfCgc=" + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", + "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==" }, "cliui": { "version": "3.2.0", @@ -922,9 +922,9 @@ "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=" }, "diff": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz", - "integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k=" + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.3.0.tgz", + "integrity": "sha512-w0XZubFWn0Adlsapj9EAWX0FqWdO4tz8kc3RiYdWLh4k/V8PTb6i0SMgXt0vRM3zyKnT8tKO7mUlieRQHIjMNg==" }, "diffie-hellman": { "version": "5.0.2", @@ -1057,9 +1057,9 @@ "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=" }, "es5-ext": { - "version": "0.10.23", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.23.tgz", - "integrity": "sha1-dXi1G+l0IHpUh4IbVlOMIk5Oezg=" + "version": "0.10.24", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.24.tgz", + "integrity": "sha1-pVh3yZJLwMjZvTwsvhdJWsFwmxQ=" }, "es6-iterator": { "version": "2.0.1", @@ -1122,9 +1122,9 @@ } }, "esprima": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", - "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", + "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==" }, "esrecurse": { "version": "4.2.0", @@ -1214,9 +1214,9 @@ "integrity": "sha1-Rb4X0Cu5kX1gzP/UmVyZnmyMmUg=" }, "fast-deep-equal": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-0.1.0.tgz", - "integrity": "sha1-XG9FmaumszPuM0Li7ZeGcvEAH40=" + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz", + "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=" }, "fast-levenshtein": { "version": "2.0.6", @@ -2726,9 +2726,9 @@ "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=" }, "js-yaml": { - "version": "3.8.4", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.4.tgz", - "integrity": "sha1-UgtFZPhlc7qWZir4Woyvp7S1pvY=" + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.0.tgz", + "integrity": "sha512-0LoUNELX4S+iofCT8f4uEHIiRBR+c2AINyC8qRWfC6QNruLtxVZRJaPcu/xwMgFIgDxF25tGHaDjvxzJCNE9yw==" }, "jsbn": { "version": "0.1.1", @@ -3815,9 +3815,9 @@ "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" }, "sinon": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-2.3.6.tgz", - "integrity": "sha1-lTeOfg+XapcS6bRZH/WznnPcPd4=" + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-2.3.7.tgz", + "integrity": "sha1-FFFhSi6qsFu02HbBM1zUATLsUSc=" }, "slash": { "version": "1.0.0", @@ -3987,11 +3987,6 @@ "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" }, - "strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" - }, "supports-color": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", @@ -4130,9 +4125,9 @@ "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=" }, "ts-jest": { - "version": "20.0.6", - "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-20.0.6.tgz", - "integrity": "sha1-OcKBDAXW9pCNrBWSna4ga0lLc/Q=" + "version": "20.0.7", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-20.0.7.tgz", + "integrity": "sha512-/btwMYN3nWFvVz/SQscX1KisgrzuPOrFdwZNRU58QcO2Ts8NQ3+FbigWhDIebPwg12sXR+xy3rNMBGJQncm0jA==" }, "ts-loader": { "version": "2.2.2", @@ -4146,25 +4141,20 @@ } } }, - "tsconfig": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/tsconfig/-/tsconfig-6.0.0.tgz", - "integrity": "sha1-aw6DdgA9evGGT434+J3QBZ/80DI=" - }, "tslib": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.7.1.tgz", "integrity": "sha1-vIAEFkaRkjp5/oN4u+s9ogF1OOw=" }, "tslint": { - "version": "5.4.3", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.4.3.tgz", - "integrity": "sha1-dhyEArgONHt3M6BDkKdXslNYBGc=" + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.5.0.tgz", + "integrity": "sha1-EOjas+MGH6YelELozuOYKs8gpqo=" }, "tsutils": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.5.1.tgz", - "integrity": "sha1-wgATkMee7Bpcz6esEtWZY5aD4M8=" + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.6.0.tgz", + "integrity": "sha1-5emceaiszTl3zhjYP98dI1psLrs=" }, "tty-browserify": { "version": "0.0.0", @@ -4208,9 +4198,9 @@ "integrity": "sha1-zZ3S+GSTs/RNvu7zeA/adMXuFL4=" }, "uglify-js": { - "version": "3.0.23", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.23.tgz", - "integrity": "sha512-miLHbO2QcdQGxL/q1wLcUr6TGIRHhMnpKyywUbAdZRkJMqCeZCDmBsgYu1Wlj26xHBXN+sU5tHaWh38QsN208g==", + "version": "3.0.24", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.24.tgz", + "integrity": "sha512-IZ7l7MU2j7LIuz6IAFWBOk1dbuQ0QVQsKLffpNPKXuL8NYcFBBQ5QkvMAtfL1+oaBW16344DY4sA26GI9cXzlA==", "dependencies": { "commander": { "version": "2.9.0", @@ -4421,19 +4411,19 @@ "integrity": "sha1-gBWherg+fhsxFjhIas6B2mziBqA=" }, "webpack": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.0.0.tgz", - "integrity": "sha1-7pvOvyEkf3FTy0EBaMq0XjpZ1Nc=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.1.0.tgz", + "integrity": "sha512-BWF3vW30ZpqscTpIsqUi6gTnXdvoeS+uEcmoAjtg5Yq0xtxebjz8xjDl3AWV4P5Mi3RqS5Xhq+Q5vvcjU3iUAw==", "dependencies": { "acorn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.0.tgz", - "integrity": "sha512-WXZ0VTJT8EE25BmZjc+wr0qIwG7QaEna9csPKHS6WQp8gDo4V376wUWi222LXRiuAF6CAS4Ejv736DdRwuPK9g==" + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz", + "integrity": "sha512-vOk6uEMctu0vQrvuSqFdJyqj1Q0S5VTDL79qtjo+DhRr+1mmaD+tluFSCZqhvi/JUhXSzoZN2BhtstaPEeE8cw==" }, "ajv": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.0.tgz", - "integrity": "sha1-wXNQJMXaLvdcwZBxMHPUTwmL9IY=" + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz", + "integrity": "sha1-R8aNaehvXZUxA7AHSpQw3GPaXjk=" }, "camelcase": { "version": "3.0.0", diff --git a/packages/react-forms-dom/src/components/submit.tsx b/packages/react-forms-dom/src/components/submit.tsx index 520c506..2f9c5c3 100644 --- a/packages/react-forms-dom/src/components/submit.tsx +++ b/packages/react-forms-dom/src/components/submit.tsx @@ -18,12 +18,21 @@ export class Submit extends BaseFormButton = event => { + // If Button is outside of Form context, initiate form submit. + if (this.props.formId !== null) { + this.FormStore.InitiateFormSubmit(); + } + } + public render(): JSX.Element { return ; diff --git a/packages/react-forms/src/abstractions/base-container.ts b/packages/react-forms/src/abstractions/base-container.ts index 47f21c6..9251ab4 100644 --- a/packages/react-forms/src/abstractions/base-container.ts +++ b/packages/react-forms/src/abstractions/base-container.ts @@ -4,6 +4,7 @@ import * as PropTypes from "prop-types"; import { FormStore } from "../stores/form-store"; import { StateChanged } from "../actions/form-store"; import { FSHContainer } from "../stores/form-stores-handler"; +import { EventSubscription } from "action-emitter"; export interface BaseContainerProps { formId?: string; @@ -18,10 +19,12 @@ export abstract class BaseContainer e public context: BaseContainerParentContext; public static contextTypes: PropTypes.ValidationMap = { - FormId: PropTypes.string.isRequired, + FormId: PropTypes.string, FieldId: PropTypes.string }; + private eventStoreSubscription: EventSubscription | undefined; + protected get FormId(): string { const propFormId: string | undefined = this.props.formId; if (propFormId != null) { @@ -53,7 +56,13 @@ export abstract class BaseContainer e throw new Error(`@simplr/react-forms: Container is already in a Form '${this.context.FormId}' context, ${but}.`); } - this.FormStore.addListener(StateChanged, this.OnStoreUpdated.bind(this)); + this.eventStoreSubscription = this.FormStore.addListener(StateChanged, this.OnStoreUpdated.bind(this)); + } + + public componentWillUnmount(): void { + if (this.eventStoreSubscription != null) { + this.eventStoreSubscription.remove(); + } } protected abstract OnStoreUpdated(): void; From efd295aa7d3cef5b4c5306792c758d87101fa2fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20=C5=BDilinskas?= Date: Tue, 11 Jul 2017 09:52:06 +0300 Subject: [PATCH 05/81] v4.1.2 --- packages/react-forms-dom/package.json | 4 ++-- packages/react-forms-validation/package.json | 4 ++-- packages/react-forms/package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/react-forms-dom/package.json b/packages/react-forms-dom/package.json index 1e1296f..a40be15 100644 --- a/packages/react-forms-dom/package.json +++ b/packages/react-forms-dom/package.json @@ -1,6 +1,6 @@ { "name": "@simplr/react-forms-dom", - "version": "4.1.1", + "version": "4.1.2", "description": "DOM components for @simplr/react-forms.", "repository": "SimplrJS/react-forms", "homepage": "https://github.com/SimplrJS/react-forms", @@ -61,7 +61,7 @@ "prop-types": "^15.5.10", "react": "^15.6.1", "react-dom": "^15.6.1", - "@simplr/react-forms": "^4.1.1", + "@simplr/react-forms": "^4.1.2", "tslib": "^1.7.1", "typed-immutable-record": "^0.0.6" }, diff --git a/packages/react-forms-validation/package.json b/packages/react-forms-validation/package.json index ac620b0..d1d1be6 100644 --- a/packages/react-forms-validation/package.json +++ b/packages/react-forms-validation/package.json @@ -1,6 +1,6 @@ { "name": "@simplr/react-forms-validation", - "version": "4.1.1", + "version": "4.1.2", "description": "Validation library for @simplr/react-forms.", "repository": "SimplrJS/react-forms", "homepage": "https://github.com/SimplrJS/react-forms", @@ -58,7 +58,7 @@ "action-emitter": "^0.2.1", "immutable": "^3.8.1", "react": "^15.6.1", - "@simplr/react-forms": "^4.1.1", + "@simplr/react-forms": "^4.1.2", "tslib": "^1.7.1", "validator": "^7.2.0" }, diff --git a/packages/react-forms/package.json b/packages/react-forms/package.json index a2ec20b..3d4ded1 100644 --- a/packages/react-forms/package.json +++ b/packages/react-forms/package.json @@ -1,6 +1,6 @@ { "name": "@simplr/react-forms", - "version": "4.1.1", + "version": "4.1.2", "description": "Shared @simplr/react-forms logic.", "repository": "SimplrJS/react-forms", "homepage": "https://github.com/SimplrJS/react-forms", From c55f82737dccce126e1aaec7cdcc1a11d81542f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20=C5=BDilinskas?= Date: Tue, 11 Jul 2017 14:09:02 +0300 Subject: [PATCH 06/81] Hotfix: Submit button onClick and props (#115) --- package.json | 9 +- .../react-forms-dom/src/components/submit.tsx | 12 +- .../react-forms-dom/src/contracts/form.ts | 4 +- tools/rush-tools-new.ts | 276 ++++++++++++++++++ 4 files changed, 296 insertions(+), 5 deletions(-) create mode 100644 tools/rush-tools-new.ts diff --git a/package.json b/package.json index ce63571..8ce8fa5 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,8 @@ "tools-build": "npm run rush-tools -- run gulp-build -e @simplr/mvdir", "source-build": "npm run rush-tools -- run build -e @simplr/mvdir", "test": "npm run rush-tools -- run test -e @simplr/mvdir", - "rush-tools": "ts-node ./tools/rush-tools.ts", - "publish": "npm run rush-tools -- publish --access public" + "publish": "npm run rush-tools -- publish --access public", + "rush-tools": "ts-node ./tools/rush-tools.ts" }, "devDependencies": { "@microsoft/rush": "^3.0.11", @@ -19,5 +19,10 @@ "ts-node": "^3.1.0", "typescript": "^2.4.1", "yargs": "^8.0.2" + }, + "dependencies": { + "@microsoft/ts-command-line": "^2.0.2", + "@types/semver": "^5.3.32", + "semver": "^5.3.0" } } diff --git a/packages/react-forms-dom/src/components/submit.tsx b/packages/react-forms-dom/src/components/submit.tsx index 2f9c5c3..48751ec 100644 --- a/packages/react-forms-dom/src/components/submit.tsx +++ b/packages/react-forms-dom/src/components/submit.tsx @@ -9,8 +9,13 @@ import { BaseFormButtonProps, BaseFormButtonStateRecord } from "../abstractions/base-form-button"; +import { HTMLElementProps } from "../contracts/field"; -export type SubmitProps = BaseFormButtonProps; +export interface SubmitProps extends BaseFormButtonProps, HTMLElementProps { + fieldIds?: string[]; + + ref?: React.Ref; +} export class Submit extends BaseFormButton { public static defaultProps: BaseFormButtonProps = { @@ -23,6 +28,11 @@ export class Submit extends BaseFormButton, ...parameters: any[]): void | Promise | FormError | string; + (event: React.FormEvent, ...parameters: any[]): void | Promise | FormError | string; } export interface FormOnSubmitCallback { - (event: React.FormEvent, store: FormStore): void | Promise | FormError | string; + (event: React.FormEvent, store: FormStore): void | Promise | FormError | string; } export interface FormProps extends CoreFormProps, React.HTMLProps { diff --git a/tools/rush-tools-new.ts b/tools/rush-tools-new.ts new file mode 100644 index 0000000..1d733ef --- /dev/null +++ b/tools/rush-tools-new.ts @@ -0,0 +1,276 @@ +import * as path from "path"; +import * as shelljs from "shelljs"; +import * as semver from "semver"; + +import { + CommandLineParser, + CommandLineFlagParameter, + CommandLineAction, + CommandLineStringListParameter, + CommandLineStringParameter +} from "@microsoft/ts-command-line"; + +import { RushConfiguration } from "@microsoft/rush-lib"; + +// Tasks + +class ShellTask { + constructor(private rushConfiguration: RushConfiguration, private projects: string[]) { } + + public Execute(command: string): void { + this.consoleWrite(`Starting: ${command}`); + + const failedProjects: string[] = []; + const succeededProjects: string[] = []; + + for (const projectName of this.projects) { + const project = this.rushConfiguration.getProjectByName(projectName); + + shelljs.cd(project.projectFolder); + this.consoleBox(`Package name: ${projectName}`); + + const result = shelljs.exec(command); + + if (result.code === 0) { + succeededProjects.push(projectName); + } else { + failedProjects.push(projectName); + } + } + + if (succeededProjects.length > 0) { + this.consoleBox(`Succeeded projects ${succeededProjects.length}`); + for (const project of succeededProjects) { + this.consoleWrite(project); + } + } + + if (failedProjects.length > 0) { + this.consoleBox(`Failed projects ${failedProjects.length}`); + for (const project of failedProjects) { + this.consoleWrite(project); + } + process.exit(1); + } + } + + private consoleWrite(...text: string[]): void { + console.info(text.join(" ")); + } + + private consoleBox(message: string): void { + this.consoleWrite("===================================="); + this.consoleWrite(message); + this.consoleWrite("===================================="); + } +} + +// Actions + +const defaultRushJsonFile = "rush.json"; + +abstract class BaseAction extends CommandLineAction { + protected RushConfiguration: RushConfiguration; + + protected onExecute(): void { + if (this.RushConfiguration == null) { + this.RushConfiguration = RushConfiguration.loadFromDefaultLocation(); + } + this.run(); + } + + protected abstract run(): void; +} + +class RushRunAction extends BaseAction { + private parser: RushToolsCommandLineParser; + + private excluded: CommandLineStringListParameter; + private script: CommandLineStringParameter; + + constructor(parser: RushToolsCommandLineParser) { + super({ + actionVerb: "run", + summary: "Runs scripts to all projects", + documentation: "Runs scripts to all projects" + }); + this.parser = parser; + } + + protected onDefineParameters(): void { + this.excluded = this.defineStringListParameter({ + parameterShortName: "-e", + parameterLongName: "--exclude", + description: "List of excluded project names" + }); + + this.script = this.defineStringParameter({ + parameterShortName: "-s", + parameterLongName: "--script", + description: "Name of script that will be run in projects" + }); + } + + protected run(): void { + if (this.script.value == null) { + console.error("[RUN] Please specify script name with --script/-s parameter."); + process.exit(1); + } + + const excludedProjects = this.excluded.value; + const projects = this.RushConfiguration + .projects + .map(x => x.packageName) + .filter(x => excludedProjects.indexOf(x) === -1); + + const task = new ShellTask(this.RushConfiguration, projects); + task.Execute(`npm run ${this.script.value}`); + } +} + +class RushPublicAction extends BaseAction { + private parser: RushToolsCommandLineParser; + + private excluded: CommandLineStringListParameter; + private access: CommandLineStringParameter; + + constructor(parser: RushToolsCommandLineParser) { + super({ + actionVerb: "publish", + summary: "Runs publish script on all projects", + documentation: "Runs publish script on all projects" + }); + this.parser = parser; + } + + protected onDefineParameters(): void { + this.excluded = this.defineStringListParameter({ + parameterShortName: "-e", + parameterLongName: "--exclude", + description: "List of excluded project names" + }); + + this.access = this.defineStringParameter({ + parameterLongName: "--access", + description: "Publish package to public/private" + }); + } + + protected run(): void { + const excludedProjects = this.excluded.value || []; + const projects = this.RushConfiguration + .projects + .filter(x => x.shouldPublish) + .map(x => x.packageName) + .filter(x => excludedProjects.indexOf(x) === -1); + + const task = new ShellTask(this.RushConfiguration, projects); + const access = this.access.value != null ? `--access ${this.access.value}` : ""; + task.Execute(`npm publish ${access}`); + } +} + +class RushVersionsAction extends BaseAction { + private parser: RushToolsCommandLineParser; + private publishOnly: CommandLineFlagParameter; + + constructor(parser: RushToolsCommandLineParser) { + super({ + actionVerb: "versions", + summary: "Prints list of projects versions", + documentation: "Prints list of projects versions" + }); + this.parser = parser; + } + + protected onDefineParameters(): void { + this.publishOnly = this.defineFlagParameter({ + parameterLongName: "--publishOnly", + description: "List only for publish" + }); + } + + protected run(): void { + const { projects } = this.RushConfiguration; + const publishOnly = this.publishOnly.value; + + console.info(`Projects: ${projects.length}`); + console.info("======================================"); + for (const project of projects) { + if (publishOnly && !project.shouldPublish) { + continue; + } + console.info(`${project.packageName}@${project.packageJson.version}`); + } + } +} + +class RushBumpAction extends BaseAction { + private parser: RushToolsCommandLineParser; + + private excluded: CommandLineStringListParameter; + private increment: CommandLineStringParameter; + + constructor(parser: RushToolsCommandLineParser) { + super({ + actionVerb: "bump", + summary: "Bumps versions to all projects that have shouldPublish", + documentation: "Bumps versions to all projects that have shouldPublish" + }); + this.parser = parser; + } + + protected onDefineParameters(): void { + this.excluded = this.defineStringListParameter({ + parameterShortName: "-e", + parameterLongName: "--exclude", + description: "List of excluded project names" + }); + + this.increment = this.defineStringParameter({ + parameterShortName: "-i", + parameterLongName: "--inc", + description: "Release type: major, premajor, minor, preminor, patch, prepatch, or prerelease." + }); + } + + protected run(): void { + if (this.increment.value == null) { + console.error("[BUMP] Please specify bump type: major, premajor, minor, preminor, patch, prepatch, or prerelease."); + process.exit(1); + } + + + + const excludedProjects = this.excluded.value || []; + } + + +} + +// CLI + +class RushToolsCommandLineParser extends CommandLineParser { + constructor() { + super({ + toolFilename: "rush-tools", + toolDescription: "Rush tools for rush single repo tool" + }); + + this.populateActions(); + } + + protected onDefineParameters(): void { + // Abstract + } + + private populateActions(): void { + this.addAction(new RushRunAction(this)); + this.addAction(new RushPublicAction(this)); + this.addAction(new RushVersionsAction(this)); + } +} + +const cli = new RushToolsCommandLineParser(); +cli.execute(); + From 5f77a496a4cd32ea849152cc4ea4bb67f1fa3993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20=C5=BDilinskas?= Date: Tue, 11 Jul 2017 14:14:30 +0300 Subject: [PATCH 07/81] v4.1.3 --- packages/react-forms-dom/package.json | 4 ++-- packages/react-forms-validation/package.json | 4 ++-- packages/react-forms/package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/react-forms-dom/package.json b/packages/react-forms-dom/package.json index a40be15..2e530a2 100644 --- a/packages/react-forms-dom/package.json +++ b/packages/react-forms-dom/package.json @@ -1,6 +1,6 @@ { "name": "@simplr/react-forms-dom", - "version": "4.1.2", + "version": "4.1.3", "description": "DOM components for @simplr/react-forms.", "repository": "SimplrJS/react-forms", "homepage": "https://github.com/SimplrJS/react-forms", @@ -61,7 +61,7 @@ "prop-types": "^15.5.10", "react": "^15.6.1", "react-dom": "^15.6.1", - "@simplr/react-forms": "^4.1.2", + "@simplr/react-forms": "^4.1.3", "tslib": "^1.7.1", "typed-immutable-record": "^0.0.6" }, diff --git a/packages/react-forms-validation/package.json b/packages/react-forms-validation/package.json index d1d1be6..0e236a2 100644 --- a/packages/react-forms-validation/package.json +++ b/packages/react-forms-validation/package.json @@ -1,6 +1,6 @@ { "name": "@simplr/react-forms-validation", - "version": "4.1.2", + "version": "4.1.3", "description": "Validation library for @simplr/react-forms.", "repository": "SimplrJS/react-forms", "homepage": "https://github.com/SimplrJS/react-forms", @@ -58,7 +58,7 @@ "action-emitter": "^0.2.1", "immutable": "^3.8.1", "react": "^15.6.1", - "@simplr/react-forms": "^4.1.2", + "@simplr/react-forms": "^4.1.3", "tslib": "^1.7.1", "validator": "^7.2.0" }, diff --git a/packages/react-forms/package.json b/packages/react-forms/package.json index 3d4ded1..40ad865 100644 --- a/packages/react-forms/package.json +++ b/packages/react-forms/package.json @@ -1,6 +1,6 @@ { "name": "@simplr/react-forms", - "version": "4.1.2", + "version": "4.1.3", "description": "Shared @simplr/react-forms logic.", "repository": "SimplrJS/react-forms", "homepage": "https://github.com/SimplrJS/react-forms", From b87fe73c1f97340d5036f3e17bd9f7740fc7f78e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20=C5=BDilinskas?= Date: Wed, 12 Jul 2017 19:12:00 +0300 Subject: [PATCH 08/81] Hotfix: Submit (#116) --- .travis.yml | 2 +- package.json | 15 +- .../react-forms-dom/src/components/submit.tsx | 12 +- tools/rush-tools-new.ts | 276 ---------------- tools/rush-tools.ts | 295 ++++++++++++------ 5 files changed, 208 insertions(+), 392 deletions(-) delete mode 100644 tools/rush-tools-new.ts diff --git a/.travis.yml b/.travis.yml index 822abc0..0deb2a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ notifications: node_js: - stable script: -- npm run generate +- npm run rush-install - npm run tools-build - npm run source-build - npm test diff --git a/package.json b/package.json index 8ce8fa5..0e2d6bc 100644 --- a/package.json +++ b/package.json @@ -2,10 +2,10 @@ "name": "@simplr/react-forms-repo", "private": true, "scripts": { - "generate": "rush generate", - "tools-build": "npm run rush-tools -- run gulp-build -e @simplr/mvdir", - "source-build": "npm run rush-tools -- run build -e @simplr/mvdir", - "test": "npm run rush-tools -- run test -e @simplr/mvdir", + "rush-install": "rush install", + "tools-build": "npm run rush-tools -- run -s gulp-build -e @simplr/mvdir", + "source-build": "npm run rush-tools -- run -s build -e @simplr/mvdir", + "test": "npm run rush-tools -- run -s test -e @simplr/mvdir", "publish": "npm run rush-tools -- publish --access public", "rush-tools": "ts-node ./tools/rush-tools.ts" }, @@ -13,16 +13,13 @@ "@microsoft/rush": "^3.0.11", "@microsoft/rush-lib": "^3.0.11", "@types/shelljs": "^0.7.2", - "@types/yargs": "^8.0.0", "mz": "^2.6.0", "shelljs": "^0.7.8", "ts-node": "^3.1.0", "typescript": "^2.4.1", - "yargs": "^8.0.2" - }, - "dependencies": { "@microsoft/ts-command-line": "^2.0.2", "@types/semver": "^5.3.32", "semver": "^5.3.0" - } + }, + "dependencies": {} } diff --git a/packages/react-forms-dom/src/components/submit.tsx b/packages/react-forms-dom/src/components/submit.tsx index 48751ec..d44822b 100644 --- a/packages/react-forms-dom/src/components/submit.tsx +++ b/packages/react-forms-dom/src/components/submit.tsx @@ -12,8 +12,6 @@ import { import { HTMLElementProps } from "../contracts/field"; export interface SubmitProps extends BaseFormButtonProps, HTMLElementProps { - fieldIds?: string[]; - ref?: React.Ref; } @@ -23,11 +21,9 @@ export class Submit extends BaseFormButton = event => { - // If Button is outside of Form context, initiate form submit. - if (this.props.formId !== null) { - this.FormStore.InitiateFormSubmit(); - } + protected OnClick: React.MouseEventHandler = event => { + event.preventDefault(); + this.FormStore.InitiateFormSubmit(); if (this.props.onClick != null) { event.persist(); @@ -41,7 +37,7 @@ export class Submit extends BaseFormButton {this.props.children} diff --git a/tools/rush-tools-new.ts b/tools/rush-tools-new.ts deleted file mode 100644 index 1d733ef..0000000 --- a/tools/rush-tools-new.ts +++ /dev/null @@ -1,276 +0,0 @@ -import * as path from "path"; -import * as shelljs from "shelljs"; -import * as semver from "semver"; - -import { - CommandLineParser, - CommandLineFlagParameter, - CommandLineAction, - CommandLineStringListParameter, - CommandLineStringParameter -} from "@microsoft/ts-command-line"; - -import { RushConfiguration } from "@microsoft/rush-lib"; - -// Tasks - -class ShellTask { - constructor(private rushConfiguration: RushConfiguration, private projects: string[]) { } - - public Execute(command: string): void { - this.consoleWrite(`Starting: ${command}`); - - const failedProjects: string[] = []; - const succeededProjects: string[] = []; - - for (const projectName of this.projects) { - const project = this.rushConfiguration.getProjectByName(projectName); - - shelljs.cd(project.projectFolder); - this.consoleBox(`Package name: ${projectName}`); - - const result = shelljs.exec(command); - - if (result.code === 0) { - succeededProjects.push(projectName); - } else { - failedProjects.push(projectName); - } - } - - if (succeededProjects.length > 0) { - this.consoleBox(`Succeeded projects ${succeededProjects.length}`); - for (const project of succeededProjects) { - this.consoleWrite(project); - } - } - - if (failedProjects.length > 0) { - this.consoleBox(`Failed projects ${failedProjects.length}`); - for (const project of failedProjects) { - this.consoleWrite(project); - } - process.exit(1); - } - } - - private consoleWrite(...text: string[]): void { - console.info(text.join(" ")); - } - - private consoleBox(message: string): void { - this.consoleWrite("===================================="); - this.consoleWrite(message); - this.consoleWrite("===================================="); - } -} - -// Actions - -const defaultRushJsonFile = "rush.json"; - -abstract class BaseAction extends CommandLineAction { - protected RushConfiguration: RushConfiguration; - - protected onExecute(): void { - if (this.RushConfiguration == null) { - this.RushConfiguration = RushConfiguration.loadFromDefaultLocation(); - } - this.run(); - } - - protected abstract run(): void; -} - -class RushRunAction extends BaseAction { - private parser: RushToolsCommandLineParser; - - private excluded: CommandLineStringListParameter; - private script: CommandLineStringParameter; - - constructor(parser: RushToolsCommandLineParser) { - super({ - actionVerb: "run", - summary: "Runs scripts to all projects", - documentation: "Runs scripts to all projects" - }); - this.parser = parser; - } - - protected onDefineParameters(): void { - this.excluded = this.defineStringListParameter({ - parameterShortName: "-e", - parameterLongName: "--exclude", - description: "List of excluded project names" - }); - - this.script = this.defineStringParameter({ - parameterShortName: "-s", - parameterLongName: "--script", - description: "Name of script that will be run in projects" - }); - } - - protected run(): void { - if (this.script.value == null) { - console.error("[RUN] Please specify script name with --script/-s parameter."); - process.exit(1); - } - - const excludedProjects = this.excluded.value; - const projects = this.RushConfiguration - .projects - .map(x => x.packageName) - .filter(x => excludedProjects.indexOf(x) === -1); - - const task = new ShellTask(this.RushConfiguration, projects); - task.Execute(`npm run ${this.script.value}`); - } -} - -class RushPublicAction extends BaseAction { - private parser: RushToolsCommandLineParser; - - private excluded: CommandLineStringListParameter; - private access: CommandLineStringParameter; - - constructor(parser: RushToolsCommandLineParser) { - super({ - actionVerb: "publish", - summary: "Runs publish script on all projects", - documentation: "Runs publish script on all projects" - }); - this.parser = parser; - } - - protected onDefineParameters(): void { - this.excluded = this.defineStringListParameter({ - parameterShortName: "-e", - parameterLongName: "--exclude", - description: "List of excluded project names" - }); - - this.access = this.defineStringParameter({ - parameterLongName: "--access", - description: "Publish package to public/private" - }); - } - - protected run(): void { - const excludedProjects = this.excluded.value || []; - const projects = this.RushConfiguration - .projects - .filter(x => x.shouldPublish) - .map(x => x.packageName) - .filter(x => excludedProjects.indexOf(x) === -1); - - const task = new ShellTask(this.RushConfiguration, projects); - const access = this.access.value != null ? `--access ${this.access.value}` : ""; - task.Execute(`npm publish ${access}`); - } -} - -class RushVersionsAction extends BaseAction { - private parser: RushToolsCommandLineParser; - private publishOnly: CommandLineFlagParameter; - - constructor(parser: RushToolsCommandLineParser) { - super({ - actionVerb: "versions", - summary: "Prints list of projects versions", - documentation: "Prints list of projects versions" - }); - this.parser = parser; - } - - protected onDefineParameters(): void { - this.publishOnly = this.defineFlagParameter({ - parameterLongName: "--publishOnly", - description: "List only for publish" - }); - } - - protected run(): void { - const { projects } = this.RushConfiguration; - const publishOnly = this.publishOnly.value; - - console.info(`Projects: ${projects.length}`); - console.info("======================================"); - for (const project of projects) { - if (publishOnly && !project.shouldPublish) { - continue; - } - console.info(`${project.packageName}@${project.packageJson.version}`); - } - } -} - -class RushBumpAction extends BaseAction { - private parser: RushToolsCommandLineParser; - - private excluded: CommandLineStringListParameter; - private increment: CommandLineStringParameter; - - constructor(parser: RushToolsCommandLineParser) { - super({ - actionVerb: "bump", - summary: "Bumps versions to all projects that have shouldPublish", - documentation: "Bumps versions to all projects that have shouldPublish" - }); - this.parser = parser; - } - - protected onDefineParameters(): void { - this.excluded = this.defineStringListParameter({ - parameterShortName: "-e", - parameterLongName: "--exclude", - description: "List of excluded project names" - }); - - this.increment = this.defineStringParameter({ - parameterShortName: "-i", - parameterLongName: "--inc", - description: "Release type: major, premajor, minor, preminor, patch, prepatch, or prerelease." - }); - } - - protected run(): void { - if (this.increment.value == null) { - console.error("[BUMP] Please specify bump type: major, premajor, minor, preminor, patch, prepatch, or prerelease."); - process.exit(1); - } - - - - const excludedProjects = this.excluded.value || []; - } - - -} - -// CLI - -class RushToolsCommandLineParser extends CommandLineParser { - constructor() { - super({ - toolFilename: "rush-tools", - toolDescription: "Rush tools for rush single repo tool" - }); - - this.populateActions(); - } - - protected onDefineParameters(): void { - // Abstract - } - - private populateActions(): void { - this.addAction(new RushRunAction(this)); - this.addAction(new RushPublicAction(this)); - this.addAction(new RushVersionsAction(this)); - } -} - -const cli = new RushToolsCommandLineParser(); -cli.execute(); - diff --git a/tools/rush-tools.ts b/tools/rush-tools.ts index 537b826..9323db5 100644 --- a/tools/rush-tools.ts +++ b/tools/rush-tools.ts @@ -1,129 +1,228 @@ -import * as shelljs from "shelljs"; import * as path from "path"; +import * as shelljs from "shelljs"; +import * as semver from "semver"; + +import { + CommandLineParser, + CommandLineFlagParameter, + CommandLineAction, + CommandLineStringListParameter, + CommandLineStringParameter +} from "@microsoft/ts-command-line"; + import { RushConfiguration } from "@microsoft/rush-lib"; -import * as yargs from "yargs"; -const version = "0.1.0"; -const defaultRushJsonFile = "rush.json"; +// Tasks + +class ShellTask { + constructor(private rushConfiguration: RushConfiguration, private projects: string[]) { } + + public Execute(command: string): void { + console.info(`Starting: ${command}`); + + const failedProjects: string[] = []; + const succeededProjects: string[] = []; + + for (const projectName of this.projects) { + const project = this.rushConfiguration.getProjectByName(projectName); -class RushTools { - private rushConfiguration: RushConfiguration; + shelljs.cd(project.projectFolder); + this.consoleBox(`Package name: ${projectName}`); - constructor(args: ArgumentsValues) { - const rushConfigurationPath = path.resolve(process.cwd(), args.config); - this.rushConfiguration = RushConfiguration.loadFromConfigurationFile(rushConfigurationPath); + const result = shelljs.exec(command); - if (args.run) { - this.runScript(`npm run ${args.script}`, args.exclude); - } else if (args.publish) { - const excludedPackages: string[] = args.exclude != null ? args.exclude : []; - const { projects } = this.rushConfiguration; + if (result.code === 0) { + succeededProjects.push(projectName); + } else { + failedProjects.push(projectName); + } + } - for (const project of projects) { - if (!project.shouldPublish) { - excludedPackages.push(project.packageName); - } + if (succeededProjects.length > 0) { + this.consoleBox(`Succeeded projects ${succeededProjects.length}`); + for (const project of succeededProjects) { + console.info(project); } + } - const access = args.access != null ? `--access ${args.access}` : ""; - this.runScript(`npm publish ${access}`, excludedPackages); + if (failedProjects.length > 0) { + this.consoleBox(`Failed projects ${failedProjects.length}`); + for (const project of failedProjects) { + console.info(project); + } + process.exit(1); } } - private runScript(command: string, excludePackageNames?: string[]): void { - const { projects } = this.rushConfiguration; + private consoleBox(message: string): void { + console.info("===================================="); + console.info(message); + console.info("===================================="); + } +} + +// Actions - const failedPackages: string[] = []; +const defaultRushJsonFile = "rush.json"; - for (const project of projects) { - // Skip package if it is in excluded list. - if (excludePackageNames != null && - excludePackageNames.indexOf(project.packageName) !== -1) { - continue; - } - shelljs.cd(project.projectFolder); - console.info("===================================="); - console.info(`Package name: ${project.packageName}`); - console.info("===================================="); - const result = shelljs.exec(command); +abstract class BaseAction extends CommandLineAction { + protected RushConfiguration: RushConfiguration; - if (result.code !== 0) { - failedPackages.push(project.packageName); - } + protected onExecute(): void { + if (this.RushConfiguration == null) { + this.RushConfiguration = RushConfiguration.loadFromDefaultLocation(); } + this.run(); + } - if (failedPackages.length > 0) { - console.info("==================================="); - console.info(`Failed packages: ${failedPackages.length}`); - console.info("==================================="); - for (const failedPackage of failedPackages) { - console.info(failedPackage); - } + protected abstract run(): void; +} + +class RushRunAction extends BaseAction { + private parser: RushToolsCommandLineParser; + + private excluded: CommandLineStringListParameter; + private script: CommandLineStringParameter; + + constructor(parser: RushToolsCommandLineParser) { + super({ + actionVerb: "run", + summary: "Runs scripts to all projects", + documentation: "Runs scripts to all projects" + }); + this.parser = parser; + } + + protected onDefineParameters(): void { + this.excluded = this.defineStringListParameter({ + parameterShortName: "-e", + parameterLongName: "--exclude", + description: "List of excluded project names" + }); + this.script = this.defineStringParameter({ + parameterShortName: "-s", + parameterLongName: "--script", + description: "Name of script that will be run in projects" + }); + } + + protected run(): void { + if (this.script.value == null) { + console.error("[RUN] Please specify script name with --script/-s parameter."); process.exit(1); } + + const excludedProjects = this.excluded.value; + const projects = this.RushConfiguration + .projects + .map(x => x.packageName) + .filter(x => excludedProjects.indexOf(x) === -1); + + const task = new ShellTask(this.RushConfiguration, projects); + task.Execute(`npm run ${this.script.value}`); } } -interface ArgumentsValues extends yargs.Arguments { - config: string; - exclude: string[]; +class RushPublicAction extends BaseAction { + private parser: RushToolsCommandLineParser; + + private excluded: CommandLineStringListParameter; + private access: CommandLineStringParameter; + + constructor(parser: RushToolsCommandLineParser) { + super({ + actionVerb: "publish", + summary: "Runs publish script on all projects", + documentation: "Runs publish script on all projects" + }); + this.parser = parser; + } + + protected onDefineParameters(): void { + this.excluded = this.defineStringListParameter({ + parameterShortName: "-e", + parameterLongName: "--exclude", + description: "List of excluded project names" + }); - run: boolean; - script: string; + this.access = this.defineStringParameter({ + parameterLongName: "--access", + description: "Publish package to public/private" + }); + } - publish: boolean; - access: string; + protected run(): void { + const excludedProjects = this.excluded.value || []; + const projects = this.RushConfiguration + .projects + .filter(x => x.shouldPublish) + .map(x => x.packageName) + .filter(x => excludedProjects.indexOf(x) === -1); + + const task = new ShellTask(this.RushConfiguration, projects); + const access = this.access.value != null ? `--access ${this.access.value}` : ""; + task.Execute(`npm publish ${access}`); + } } -const argv = yargs - .help("h", "Show help.") - .alias("h", "help") - .version(() => `Current version: ${version}.`) - .alias("v", "version") - .option("c", { - alias: "config", - describe: "Relative path to rush config", - type: "string", - default: path.relative(process.cwd(), defaultRushJsonFile) - }) - .option("e", { - alias: "exclude", - describe: "Excluding package names list", - type: "array" - }) - .command( - "run", - "Run package.json script", - yargs => yargs, - argvObj => { - const args: string[] = argvObj._; - - const filteredArgs = args.map(arg => { - if (arg.length > 0 && arg[0] === "-") { - return false; - } - return arg; +class RushVersionsAction extends BaseAction { + private parser: RushToolsCommandLineParser; + private publishOnly: CommandLineFlagParameter; + + constructor(parser: RushToolsCommandLineParser) { + super({ + actionVerb: "versions", + summary: "Prints list of projects versions", + documentation: "Prints list of projects versions" + }); + this.parser = parser; + } + + protected onDefineParameters(): void { + this.publishOnly = this.defineFlagParameter({ + parameterLongName: "--publishOnly", + description: "List only for publish" }); - const script = filteredArgs.slice(1, filteredArgs.length).join(" "); + } + + protected run(): void { + const { projects } = this.RushConfiguration; + const publishOnly = this.publishOnly.value; - if (script.length === 0) { - throw Error("rush-tools: Script name is required"); + console.info(`Projects: ${projects.length}`); + console.info("======================================"); + for (const project of projects) { + if (publishOnly && !project.shouldPublish) { + continue; + } + console.info(`${project.packageName}@${project.packageJson.version}`); } + } +} + +// CLI + +class RushToolsCommandLineParser extends CommandLineParser { + constructor() { + super({ + toolFilename: "rush-tools", + toolDescription: "Rush tools for rush single repo tool" + }); + + this.populateActions(); + } + + protected onDefineParameters(): void { + // Abstract + } + + private populateActions(): void { + this.addAction(new RushRunAction(this)); + this.addAction(new RushPublicAction(this)); + this.addAction(new RushVersionsAction(this)); + } +} - argvObj.run = true; - argvObj.script = script; - }) - .command( - "publish", - "Publish projects", - yargs => yargs.option("access", { - type: "string" - }), - argvObj => { - argvObj.publish = true; - }) - .demandCommand(1, "You need run a command") - .argv as ArgumentsValues; - -new RushTools(argv); +const cli = new RushToolsCommandLineParser(); +cli.execute(); From faeb74b6cf20427427936c8ed3716098a44d1336 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20=C5=BDilinskas?= Date: Wed, 12 Jul 2017 19:21:07 +0300 Subject: [PATCH 09/81] v4.1.4 --- packages/react-forms-dom/package.json | 4 ++-- packages/react-forms-validation/package.json | 4 ++-- packages/react-forms/package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/react-forms-dom/package.json b/packages/react-forms-dom/package.json index 2e530a2..a48df48 100644 --- a/packages/react-forms-dom/package.json +++ b/packages/react-forms-dom/package.json @@ -1,6 +1,6 @@ { "name": "@simplr/react-forms-dom", - "version": "4.1.3", + "version": "4.1.4", "description": "DOM components for @simplr/react-forms.", "repository": "SimplrJS/react-forms", "homepage": "https://github.com/SimplrJS/react-forms", @@ -61,7 +61,7 @@ "prop-types": "^15.5.10", "react": "^15.6.1", "react-dom": "^15.6.1", - "@simplr/react-forms": "^4.1.3", + "@simplr/react-forms": "^4.1.4", "tslib": "^1.7.1", "typed-immutable-record": "^0.0.6" }, diff --git a/packages/react-forms-validation/package.json b/packages/react-forms-validation/package.json index 0e236a2..1e2aac6 100644 --- a/packages/react-forms-validation/package.json +++ b/packages/react-forms-validation/package.json @@ -1,6 +1,6 @@ { "name": "@simplr/react-forms-validation", - "version": "4.1.3", + "version": "4.1.4", "description": "Validation library for @simplr/react-forms.", "repository": "SimplrJS/react-forms", "homepage": "https://github.com/SimplrJS/react-forms", @@ -58,7 +58,7 @@ "action-emitter": "^0.2.1", "immutable": "^3.8.1", "react": "^15.6.1", - "@simplr/react-forms": "^4.1.3", + "@simplr/react-forms": "^4.1.4", "tslib": "^1.7.1", "validator": "^7.2.0" }, diff --git a/packages/react-forms/package.json b/packages/react-forms/package.json index 40ad865..d16ffb3 100644 --- a/packages/react-forms/package.json +++ b/packages/react-forms/package.json @@ -1,6 +1,6 @@ { "name": "@simplr/react-forms", - "version": "4.1.3", + "version": "4.1.4", "description": "Shared @simplr/react-forms logic.", "repository": "SimplrJS/react-forms", "homepage": "https://github.com/SimplrJS/react-forms", From e8691f4d46aa082367bc0cfc72280f0390a8ab35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20=C5=BDilinskas?= Date: Tue, 18 Jul 2017 17:30:39 +0300 Subject: [PATCH 10/81] Hotfix: Forms added missing spread props (#117) --- .../src/abstractions/base-dom-field.tsx | 4 +- .../src/components/checkbox.tsx | 4 +- .../react-forms-dom/src/components/email.tsx | 8 +--- .../react-forms-dom/src/components/form.tsx | 38 ++++++++++++++++++- .../react-forms-dom/src/components/number.tsx | 8 +--- .../src/components/password.tsx | 8 +--- .../src/components/radio-group.tsx | 2 +- .../react-forms-dom/src/components/search.tsx | 8 +--- .../react-forms-dom/src/components/select.tsx | 8 +--- .../react-forms-dom/src/components/text.tsx | 4 +- .../src/components/textarea.tsx | 4 +- .../react-forms-dom/src/contracts/form.ts | 10 +---- 12 files changed, 55 insertions(+), 51 deletions(-) diff --git a/packages/react-forms-dom/src/abstractions/base-dom-field.tsx b/packages/react-forms-dom/src/abstractions/base-dom-field.tsx index 545efcb..26862d6 100644 --- a/packages/react-forms-dom/src/abstractions/base-dom-field.tsx +++ b/packages/react-forms-dom/src/abstractions/base-dom-field.tsx @@ -5,7 +5,7 @@ import { DomComponentData, DomFieldDetails } from "../contracts/field"; -import { FormProps } from "../contracts/form"; +import { BaseFormProps } from "../contracts/form"; export type BaseDomFieldState = BaseFieldState; @@ -31,7 +31,7 @@ export abstract class BaseDomField; diff --git a/packages/react-forms-dom/src/components/email.tsx b/packages/react-forms-dom/src/components/email.tsx index a649f7e..4bc0a10 100644 --- a/packages/react-forms-dom/src/components/email.tsx +++ b/packages/react-forms-dom/src/components/email.tsx @@ -4,12 +4,8 @@ import { DomFieldProps } from "../contracts/field"; import { BaseDomField, BaseDomFieldState } from "../abstractions/base-dom-field"; import { FieldOnChangeCallback } from "../contracts/field"; -import { - HTMLElementProps -} from "../contracts/field"; -import { - FormProps -} from "../contracts/form"; +import { HTMLElementProps } from "../contracts/field"; +import { FormProps } from "./form"; export type EmailOnChangeCallback = FieldOnChangeCallback; diff --git a/packages/react-forms-dom/src/components/form.tsx b/packages/react-forms-dom/src/components/form.tsx index 7d6baa0..bee3607 100644 --- a/packages/react-forms-dom/src/components/form.tsx +++ b/packages/react-forms-dom/src/components/form.tsx @@ -1,7 +1,24 @@ import * as React from "react"; import { BaseForm } from "@simplr/react-forms"; -import { FormProps } from "../contracts/form"; +import { + BaseFormProps, + FormOnSubmitCallback, + FormOnSubmitInternalCallback +} from "../contracts/form"; + +import { + FieldOnChangeCallback, + FieldOnChangeInternalCallback, + HTMLElementProps +} from "../contracts/field"; + +export interface FormProps extends BaseFormProps, HTMLElementProps { + onSubmit?: FormOnSubmitCallback & FormOnSubmitInternalCallback; + onChange?: FieldOnChangeCallback & FieldOnChangeInternalCallback; + + ref?: React.Ref
; +} export class Form extends BaseForm { public Element: HTMLFormElement | null; @@ -43,10 +60,29 @@ export class Form extends BaseForm { this.FormStore.SubmitForm(result); } + protected GetHTMLProps(props: BaseFormProps): {} { + const { + formId, + preventSubmitDefaultAndPropagation, + template, + formStore, + destroyOnUnmount, + forceSubmit, + disabled, + fieldsValidationType, + formValidationType, + onMount, + ...restProps + } = props; + + return restProps; + } + public render(): JSX.Element { return {this.props.children} ; diff --git a/packages/react-forms-dom/src/components/number.tsx b/packages/react-forms-dom/src/components/number.tsx index 92017c4..8f3b512 100644 --- a/packages/react-forms-dom/src/components/number.tsx +++ b/packages/react-forms-dom/src/components/number.tsx @@ -4,12 +4,8 @@ import { DomFieldProps } from "../contracts/field"; import { BaseDomField, BaseDomFieldState } from "../abstractions/base-dom-field"; import { FieldOnChangeCallback } from "../contracts/field"; -import { - HTMLElementProps -} from "../contracts/field"; -import { - FormProps -} from "../contracts/form"; +import { HTMLElementProps } from "../contracts/field"; +import { FormProps } from "./form"; import { StringToDecimalModifier } from "@simplr/react-forms/modifiers"; export type NumberOnChangeCallback = FieldOnChangeCallback; diff --git a/packages/react-forms-dom/src/components/password.tsx b/packages/react-forms-dom/src/components/password.tsx index 92f1d58..25ce13f 100644 --- a/packages/react-forms-dom/src/components/password.tsx +++ b/packages/react-forms-dom/src/components/password.tsx @@ -4,12 +4,8 @@ import { DomFieldProps } from "../contracts/field"; import { BaseDomField, BaseDomFieldState } from "../abstractions/base-dom-field"; import { FieldOnChangeCallback } from "../contracts/field"; -import { - HTMLElementProps -} from "../contracts/field"; -import { - FormProps -} from "../contracts/form"; +import { HTMLElementProps } from "../contracts/field"; +import { FormProps } from "./form"; export type PasswordOnChangeCallback = FieldOnChangeCallback; diff --git a/packages/react-forms-dom/src/components/radio-group.tsx b/packages/react-forms-dom/src/components/radio-group.tsx index 42503ff..ebae7cf 100644 --- a/packages/react-forms-dom/src/components/radio-group.tsx +++ b/packages/react-forms-dom/src/components/radio-group.tsx @@ -3,7 +3,7 @@ import * as PropTypes from "prop-types"; import { BaseField, BaseFieldState } from "@simplr/react-forms"; import { FieldProps, FieldChildContext, FieldValue } from "@simplr/react-forms/contracts"; import { HTMLElementProps, DomFieldTemplateCallback } from "../contracts/field"; -import { FormProps } from "../contracts/form"; +import { FormProps } from "./form"; import { BaseDomField } from "../abstractions"; import { TypedRecord } from "typed-immutable-record"; diff --git a/packages/react-forms-dom/src/components/search.tsx b/packages/react-forms-dom/src/components/search.tsx index 65f0b8b..450d101 100644 --- a/packages/react-forms-dom/src/components/search.tsx +++ b/packages/react-forms-dom/src/components/search.tsx @@ -4,12 +4,8 @@ import { DomFieldProps } from "../contracts/field"; import { BaseDomField, BaseDomFieldState } from "../abstractions/base-dom-field"; import { FieldOnChangeCallback } from "../contracts/field"; -import { - HTMLElementProps -} from "../contracts/field"; -import { - FormProps -} from "../contracts/form"; +import { HTMLElementProps } from "../contracts/field"; +import { FormProps } from "./form"; export type SearchOnChangeCallback = FieldOnChangeCallback; diff --git a/packages/react-forms-dom/src/components/select.tsx b/packages/react-forms-dom/src/components/select.tsx index 082a6b2..b4f0b4d 100644 --- a/packages/react-forms-dom/src/components/select.tsx +++ b/packages/react-forms-dom/src/components/select.tsx @@ -4,12 +4,8 @@ import { DomFieldProps } from "../contracts/field"; import { BaseDomField, BaseDomFieldState } from "../abstractions/base-dom-field"; import { FieldOnChangeCallback } from "../contracts/field"; -import { - HTMLElementProps -} from "../contracts/field"; -import { - FormProps -} from "../contracts/form"; +import { HTMLElementProps } from "../contracts/field"; +import { FormProps } from "./form"; export type SelectValue = string | string[]; export type SelectOnChangeCallback = FieldOnChangeCallback; diff --git a/packages/react-forms-dom/src/components/text.tsx b/packages/react-forms-dom/src/components/text.tsx index 8134e93..2268645 100644 --- a/packages/react-forms-dom/src/components/text.tsx +++ b/packages/react-forms-dom/src/components/text.tsx @@ -9,9 +9,7 @@ import { FieldOnChangeCallback, HTMLElementProps } from "../contracts/field"; -import { - FormProps -} from "../contracts/form"; +import { FormProps } from "./form"; export type TextOnChangeCallback = FieldOnChangeCallback; diff --git a/packages/react-forms-dom/src/components/textarea.tsx b/packages/react-forms-dom/src/components/textarea.tsx index 3c87a01..ac71af5 100644 --- a/packages/react-forms-dom/src/components/textarea.tsx +++ b/packages/react-forms-dom/src/components/textarea.tsx @@ -10,9 +10,7 @@ import { FieldOnChangeCallback, HTMLElementProps } from "../contracts/field"; -import { - FormProps -} from "../contracts/form"; +import { FormProps } from "./form"; export type TextAreaOnChangeCallback = FieldOnChangeCallback; diff --git a/packages/react-forms-dom/src/contracts/form.ts b/packages/react-forms-dom/src/contracts/form.ts index ea70b04..8e98d2d 100644 --- a/packages/react-forms-dom/src/contracts/form.ts +++ b/packages/react-forms-dom/src/contracts/form.ts @@ -2,11 +2,7 @@ import * as React from "react"; import { FormError } from "@simplr/react-forms/contracts"; import { FormProps as CoreFormProps } from "@simplr/react-forms/contracts"; import { FormStore } from "@simplr/react-forms/stores"; -import { - FieldOnChangeCallback, - FieldOnChangeInternalCallback, - DomFieldTemplateCallback -} from "../contracts/field"; +import { DomFieldTemplateCallback } from "../contracts/field"; export interface FormOnSubmitInternalCallback { (event: React.FormEvent, ...parameters: any[]): void | Promise | FormError | string; @@ -16,9 +12,7 @@ export interface FormOnSubmitCallback { (event: React.FormEvent, store: FormStore): void | Promise | FormError | string; } -export interface FormProps extends CoreFormProps, React.HTMLProps { - onSubmit?: FormOnSubmitCallback & FormOnSubmitInternalCallback; - onChange?: FieldOnChangeCallback & FieldOnChangeInternalCallback; +export interface BaseFormProps extends CoreFormProps { preventSubmitDefaultAndPropagation?: boolean; template?: DomFieldTemplateCallback; // tslint:disable-next-line:max-line-length From d6293f3c412d6047de8e4265136717135be7bff7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20=C5=BDilinskas?= Date: Tue, 18 Jul 2017 18:45:35 +0300 Subject: [PATCH 11/81] v4.1.5 --- packages/react-forms-dom/package.json | 4 ++-- packages/react-forms-validation/package.json | 4 ++-- packages/react-forms/package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/react-forms-dom/package.json b/packages/react-forms-dom/package.json index a48df48..c23d55f 100644 --- a/packages/react-forms-dom/package.json +++ b/packages/react-forms-dom/package.json @@ -1,6 +1,6 @@ { "name": "@simplr/react-forms-dom", - "version": "4.1.4", + "version": "4.1.5", "description": "DOM components for @simplr/react-forms.", "repository": "SimplrJS/react-forms", "homepage": "https://github.com/SimplrJS/react-forms", @@ -61,7 +61,7 @@ "prop-types": "^15.5.10", "react": "^15.6.1", "react-dom": "^15.6.1", - "@simplr/react-forms": "^4.1.4", + "@simplr/react-forms": "^4.1.5", "tslib": "^1.7.1", "typed-immutable-record": "^0.0.6" }, diff --git a/packages/react-forms-validation/package.json b/packages/react-forms-validation/package.json index 1e2aac6..05b71a5 100644 --- a/packages/react-forms-validation/package.json +++ b/packages/react-forms-validation/package.json @@ -1,6 +1,6 @@ { "name": "@simplr/react-forms-validation", - "version": "4.1.4", + "version": "4.1.5", "description": "Validation library for @simplr/react-forms.", "repository": "SimplrJS/react-forms", "homepage": "https://github.com/SimplrJS/react-forms", @@ -58,7 +58,7 @@ "action-emitter": "^0.2.1", "immutable": "^3.8.1", "react": "^15.6.1", - "@simplr/react-forms": "^4.1.4", + "@simplr/react-forms": "^4.1.5", "tslib": "^1.7.1", "validator": "^7.2.0" }, diff --git a/packages/react-forms/package.json b/packages/react-forms/package.json index d16ffb3..401429c 100644 --- a/packages/react-forms/package.json +++ b/packages/react-forms/package.json @@ -1,6 +1,6 @@ { "name": "@simplr/react-forms", - "version": "4.1.4", + "version": "4.1.5", "description": "Shared @simplr/react-forms logic.", "repository": "SimplrJS/react-forms", "homepage": "https://github.com/SimplrJS/react-forms", From 6e1030edcd1c6e246452e726a920f90b1f28d222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20=C5=BDilinskas?= Date: Wed, 19 Jul 2017 16:02:48 +0300 Subject: [PATCH 12/81] Hotfix: Fixed props spread in components (#118) --- packages/react-forms-dom/src/components/checkbox.tsx | 2 +- packages/react-forms-dom/src/components/clear.tsx | 2 +- packages/react-forms-dom/src/components/email.tsx | 2 +- packages/react-forms-dom/src/components/form.tsx | 2 +- packages/react-forms-dom/src/components/number.tsx | 2 +- packages/react-forms-dom/src/components/password.tsx | 2 +- packages/react-forms-dom/src/components/reset.tsx | 2 +- packages/react-forms-dom/src/components/search.tsx | 2 +- packages/react-forms-dom/src/components/select.tsx | 2 +- packages/react-forms-dom/src/components/submit.tsx | 2 +- packages/react-forms-dom/src/components/text.tsx | 2 +- packages/react-forms-dom/src/components/textarea.tsx | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/react-forms-dom/src/components/checkbox.tsx b/packages/react-forms-dom/src/components/checkbox.tsx index ae068f5..f05c855 100644 --- a/packages/react-forms-dom/src/components/checkbox.tsx +++ b/packages/react-forms-dom/src/components/checkbox.tsx @@ -59,6 +59,7 @@ export class CheckBox extends BaseDomField; } } diff --git a/packages/react-forms-dom/src/components/clear.tsx b/packages/react-forms-dom/src/components/clear.tsx index bc06b78..90a5784 100644 --- a/packages/react-forms-dom/src/components/clear.tsx +++ b/packages/react-forms-dom/src/components/clear.tsx @@ -35,12 +35,12 @@ export class Clear extends BaseFormButton public render(): JSX.Element { return ; diff --git a/packages/react-forms-dom/src/components/email.tsx b/packages/react-forms-dom/src/components/email.tsx index 4bc0a10..9a4e80a 100644 --- a/packages/react-forms-dom/src/components/email.tsx +++ b/packages/react-forms-dom/src/components/email.tsx @@ -56,6 +56,7 @@ export class Email extends BaseDomField; } } diff --git a/packages/react-forms-dom/src/components/form.tsx b/packages/react-forms-dom/src/components/form.tsx index bee3607..5540ae7 100644 --- a/packages/react-forms-dom/src/components/form.tsx +++ b/packages/react-forms-dom/src/components/form.tsx @@ -81,8 +81,8 @@ export class Form extends BaseForm { public render(): JSX.Element { return
{this.props.children}
; diff --git a/packages/react-forms-dom/src/components/number.tsx b/packages/react-forms-dom/src/components/number.tsx index 8f3b512..edd2ab8 100644 --- a/packages/react-forms-dom/src/components/number.tsx +++ b/packages/react-forms-dom/src/components/number.tsx @@ -61,6 +61,7 @@ export class Number extends BaseDomField { public renderField(): JSX.Element | null { return { disabled={this.Disabled} onFocus={this.OnFocus} onBlur={this.OnBlur} - {...this.GetHTMLProps(this.props) } />; } } diff --git a/packages/react-forms-dom/src/components/password.tsx b/packages/react-forms-dom/src/components/password.tsx index 25ce13f..9b4e750 100644 --- a/packages/react-forms-dom/src/components/password.tsx +++ b/packages/react-forms-dom/src/components/password.tsx @@ -56,6 +56,7 @@ export class Password extends BaseDomField { public renderField(): JSX.Element { return { disabled={this.Disabled} onFocus={this.OnFocus} onBlur={this.OnBlur} - {...this.GetHTMLProps(this.props) } />; } } diff --git a/packages/react-forms-dom/src/components/reset.tsx b/packages/react-forms-dom/src/components/reset.tsx index 591b593..aaf70ae 100644 --- a/packages/react-forms-dom/src/components/reset.tsx +++ b/packages/react-forms-dom/src/components/reset.tsx @@ -35,12 +35,12 @@ export class Reset extends BaseFormButton public render(): JSX.Element { return ; diff --git a/packages/react-forms-dom/src/components/search.tsx b/packages/react-forms-dom/src/components/search.tsx index 450d101..d601c12 100644 --- a/packages/react-forms-dom/src/components/search.tsx +++ b/packages/react-forms-dom/src/components/search.tsx @@ -57,6 +57,7 @@ export class Search extends BaseDomField { public renderField(): JSX.Element { return { disabled={this.Disabled} onFocus={this.OnFocus} onBlur={this.OnBlur} - {...this.GetHTMLProps(this.props) } />; } } diff --git a/packages/react-forms-dom/src/components/select.tsx b/packages/react-forms-dom/src/components/select.tsx index b4f0b4d..4e67fd7 100644 --- a/packages/react-forms-dom/src/components/select.tsx +++ b/packages/react-forms-dom/src/components/select.tsx @@ -116,13 +116,13 @@ export class Select extends BaseDomField { public renderField(): JSX.Element { return ; diff --git a/packages/react-forms-dom/src/components/submit.tsx b/packages/react-forms-dom/src/components/submit.tsx index d44822b..819f900 100644 --- a/packages/react-forms-dom/src/components/submit.tsx +++ b/packages/react-forms-dom/src/components/submit.tsx @@ -33,12 +33,12 @@ export class Submit extends BaseFormButton {this.props.children} ; diff --git a/packages/react-forms-dom/src/components/text.tsx b/packages/react-forms-dom/src/components/text.tsx index 2268645..80f782a 100644 --- a/packages/react-forms-dom/src/components/text.tsx +++ b/packages/react-forms-dom/src/components/text.tsx @@ -66,6 +66,7 @@ export class Text extends BaseDomField; } } diff --git a/packages/react-forms-dom/src/components/textarea.tsx b/packages/react-forms-dom/src/components/textarea.tsx index ac71af5..0519bfc 100644 --- a/packages/react-forms-dom/src/components/textarea.tsx +++ b/packages/react-forms-dom/src/components/textarea.tsx @@ -66,13 +66,13 @@ export class TextArea extends BaseDomField { public renderField(): JSX.Element { return