Upgrade FBJS to 5.2.0-rc1

pull/551/head
Rick Carlino 2017-12-02 09:55:44 -06:00
parent 2006d20433
commit a3d350ce9f
12 changed files with 29 additions and 11 deletions

View File

@ -52,7 +52,7 @@
"enzyme": "^3.1.0",
"enzyme-adapter-react-15": "^1.0.2",
"extract-text-webpack-plugin": "^3.0.1",
"farmbot": "5.1.1",
"farmbot": "^5.2.0-rc1",
"farmbot-toastr": "^1.0.3",
"fastclick": "^1.0.6",
"file-loader": "^1.1.5",

View File

@ -13,7 +13,11 @@ let idCounter = 1;
export function fakeSequence(): TaggedSequence {
return fakeResource("Sequence", {
args: { version: 4, label: "WIP" },
args: {
version: 4,
label: "WIP",
locals: { kind: "nothing", args: {} },
},
id: 12,
color: "red",
name: "fake",

View File

@ -24,7 +24,7 @@ export let fakeFarmEventWithExecutable = (): FarmEventWithExecutable => {
color: "red",
name: "faker",
kind: "sequence",
args: { version: 0, label: "WIP" }
args: { version: 0, label: "WIP", locals: { kind: "nothing", args: {} }, }
}
};
};

View File

@ -281,7 +281,8 @@ const tr13: TaggedResource = {
"args": {
"is_outdated": false,
"version": 4,
"label": "foo"
"label": "foo",
"locals": { kind: "nothing", args: {} },
},
"kind": "sequence"
},

View File

@ -41,7 +41,8 @@ describe("mapStateToProps()", () => {
"body": [{ kind: "wait", args: { milliseconds: 100 } }],
"args": {
"version": 4,
"label": "WIP"
"label": "WIP",
locals: { kind: "nothing", args: {} },
},
"kind": "sequence"
},

View File

@ -45,6 +45,7 @@ describe("commitBulkEditor()", () => {
"color": "gray",
"body": [{ kind: "wait", args: { milliseconds: 100 } }],
"args": {
locals: { kind: "nothing", args: {} },
"version": 4,
"label": "WIP"
},

View File

@ -23,6 +23,7 @@ describe("maybeTagSteps()", () => {
}
],
"args": {
"locals": { kind: "nothing", args: {} },
"version": 4
},
"kind": "sequence"

View File

@ -41,6 +41,7 @@ describe("<AllSteps/>", () => {
}
],
"args": {
"locals": { kind: "nothing", args: {} },
"is_outdated": false,
"version": 4,
"label": "WIP"

View File

@ -12,7 +12,10 @@ describe("<TestButton/>", () => {
"name": "Goto 0, 0, 0",
"color": "gray",
"body": [],
"args": { "version": 4 },
"args": {
"version": 4,
"locals": { kind: "nothing", args: {} },
},
"kind": "sequence"
},
"uuid": "Sequence.23.47"

View File

@ -40,7 +40,10 @@ describe("<InputDefault/>", () => {
"name": "Goto 0, 0, 0",
"color": "gray",
"body": [step],
"args": { "version": 4 },
"args": {
"version": 4,
"locals": { kind: "nothing", args: {} },
},
"kind": "sequence"
},
"uuid": "Sequence.74.145"

View File

@ -80,7 +80,10 @@ export class SequencesList extends
specialStatus: SpecialStatus.SAVED,
body: {
name: "new sequence " + (this.props.sequences.length),
args: { version: -999 },
args: {
version: -999,
locals: { kind: "nothing", args: {} },
},
color: "gray",
kind: "sequence",
body: []

View File

@ -1996,9 +1996,9 @@ farmbot-toastr@^1.0.0, farmbot-toastr@^1.0.3:
farmbot-toastr "^1.0.0"
typescript "^2.3.4"
farmbot@5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/farmbot/-/farmbot-5.1.1.tgz#92b7618281385610c7b629dfb524b607d495d4dc"
farmbot@^5.2.0-rc1:
version "5.2.0-rc1"
resolved "https://registry.yarnpkg.com/farmbot/-/farmbot-5.2.0-rc1.tgz#1ce215e449822cf9d826745c6cdd7edba9d37f3e"
dependencies:
mqtt "^2.13.1"
typescript "^2.4.2"