Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
172 changes: 91 additions & 81 deletions common/config/rush/npm-shrinkwrap.json

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
22 changes: 11 additions & 11 deletions packages/react-forms-dom/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
24 changes: 12 additions & 12 deletions packages/react-forms-validation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@ 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";
import {
FieldRegistered,
ValueChanged,
FieldPropsChanged,
FieldActive,
FieldBlurred
} from "@simplr/react-forms/actions";

Expand Down
26 changes: 13 additions & 13 deletions packages/react-forms/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions packages/react-forms/src/stores/form-store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ export class FormStore extends ActionEmitter {
this.emit(new Actions.ValueChanged(this.FormId, fieldId));
}

public async ValidateField(fieldId: string, validationPromise: Promise<never>): Promise<void> {
public async ValidateField(fieldId: string, validationPromise: Promise<void>): Promise<void> {
const field = this.State.Fields.get(fieldId);
const fieldValue = field.Value;

Expand Down Expand Up @@ -435,7 +435,7 @@ export class FormStore extends ActionEmitter {
});
}

public async ValidateForm(validationPromise: Promise<never>): Promise<void> {
public async ValidateForm(validationPromise: Promise<void>): Promise<void> {
const form = this.State.Form;

// If form is not validating
Expand Down
3 changes: 2 additions & 1 deletion tools/mvdir/dist/contracts.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export interface ArgumentsValues {
import * as yargs from "yargs";
export interface ArgumentsValues extends yargs.Arguments {
config?: string;
from: string;
to: string;
Expand Down
6 changes: 3 additions & 3 deletions tools/mvdir/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 3 additions & 1 deletion tools/mvdir/src/contracts.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
export interface ArgumentsValues {
import * as yargs from "yargs";

export interface ArgumentsValues extends yargs.Arguments {
config?: string;
from: string;
to: string;
Expand Down
2 changes: 1 addition & 1 deletion tools/rush-tools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class RushTools {
}
}

interface ArgumentsValues {
interface ArgumentsValues extends yargs.Arguments {
config: string;
exclude: string[];

Expand Down