diff --git a/lerna.json b/lerna.json index ef84cc37..e48127ec 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "lerna": "2.0.0-rc.4", + "lerna": "2.0.0-rc.5", "version": "3.6.0", "npmClient": "yarn", "packages": [ diff --git a/package.json b/package.json index 2f9b237d..c198ac0e 100644 --- a/package.json +++ b/package.json @@ -23,9 +23,9 @@ "browserify": "^14.3.0", "browserify-shim": "^3.8.12", "documentation": "4.0.0-beta.18", - "flow-bin": "^0.46.0", + "flow-bin": "^0.49.1", "flow-copy-source": "^1.1.0", - "lerna": "^2.0.0-rc.4", - "prettier": "1.3.1" + "lerna": "^2.0.0-rc.5", + "prettier": "^1.5.2" } } diff --git a/packages/cookbook-expo/package.json b/packages/cookbook-expo/package.json index 47a17bdd..96557abb 100644 --- a/packages/cookbook-expo/package.json +++ b/packages/cookbook-expo/package.json @@ -7,11 +7,11 @@ "main": "main.js", "dependencies": { "@expo/ex-navigation": "^2.11.0", - "cookbook-rn-shared": "^3.3.0", - "expo": "^18.0.1", + "cookbook-rn-shared": "^3.6.0", + "expo": "^18.0.2", "gl-react-expo": "^3.6.0", "prop-types": "^15.5.8", "react": "16.0.0-alpha.12", - "react-native": "github:expo/react-native#sdk-18.0.1" + "react-native": "github:expo/react-native#sdk-18.0.2" } } diff --git a/packages/gl-react-dom/src/CanvasTextureLoader.js b/packages/gl-react-dom/src/CanvasTextureLoader.js index 2d554285..125480d6 100755 --- a/packages/gl-react-dom/src/CanvasTextureLoader.js +++ b/packages/gl-react-dom/src/CanvasTextureLoader.js @@ -1,7 +1,8 @@ //@flow import { TextureLoaderRawObject } from "gl-react"; -export default class CanvasTextureLoader - extends TextureLoaderRawObject { +export default class CanvasTextureLoader extends TextureLoaderRawObject< + HTMLCanvasElement +> { canLoad(input: any) { return input instanceof HTMLCanvasElement; } diff --git a/packages/gl-react-dom/src/VideoTextureLoader.js b/packages/gl-react-dom/src/VideoTextureLoader.js index 4c3dd953..8680690b 100755 --- a/packages/gl-react-dom/src/VideoTextureLoader.js +++ b/packages/gl-react-dom/src/VideoTextureLoader.js @@ -1,8 +1,9 @@ //@flow import { TextureLoaderRawObject } from "gl-react"; -export default class VideoTextureLoader - extends TextureLoaderRawObject { +export default class VideoTextureLoader extends TextureLoaderRawObject< + HTMLVideoElement +> { canLoad(input: any) { return input instanceof HTMLVideoElement; } diff --git a/packages/gl-react-expo/src/ExponentGLObjectTextureLoader.js b/packages/gl-react-expo/src/ExponentGLObjectTextureLoader.js index bf962b6a..1680a5b0 100644 --- a/packages/gl-react-expo/src/ExponentGLObjectTextureLoader.js +++ b/packages/gl-react-expo/src/ExponentGLObjectTextureLoader.js @@ -8,8 +8,9 @@ function hash(obj) { return JSON.stringify(obj); // FIXME ikr XD } -export default class ExponentGLObjectTextureLoader - extends TextureLoader { +export default class ExponentGLObjectTextureLoader extends TextureLoader< + Object +> { loads: Map> = new Map(); textures: Map = new Map(); dispose() {} diff --git a/packages/gl-react-expo/src/md5.js b/packages/gl-react-expo/src/md5.js index 0bd22b15..e500ea8f 100644 --- a/packages/gl-react-expo/src/md5.js +++ b/packages/gl-react-expo/src/md5.js @@ -1,7 +1,10 @@ let add32; function md5cycle(x, k) { - var a = x[0], b = x[1], c = x[2], d = x[3]; + var a = x[0], + b = x[1], + c = x[2], + d = x[3]; a = ff(a, b, c, d, k[0], 7, -680876936); d = ff(d, a, b, c, k[1], 12, -389564586); @@ -99,7 +102,9 @@ function ii(a, b, c, d, x, s, t) { } function md51(s) { - var n = s.length, state = [1732584193, -271733879, -1732584194, 271733878], i; + var n = s.length, + state = [1732584193, -271733879, -1732584194, 271733878], + i; for (i = 64; i <= s.length; i += 64) { md5cycle(state, md5blk(s.substring(i - 64, i))); } @@ -110,8 +115,7 @@ function md51(s) { tail[i >> 2] |= 0x80 << ((i % 4) << 3); if (i > 55) { md5cycle(state, tail); - for (i = 0; i < 16; i++) - tail[i] = 0; + for (i = 0; i < 16; i++) tail[i] = 0; } tail[14] = n * 8; md5cycle(state, tail); @@ -135,7 +139,8 @@ function md51(s) { */ function md5blk(s) { /* I figured global was faster. */ - var md5blks = [], i; /* Andy King said do it this way. */ + var md5blks = [], + i; /* Andy King said do it this way. */ for (i = 0; i < 64; i += 4) { md5blks[i >> 2] = s.charCodeAt(i) + @@ -149,15 +154,15 @@ function md5blk(s) { var hex_chr = "0123456789abcdef".split(""); function rhex(n) { - var s = "", j = 0; + var s = "", + j = 0; for (; j < 4; j++) s += hex_chr[(n >> (j * 8 + 4)) & 0x0f] + hex_chr[(n >> (j * 8)) & 0x0f]; return s; } function hex(x) { - for (var i = 0; i < x.length; i++) - x[i] = rhex(x[i]); + for (var i = 0; i < x.length; i++) x[i] = rhex(x[i]); return x.join(""); } diff --git a/packages/gl-react-native/src/EXGLView.js b/packages/gl-react-native/src/EXGLView.js index 871d7568..25edb656 100644 --- a/packages/gl-react-native/src/EXGLView.js +++ b/packages/gl-react-native/src/EXGLView.js @@ -8,7 +8,7 @@ import { View, ViewPropTypes, Platform, - requireNativeComponent + requireNativeComponent, } from "react-native"; // A component that acts as an OpenGL render target. @@ -26,11 +26,11 @@ export default class EXGLView extends React.Component { // [iOS only] Number of samples for Apple"s built-in multisampling. msaaSamples: PropTypes.number, - ...ViewPropTypes + ...ViewPropTypes, }; static defaultProps = { - msaaSamples: 4 + msaaSamples: 4, }; render() { @@ -63,7 +63,7 @@ export default class EXGLView extends React.Component { }; static NativeView = requireNativeComponent("EXGLView", EXGLView, { - nativeOnly: { onSurfaceCreate: true } + nativeOnly: { onSurfaceCreate: true }, }); } @@ -142,7 +142,7 @@ const wrapMethods = gl => { [gl.FRAMEBUFFER_BINDING]: WebGLFramebuffer, [gl.RENDERBUFFER_BINDING]: WebGLRenderbuffer, [gl.TEXTURE_BINDING_2D]: WebGLTexture, - [gl.TEXTURE_BINDING_CUBE_MAP]: WebGLTexture + [gl.TEXTURE_BINDING_CUBE_MAP]: WebGLTexture, }; wrap("getParameter", orig => pname => { let ret = orig.call(gl, pname); @@ -156,129 +156,162 @@ const wrapMethods = gl => { // Buffers wrap("bindBuffer", orig => (target, buffer) => - orig.call(gl, target, buffer && buffer.id)); + orig.call(gl, target, buffer && buffer.id) + ); wrap("createBuffer", orig => () => wrapObject(WebGLBuffer, orig.call(gl))); wrap("deleteBuffer", orig => buffer => orig.call(gl, buffer && buffer.id)); wrap("isBuffer", orig => buffer => - buffer instanceof WebGLBuffer && orig.call(gl, buffer.id)); + buffer instanceof WebGLBuffer && orig.call(gl, buffer.id) + ); // Framebuffers wrap("bindFramebuffer", orig => (target, framebuffer) => - orig.call(gl, target, framebuffer && framebuffer.id)); + orig.call(gl, target, framebuffer && framebuffer.id) + ); wrap("createFramebuffer", orig => () => - wrapObject(WebGLFramebuffer, orig.call(gl))); + wrapObject(WebGLFramebuffer, orig.call(gl)) + ); wrap("deleteFramebuffer", orig => framebuffer => - orig.call(gl, framebuffer && framebuffer.id)); + orig.call(gl, framebuffer && framebuffer.id) + ); wrap("framebufferRenderbuffer", orig => (target, attachment, rbtarget, rb) => - orig.call(gl, target, attachment, rbtarget, rb && rb.id)); - wrap("framebufferTexture2D", orig => ( - target, - attachment, - textarget, - tex, - level - ) => orig.call(gl, target, attachment, textarget, tex && tex.id, level)); + orig.call(gl, target, attachment, rbtarget, rb && rb.id) + ); + wrap( + "framebufferTexture2D", + orig => (target, attachment, textarget, tex, level) => + orig.call(gl, target, attachment, textarget, tex && tex.id, level) + ); wrap("isFramebuffer", orig => framebuffer => - framebuffer instanceof WebGLFramebuffer && orig.call(gl, framebuffer.id)); + framebuffer instanceof WebGLFramebuffer && orig.call(gl, framebuffer.id) + ); // Renderbuffers wrap("bindRenderbuffer", orig => (target, renderbuffer) => - orig.call(gl, target, renderbuffer && renderbuffer.id)); + orig.call(gl, target, renderbuffer && renderbuffer.id) + ); wrap("createRenderbuffer", orig => () => - wrapObject(WebGLRenderbuffer, orig.call(gl))); + wrapObject(WebGLRenderbuffer, orig.call(gl)) + ); wrap("deleteRenderbuffer", orig => renderbuffer => - orig.call(gl, renderbuffer && renderbuffer.id)); + orig.call(gl, renderbuffer && renderbuffer.id) + ); wrap("isRenderbuffer", orig => renderbuffer => - renderbuffer instanceof WebGLRenderbuffer && - orig.call(gl, renderbuffer.id)); + renderbuffer instanceof WebGLRenderbuffer && orig.call(gl, renderbuffer.id) + ); // Textures wrap("bindTexture", orig => (target, texture) => - orig.call(gl, target, texture && texture.id)); + orig.call(gl, target, texture && texture.id) + ); wrap("createTexture", orig => () => wrapObject(WebGLTexture, orig.call(gl))); wrap("deleteTexture", orig => texture => - orig.call(gl, texture && texture.id)); + orig.call(gl, texture && texture.id) + ); wrap("isTexture", orig => texture => - texture instanceof WebGLTexture && orig.call(gl, texture.id)); + texture instanceof WebGLTexture && orig.call(gl, texture.id) + ); // Programs and shaders wrap("attachShader", orig => (program, shader) => - orig.call(gl, program && program.id, shader && shader.id)); + orig.call(gl, program && program.id, shader && shader.id) + ); wrap("bindAttribLocation", orig => (program, index, name) => - orig.call(gl, program && program.id, index, name)); + orig.call(gl, program && program.id, index, name) + ); wrap("compileShader", orig => shader => orig.call(gl, shader && shader.id)); wrap("createProgram", orig => () => wrapObject(WebGLProgram, orig.call(gl))); wrap("createShader", orig => type => - wrapObject(WebGLShader, orig.call(gl, type))); + wrapObject(WebGLShader, orig.call(gl, type)) + ); wrap("deleteProgram", orig => program => - orig.call(gl, program && program.id)); + orig.call(gl, program && program.id) + ); wrap("deleteShader", orig => shader => orig.call(gl, shader && shader.id)); wrap("detachShader", orig => (program, shader) => - orig.call(gl, program && program.id, shader && shader.id)); + orig.call(gl, program && program.id, shader && shader.id) + ); wrap("getAttachedShaders", orig => program => - orig - .call(gl, program && program.id) - .map(id => wrapObject(WebGLShader, id))); + orig.call(gl, program && program.id).map(id => wrapObject(WebGLShader, id)) + ); wrap("getProgramParameter", orig => (program, pname) => - orig.call(gl, program && program.id, pname)); + orig.call(gl, program && program.id, pname) + ); wrap("getProgramInfoLog", orig => program => - orig.call(gl, program && program.id)); + orig.call(gl, program && program.id) + ); wrap("getShaderParameter", orig => (shader, pname) => - orig.call(gl, shader && shader.id, pname)); + orig.call(gl, shader && shader.id, pname) + ); wrap("getShaderPrecisionFormat", orig => (shadertype, precisiontype) => - new WebGLShaderPrecisionFormat(orig.call(gl, shadertype, precisiontype))); + new WebGLShaderPrecisionFormat(orig.call(gl, shadertype, precisiontype)) + ); wrap("getShaderInfoLog", orig => shader => - orig.call(gl, shader && shader.id)); + orig.call(gl, shader && shader.id) + ); wrap("getShaderSource", orig => shader => orig.call(gl, shader && shader.id)); wrap("linkProgram", orig => program => orig.call(gl, program && program.id)); wrap("shaderSource", orig => (shader, source) => - orig.call(gl, shader && shader.id, source)); + orig.call(gl, shader && shader.id, source) + ); wrap("useProgram", orig => program => orig.call(gl, program && program.id)); wrap("validateProgram", orig => program => - orig.call(gl, program && program.id)); + orig.call(gl, program && program.id) + ); wrap("isShader", orig => shader => - shader instanceof WebGLShader && orig.call(gl, shader.id)); + shader instanceof WebGLShader && orig.call(gl, shader.id) + ); wrap("isProgram", orig => program => - program instanceof WebGLProgram && orig.call(gl, program.id)); + program instanceof WebGLProgram && orig.call(gl, program.id) + ); // Uniforms and attributes wrap("getActiveAttrib", orig => (program, index) => - new WebGLActiveInfo(orig.call(gl, program && program.id, index))); + new WebGLActiveInfo(orig.call(gl, program && program.id, index)) + ); wrap("getActiveUniform", orig => (program, index) => - new WebGLActiveInfo(orig.call(gl, program && program.id, index))); + new WebGLActiveInfo(orig.call(gl, program && program.id, index)) + ); wrap("getAttribLocation", orig => (program, name) => - orig.call(gl, program && program.id, name)); + orig.call(gl, program && program.id, name) + ); wrap("getUniform", orig => (program, location) => - orig.call(gl, program && program.id, location && location.id)); + orig.call(gl, program && program.id, location && location.id) + ); wrap("getUniformLocation", orig => (program, name) => - new WebGLUniformLocation(orig.call(gl, program && program.id, name))); + new WebGLUniformLocation(orig.call(gl, program && program.id, name)) + ); wrap(["uniform1f", "uniform1i"], orig => (loc, x) => - orig.call(gl, loc && loc.id, x)); + orig.call(gl, loc && loc.id, x) + ); wrap(["uniform2f", "uniform2i"], orig => (loc, x, y) => - orig.call(gl, loc && loc.id, x, y)); + orig.call(gl, loc && loc.id, x, y) + ); wrap(["uniform3f", "uniform3i"], orig => (loc, x, y, z) => - orig.call(gl, loc && loc.id, x, y, z)); + orig.call(gl, loc && loc.id, x, y, z) + ); wrap(["uniform4f", "uniform4i"], orig => (loc, x, y, z, w) => - orig.call(gl, loc && loc.id, x, y, z, w)); - wrap(["uniform1fv", "uniform2fv", "uniform3fv", "uniform4fv"], orig => ( - loc, - val - ) => orig.call(gl, loc && loc.id, new Float32Array(val))); - wrap(["uniform1iv", "uniform2iv", "uniform3iv", "uniform4iv"], orig => ( - loc, - val - ) => orig.call(gl, loc && loc.id, new Int32Array(val))); - wrap(["uniformMatrix2fv", "uniformMatrix3fv", "uniformMatrix4fv"], orig => ( - loc, - transpose, - val - ) => orig.call(gl, loc && loc.id, transpose, new Float32Array(val))); + orig.call(gl, loc && loc.id, x, y, z, w) + ); + wrap( + ["uniform1fv", "uniform2fv", "uniform3fv", "uniform4fv"], + orig => (loc, val) => orig.call(gl, loc && loc.id, new Float32Array(val)) + ); + wrap( + ["uniform1iv", "uniform2iv", "uniform3iv", "uniform4iv"], + orig => (loc, val) => orig.call(gl, loc && loc.id, new Int32Array(val)) + ); + wrap( + ["uniformMatrix2fv", "uniformMatrix3fv", "uniformMatrix4fv"], + orig => (loc, transpose, val) => + orig.call(gl, loc && loc.id, transpose, new Float32Array(val)) + ); wrap( [ "vertexAttrib1fv", "vertexAttrib2fv", "vertexAttrib3fv", - "vertexAttrib4fv" + "vertexAttrib4fv", ], orig => (index, val) => orig.call(gl, index, new Float32Array(val)) ); diff --git a/packages/gl-react-native/src/GLImages.js b/packages/gl-react-native/src/GLImages.js index 988dd8f6..5a9f9f33 100644 --- a/packages/gl-react-native/src/GLImages.js +++ b/packages/gl-react-native/src/GLImages.js @@ -1,8 +1,7 @@ //@flow import LRU from "lru"; import { NativeModules } from "react-native"; -import resolveAssetSource - from "react-native/Libraries/Image/resolveAssetSource"; +import resolveAssetSource from "react-native/Libraries/Image/resolveAssetSource"; const { GLImagesModule } = NativeModules; export type ImageSource = Object | number; diff --git a/packages/gl-react-native/src/ImageSourceTextureLoader.js b/packages/gl-react-native/src/ImageSourceTextureLoader.js index 65d42bc7..5d31fea5 100644 --- a/packages/gl-react-native/src/ImageSourceTextureLoader.js +++ b/packages/gl-react-native/src/ImageSourceTextureLoader.js @@ -4,8 +4,9 @@ import type { DisposablePromise } from "gl-react/lib/helpers/disposable"; import GLImages from "./GLImages"; import type { ImageSource } from "./GLImages"; -export default class ImageSourceTextureLoader - extends TextureLoader { +export default class ImageSourceTextureLoader extends TextureLoader< + ImageSource +> { loads: Array> = []; textures: Map = new Map(); assetIdForImageSource: Map = new Map(); diff --git a/packages/gl-react/src/Bus.js b/packages/gl-react/src/Bus.js index f2234bbe..525f6b6f 100755 --- a/packages/gl-react/src/Bus.js +++ b/packages/gl-react/src/Bus.js @@ -150,7 +150,9 @@ export default class Bus extends Component<{ index: number }, Props, void> { } getGLName(): string { - return `Bus(${this.glNode ? this.glNode.getGLName() : String(this.getGLRenderableContent())})`; + return `Bus(${this.glNode + ? this.glNode.getGLName() + : String(this.getGLRenderableContent())})`; } getGLShortName(): string { @@ -158,7 +160,9 @@ export default class Bus extends Component<{ index: number }, Props, void> { const shortContentName = String( (content && content.constructor && content.constructor.name) || content ); - return `Bus(${this.glNode ? this.glNode.getGLShortName() : shortContentName})`; + return `Bus(${this.glNode + ? this.glNode.getGLShortName() + : shortContentName})`; } /** diff --git a/packages/gl-react/src/VisitorLogger.js b/packages/gl-react/src/VisitorLogger.js index d2eb695c..f34dfe10 100755 --- a/packages/gl-react/src/VisitorLogger.js +++ b/packages/gl-react/src/VisitorLogger.js @@ -12,7 +12,7 @@ const aggregateInfo = info => : [ String( (info.dependency && info.dependency.getGLName()) || info.initialObj - ), + ) ].concat(info.textureOptions ? [info.textureOptions] : []); /** diff --git a/packages/gl-react/src/connectSize.js b/packages/gl-react/src/connectSize.js index 7e3e9ecb..0ed23b15 100755 --- a/packages/gl-react/src/connectSize.js +++ b/packages/gl-react/src/connectSize.js @@ -28,7 +28,9 @@ const connectSize = ( context: { glSizable: { +getGLSize: () => [number, number] }, }; - static displayName = `connectSize(${GLComponent.displayName || GLComponent.name || "?"})`; + static displayName = `connectSize(${GLComponent.displayName || + GLComponent.name || + "?"})`; static propTypes = { width: PropTypes.number, height: PropTypes.number, diff --git a/packages/tests/flow/snapshot.txt b/packages/tests/flow/snapshot.txt index 62d88cd9..7987e349 100644 --- a/packages/tests/flow/snapshot.txt +++ b/packages/tests/flow/snapshot.txt @@ -1,14 +1,24 @@ ../all.test.js:2496 + v---- 2496: }} +2500: /> + -^ props of React element `Node` 2498: uniformsOptions={{ t: { interpolation: "nope" } }} ^^^^^^ string. This type is incompatible with 65: interpolation: Interpolation, ^^^^^^^^^^^^^ string enum. See: ../node_modules/gl-react/lib/Node.js.flow:65 ../all.test.js:2508 + v---- 2508: }} +2512: /> + -^ props of React element `Node` 2510: uniformsOptions={{ t: { wrap: "nope" } }} ^^^^^^ string. This type is incompatible with 66: wrap: [WrapMode, WrapMode] | WrapMode, @@ -31,8 +41,13 @@ ^^^^^^^^ string enum. See: ../node_modules/gl-react/lib/Node.js.flow:66 ../all.test.js:2520 + v---- 2520: }} +2524: /> + -^ props of React element `Node` 2522: uniformsOptions={{ t: { wrap: ["nope", "nope"] } }} ^^^^^^^^^^^^^^^^ array literal. This type is incompatible with 66: wrap: [WrapMode, WrapMode] | WrapMode, @@ -55,8 +70,13 @@ ^^^^^^^^ string enum. See: ../node_modules/gl-react/lib/Node.js.flow:66 ../all.test.js:2532 + v---- 2532: }} +2536: /> + -^ props of React element `Node` 2533: blendFunc="nope" ^^^^^^ string. Inexact type is incompatible with exact type 177: blendFunc: BlendFuncSrcDst, @@ -111,16 +131,26 @@ incorrect.js:31 ^^^^^ object type. See: ../node_modules/gl-react/lib/Bus.js.flow:45 incorrect.js:33 + v--------------- 33: const shaders = Shaders.create({ - ^ call of method `create` + 34: valid: { + 35: frag: GLSL`...`, +...: + 40: }); + -^ call of method `create` 37: a: null, ^^^^ null. Inexact type is incompatible with exact type 45: [key: string]: ShaderDefinition, ^^^^^^^^^^^^^^^^ exact type: object type. See: ../node_modules/gl-react/lib/Shaders.js.flow:45 incorrect.js:33 + v--------------- 33: const shaders = Shaders.create({ - ^ call of method `create` + 34: valid: { + 35: frag: GLSL`...`, +...: + 40: }); + -^ call of method `create` 45: [key: string]: ShaderDefinition, ^^^^^^^^^^^^^^^^ property `frag`. Property not found in. See: ../node_modules/gl-react/lib/Shaders.js.flow:45 38: b: {}, @@ -174,28 +204,52 @@ incorrect.js:58 ^^^^^ object type. See: ../node_modules/gl-react/lib/LinearCopy.js.flow:15 incorrect.js:59 + v---- 59: + -^ React element `Node` + v---- 59: + -^ property `notexists`. Property not found in 380: props: Props; ^^^^^ object type. See: ../node_modules/gl-react/lib/Node.js.flow:380 incorrect.js:59 + v---- 59: + -^ React element `Node` + v---- 59: + -^ property `shaders`. Property not found in 380: props: Props; ^^^^^ object type. See: ../node_modules/gl-react/lib/Node.js.flow:380 incorrect.js:59 + v---- 59: + -^ React element `Node` 380: props: Props; ^^^^^ property `shader`. Property not found in. See: ../node_modules/gl-react/lib/Node.js.flow:380 + v---- 59: + -^ props of React element `Node` incorrect.js:69 69: connectSize(); @@ -222,24 +276,49 @@ incorrect.js:69 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ function type. See: ../node_modules/gl-react/lib/connectSize.js.flow:20 incorrect.js:73 + v---- 73: + -^ React element `Node` + v---- 73: + -^ property `preload`. Property not found in 380: props: Props; ^^^^^ object type. See: ../node_modules/gl-react/lib/Node.js.flow:380 incorrect.js:73 + v---- 73: + -^ React element `Node` + v---- 73: + -^ property `visitor`. Property not found in 380: props: Props; ^^^^^ object type. See: ../node_modules/gl-react/lib/Node.js.flow:380 incorrect.js:73 + v---- 73: + -^ React element `Node` 85: shader={false} ^^^^^ boolean. This type is incompatible with 160: shader: ShaderIdentifier | ShaderDefinition, @@ -262,8 +341,13 @@ incorrect.js:73 ^^^^^^^^^^^^^^^^ exact type: object type. See: ../node_modules/gl-react/lib/Node.js.flow:160 incorrect.js:73 + v---- 73: + -^ props of React element `Node`. This type is incompatible with 380: props: Props; ^^^^^ object type. See: ../node_modules/gl-react/lib/Node.js.flow:380 Property `height` is incompatible: @@ -273,8 +357,13 @@ incorrect.js:73 ^^^^^^ number. See: ../node_modules/gl-react/lib/Node.js.flow:165 incorrect.js:73 + v---- 73: + -^ props of React element `Node`. This type is incompatible with 380: props: Props; ^^^^^ object type. See: ../node_modules/gl-react/lib/Node.js.flow:380 Property `sync` is incompatible: @@ -284,8 +373,13 @@ incorrect.js:73 ^^^^^^^ boolean. See: ../node_modules/gl-react/lib/Node.js.flow:163 incorrect.js:73 + v---- 73: + -^ props of React element `Node`. This type is incompatible with 380: props: Props; ^^^^^ object type. See: ../node_modules/gl-react/lib/Node.js.flow:380 Property `width` is incompatible: @@ -295,56 +389,280 @@ incorrect.js:73 ^^^^^^ number. See: ../node_modules/gl-react/lib/Node.js.flow:164 incorrect.js:73 + v---- 73: + -^ props of React element `Node` 75: clear={42} ^^ number. Inexact type is incompatible with exact type 178: clear: ?Clear, ^^^^^ exact type: object type. See: ../node_modules/gl-react/lib/Node.js.flow:178 incorrect.js:73 + v---- 73: + -^ props of React element `Node` + v 78: blendFunc={{ - ^ property `interpolation`. Property not found in + 79: src: "nope", + 80: interpolation: "interpolation_nope", + 81: wrap: "wrap_nope", + 82: }} + ^ property `interpolation`. Property not found in 177: blendFunc: BlendFuncSrcDst, ^^^^^^^^^^^^^^^ object type. See: ../node_modules/gl-react/lib/Node.js.flow:177 incorrect.js:73 + v---- 73: + -^ props of React element `Node` + v 78: blendFunc={{ - ^ property `wrap`. Property not found in + 79: src: "nope", + 80: interpolation: "interpolation_nope", + 81: wrap: "wrap_nope", + 82: }} + ^ property `wrap`. Property not found in 177: blendFunc: BlendFuncSrcDst, ^^^^^^^^^^^^^^^ object type. See: ../node_modules/gl-react/lib/Node.js.flow:177 incorrect.js:73 + v---- 73: + -^ props of React element `Node` 79: src: "nope", ^^^^^^ property `nope`. Property not found in 95: src: BlendFunc, ^^^^^^^^^ object literal. See: ../node_modules/gl-react/lib/Node.js.flow:95 incorrect.js:73 + v---- 73: + -^ props of React element `Node` 177: blendFunc: BlendFuncSrcDst, ^^^^^^^^^^^^^^^ property `dst`. Property not found in. See: ../node_modules/gl-react/lib/Node.js.flow:177 + v 78: blendFunc={{ - ^ object literal - -../node_modules/kefir/dist/kefir.js.flow:3 - 3: import type EventEmitter from "events"; - ^^^^^^^^ This modules resolves to "<>/../../node_modules/events/package.json", which is outside both your root directory and all of the entries in the [include] section of your .flowconfig. You should either add this directory to the [include] section of your .flowconfig, move your .flowconfig file higher in the project directory tree, or move this package under your Flow root directory. - -../node_modules/kefir/kefir.js.flow:3 - 3: import type EventEmitter from "events"; - ^^^^^^^^ This modules resolves to "<>/../../node_modules/events/package.json", which is outside both your root directory and all of the entries in the [include] section of your .flowconfig. You should either add this directory to the [include] section of your .flowconfig, move your .flowconfig file higher in the project directory tree, or move this package under your Flow root directory. - -../utils.js:42 - 42: expect(actual).toBeInstanceOf(Uint8Array); - ^^^^^^ identifier `expect`. Could not resolve name - - -Found 36 errors + 79: src: "nope", + 80: interpolation: "interpolation_nope", + 81: wrap: "wrap_nope", + 82: }} + ^ object literal + +../node_modules/gl-react/lib/Node.js.flow:431 +431: this.context.glParent._addGLNodeChild(this); + ^^^^ unused function argument + 672: _addGLNodeChild() {} + ^^^^^^^^^^^^^^^^^^^^ function expects no arguments + +../node_modules/gl-react/lib/Node.js.flow:443 +443: this.context.glParent._removeGLNodeChild(this); + ^^^^ unused function argument + v--------------------- + 123: _removeGLNodeChild() { + 124: this.glNode = null; + 125: } + ^ function expects no arguments. See: ../node_modules/gl-react/lib/Bus.js.flow:123 + +../node_modules/gl-react/lib/Node.js.flow:443 +443: this.context.glParent._removeGLNodeChild(this); + ^^^^ unused function argument + 673: _removeGLNodeChild() {} + ^^^^^^^^^^^^^^^^^^^^^^^ function expects no arguments + +../node_modules/gl-react/lib/VisitorLogger.js.flow:25 + 25: log(surface.getGLName() + " _context acquired_"); + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unused function argument + v----------- + 25: log = function() { + 26: var args; + 27: args = []; + ...: + 36: }; + ^ function expects no arguments. See: ../node_modules/gl-react/lib/helpers/log.js.flow:25 + +../node_modules/gl-react/lib/VisitorLogger.js.flow:25 + 25: log(surface.getGLName() + " _context acquired_"); + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unused function argument + v----------- + 38: _log = function() { + 39: return Function.prototype.apply.call( + 40: console.log, + ...: + 44: }; + ^ function expects no arguments. See: ../node_modules/gl-react/lib/helpers/log.js.flow:38 + +../node_modules/gl-react/lib/VisitorLogger.js.flow:27 + 27: log(surface.getGLName() + " _context lost_"); + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unused function argument + v----------- + 25: log = function() { + 26: var args; + 27: args = []; + ...: + 36: }; + ^ function expects no arguments. See: ../node_modules/gl-react/lib/helpers/log.js.flow:25 + +../node_modules/gl-react/lib/VisitorLogger.js.flow:27 + 27: log(surface.getGLName() + " _context lost_"); + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unused function argument + v----------- + 38: _log = function() { + 39: return Function.prototype.apply.call( + 40: console.log, + ...: + 44: }; + ^ function expects no arguments. See: ../node_modules/gl-react/lib/helpers/log.js.flow:38 + +../node_modules/gl-react/lib/VisitorLogger.js.flow:35 + 35: log("_size_ `" + width + "`x`" + height + "`"); + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unused function argument + v----------- + 25: log = function() { + 26: var args; + 27: args = []; + ...: + 36: }; + ^ function expects no arguments. See: ../node_modules/gl-react/lib/helpers/log.js.flow:25 + +../node_modules/gl-react/lib/VisitorLogger.js.flow:35 + 35: log("_size_ `" + width + "`x`" + height + "`"); + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unused function argument + v----------- + 38: _log = function() { + 39: return Function.prototype.apply.call( + 40: console.log, + ...: + 44: }; + ^ function expects no arguments. See: ../node_modules/gl-react/lib/helpers/log.js.flow:38 + +../node_modules/gl-react/lib/VisitorLogger.js.flow:51 + v----------------- + 51: node.getGLName() + + 52: " redraw _skipped_: " + + 53: (!node.context.glSurface.gl + 54: ? "no gl context available!" + 55: : !node._needsRedraw ? "no need to redraw" : "") + -----------------------------------------------^ unused function argument + v----------- + 25: log = function() { + 26: var args; + 27: args = []; + ...: + 36: }; + ^ function expects no arguments. See: ../node_modules/gl-react/lib/helpers/log.js.flow:25 + +../node_modules/gl-react/lib/VisitorLogger.js.flow:51 + v----------------- + 51: node.getGLName() + + 52: " redraw _skipped_: " + + 53: (!node.context.glSurface.gl + 54: ? "no gl context available!" + 55: : !node._needsRedraw ? "no need to redraw" : "") + -----------------------------------------------^ unused function argument + v----------- + 38: _log = function() { + 39: return Function.prototype.apply.call( + 40: console.log, + ...: + 44: }; + ^ function expects no arguments. See: ../node_modules/gl-react/lib/helpers/log.js.flow:38 + +../node_modules/gl-react/lib/VisitorLogger.js.flow:86 + v----------- + 86: "_size_ `" + + 87: w + + 88: "`x`" + +...: + 96: "`" + --^ unused function argument + v----------- + 25: log = function() { + 26: var args; + 27: args = []; + ...: + 36: }; + ^ function expects no arguments. See: ../node_modules/gl-react/lib/helpers/log.js.flow:25 + +../node_modules/gl-react/lib/VisitorLogger.js.flow:86 + v----------- + 86: "_size_ `" + + 87: w + + 88: "`x`" + +...: + 96: "`" + --^ unused function argument + v----------- + 38: _log = function() { + 39: return Function.prototype.apply.call( + 40: console.log, + ...: + 44: }; + ^ function expects no arguments. See: ../node_modules/gl-react/lib/helpers/log.js.flow:38 + +../node_modules/gl-react/lib/VisitorLogger.js.flow:98 + 98: log("_" + preparedUniforms.length + " uniforms:_"); + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unused function argument + v----------- + 25: log = function() { + 26: var args; + 27: args = []; + ...: + 36: }; + ^ function expects no arguments. See: ../node_modules/gl-react/lib/helpers/log.js.flow:25 + +../node_modules/gl-react/lib/VisitorLogger.js.flow:98 + 98: log("_" + preparedUniforms.length + " uniforms:_"); + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unused function argument + v----------- + 38: _log = function() { + 39: return Function.prototype.apply.call( + 40: console.log, + ...: + 44: }; + ^ function expects no arguments. See: ../node_modules/gl-react/lib/helpers/log.js.flow:38 + +../node_modules/gl-react/lib/VisitorLogger.js.flow:112 +112: `${spaces}*${type === "UNKNOWN" ? "[c='color:red']UNKNOWN[c]" : type}* _${key}_ = ${values}`, + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unused function argument + v----------- + 25: log = function() { + 26: var args; + 27: args = []; + ...: + 36: }; + ^ function expects no arguments. See: ../node_modules/gl-react/lib/helpers/log.js.flow:25 + +../node_modules/gl-react/lib/VisitorLogger.js.flow:112 +112: `${spaces}*${type === "UNKNOWN" ? "[c='color:red']UNKNOWN[c]" : type}* _${key}_ = ${values}`, + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unused function argument + v----------- + 38: _log = function() { + 39: return Function.prototype.apply.call( + 40: console.log, + ...: + 44: }; + ^ function expects no arguments. See: ../node_modules/gl-react/lib/helpers/log.js.flow:38 + + +... 24 more errors (only 50 out of 74 errors displayed) +To see all errors, re-run Flow with --show-all-errors diff --git a/packages/tests/utils.js b/packages/tests/utils.js index f8039579..0a94c6bd 100755 --- a/packages/tests/utils.js +++ b/packages/tests/utils.js @@ -28,7 +28,7 @@ function createNodeMock(o) { case "canvas": return { width: o.props.width, - height: o.props.height, + height: o.props.height }; default: return null; @@ -57,7 +57,7 @@ export const create = (el: React.Element<*>) => type SurfaceCounters = { onSurfaceDrawEnd: number, onSurfaceDrawStart: number, - onSurfaceDrawSkipped: number, + onSurfaceDrawSkipped: number }; type NodeCounters = { @@ -65,7 +65,7 @@ type NodeCounters = { onNodeDrawStart: number, onNodeSyncDeps: number, onNodeDraw: number, - onNodeDrawEnd: number, + onNodeDrawEnd: number }; export class CountersVisitor extends Visitor { @@ -77,7 +77,7 @@ export class CountersVisitor extends Visitor { onNodeDrawStart: 0, onNodeSyncDeps: 0, onNodeDraw: 0, - onNodeDrawEnd: 0, + onNodeDrawEnd: 0 }; _surfaceCounters: WeakMap = new WeakMap(); _nodeCounters: WeakMap = new WeakMap(); @@ -90,7 +90,7 @@ export class CountersVisitor extends Visitor { counters = { onSurfaceDrawSkipped: 0, onSurfaceDrawStart: 0, - onSurfaceDrawEnd: 0, + onSurfaceDrawEnd: 0 }; this._surfaceCounters.set(surface, counters); } @@ -104,7 +104,7 @@ export class CountersVisitor extends Visitor { onNodeDrawStart: 0, onNodeSyncDeps: 0, onNodeDraw: 0, - onNodeDrawEnd: 0, + onNodeDrawEnd: 0 }; this._nodeCounters.set(node, counters); } @@ -161,7 +161,7 @@ export const red2x2 = ndarray( 255, 0, 0, - 255, + 255 ]), [2, 2, 4] ); @@ -203,7 +203,7 @@ export const white3x3 = ndarray( 255, 255, 255, - 255, + 255 ]), [3, 3, 4] ); @@ -245,7 +245,7 @@ export const yellow3x3 = ndarray( 255, 255, 0, - 255, + 255 ]), [3, 3, 4] ); @@ -259,7 +259,7 @@ export function createOneTextureLoader(makeTexture: (gl: any) => WebGLTexture) { canLoad: 0, get: 0, load: 0, - createTexture: 0, + createTexture: 0 }; const d = defer(); function resolve() { @@ -299,7 +299,7 @@ export function createOneTextureLoader(makeTexture: (gl: any) => WebGLTexture) { } return { promise, - dispose, + dispose }; } } @@ -308,7 +308,7 @@ export function createOneTextureLoader(makeTexture: (gl: any) => WebGLTexture) { textureId, counters, resolve, - reject, + reject }; } diff --git a/yarn.lock b/yarn.lock index ed6745fb..5f06ea27 100644 --- a/yarn.lock +++ b/yarn.lock @@ -90,12 +90,6 @@ ansi-styles@^2.0.1, ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" -ansi-styles@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.1.0.tgz#09c202d5c917ec23188caa5c9cb9179cd9547750" - dependencies: - color-convert "^1.0.0" - ansi@^0.3.0, ansi@~0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21" @@ -218,10 +212,6 @@ assert@^1.4.0: dependencies: util "0.10.3" -ast-types@0.9.8: - version "0.9.8" - resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.8.tgz#6cb6a40beba31f49f20928e28439fc14a3dab078" - astw@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/astw/-/astw-2.2.0.tgz#7bd41784d32493987aeb239b6b4e1c57a873b917" @@ -279,7 +269,7 @@ babel-cli@^6.14.0: optionalDependencies: chokidar "^1.6.1" -babel-code-frame@6.22.0, babel-code-frame@^6.22.0: +babel-code-frame@^6.22.0: version "6.22.0" resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.22.0.tgz#027620bee567a88c32561574e7fd0801d33118e4" dependencies: @@ -1133,10 +1123,6 @@ babelify@^7.3.0: babel-core "^6.0.14" object-assign "^4.0.0" -babylon@7.0.0-beta.8: - version "7.0.0-beta.8" - resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.8.tgz#2bdc5ae366041442c27e068cce6f0d7c06ea9949" - babylon@^6.11.4, babylon@^6.17.0, babylon@^6.17.2: version "6.17.4" resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.4.tgz#3e8b7402b88d22c3423e137a1577883b15ff869a" @@ -1498,7 +1484,7 @@ center-align@^0.1.1: align-text "^0.1.3" lazy-cache "^1.0.3" -chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3: +chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" dependencies: @@ -1628,16 +1614,6 @@ collapse-white-space@^1.0.0, collapse-white-space@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.3.tgz#4b906f670e5a963a87b76b0e1689643341b6023c" -color-convert@^1.0.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a" - dependencies: - color-name "^1.1.1" - -color-name@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.2.tgz#5c8ab72b64bd2215d617ae9559ebb148475cf98d" - columnify@^1.5.4: version "1.5.4" resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb" @@ -2435,7 +2411,7 @@ estraverse@~1.5.0: version "1.5.1" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.5.1.tgz#867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71" -esutils@2.0.2, esutils@^2.0.0, esutils@^2.0.2: +esutils@^2.0.0, esutils@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" @@ -2666,9 +2642,9 @@ first-chunk-stream@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e" -flow-bin@^0.46.0: - version "0.46.0" - resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.46.0.tgz#06ad7fe19dddb1042264438064a2a32fee12b872" +flow-bin@^0.49.1: + version "0.49.1" + resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.49.1.tgz#c9e456b3173a7535a4ffaf28956352c63bb8e3e9" flow-copy-source@^1.1.0: version "1.2.0" @@ -2680,10 +2656,6 @@ flow-copy-source@^1.1.0: kefir "^3.2.0" yargs "^8.0.2" -flow-parser@0.45.0: - version "0.45.0" - resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.45.0.tgz#aa29d4ae27f06aa02817772bba0fcbefef7e62f0" - for-in@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -2815,10 +2787,6 @@ get-port@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/get-port/-/get-port-3.1.0.tgz#ef01b18a84ca6486970ff99e54446141a73ffd3e" -get-stdin@5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398" - get-stdin@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" @@ -2932,17 +2900,6 @@ glob-stream@^5.3.2: to-absolute-glob "^0.1.1" unique-stream "^2.0.2" -glob@7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8" - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.2" - once "^1.3.0" - path-is-absolute "^1.0.0" - glob@^5.0.3: version "5.0.15" resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" @@ -3575,22 +3532,6 @@ jest-haste-map@^20.0.4: sane "~1.6.0" worker-farm "^1.3.1" -jest-matcher-utils@^19.0.0: - version "19.0.0" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-19.0.0.tgz#5ecd9b63565d2b001f61fbf7ec4c7f537964564d" - dependencies: - chalk "^1.1.3" - pretty-format "^19.0.0" - -jest-validate@19.0.0: - version "19.0.0" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-19.0.0.tgz#8c6318a20ecfeaba0ba5378bfbb8277abded4173" - dependencies: - chalk "^1.1.1" - jest-matcher-utils "^19.0.0" - leven "^2.0.0" - pretty-format "^19.0.0" - joi@^6.6.1: version "6.10.1" resolved "https://registry.yarnpkg.com/joi/-/joi-6.10.1.tgz#4d50c318079122000fe5f16af1ff8e1917b77e06" @@ -3740,7 +3681,7 @@ left-pad@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.1.3.tgz#612f61c033f3a9e08e939f1caebeea41b6f3199a" -lerna@^2.0.0-rc.4: +lerna@^2.0.0-rc.5: version "2.0.0-rc.5" resolved "https://registry.yarnpkg.com/lerna/-/lerna-2.0.0-rc.5.tgz#b59d168caaac6e3443078c1bce194208c9aa3090" dependencies: @@ -3780,10 +3721,6 @@ lerna@^2.0.0-rc.4: write-pkg "^3.0.1" yargs "^8.0.1" -leven@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580" - lexical-scope@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/lexical-scope/-/lexical-scope-1.2.0.tgz#fcea5edc704a4b3a8796cdca419c3a0afaf22df4" @@ -4192,14 +4129,14 @@ minimist@0.0.8: version "0.0.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" -minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - minimist@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de" +minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" + minimist@~0.0.1: version "0.0.10" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" @@ -4727,26 +4664,9 @@ preserve@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" -prettier@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.3.1.tgz#fa0ea84b45ac0ba6de6a1e4cecdcff900d563151" - dependencies: - ast-types "0.9.8" - babel-code-frame "6.22.0" - babylon "7.0.0-beta.8" - chalk "1.1.3" - esutils "2.0.2" - flow-parser "0.45.0" - get-stdin "5.0.1" - glob "7.1.1" - jest-validate "19.0.0" - minimist "1.2.0" - -pretty-format@^19.0.0: - version "19.0.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-19.0.0.tgz#56530d32acb98a3fa4851c4e2b9d37b420684c84" - dependencies: - ansi-styles "^3.0.0" +prettier@^1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.5.2.tgz#7ea0751da27b93bfb6cecfcec509994f52d83bb3" pretty-format@^4.2.1: version "4.3.1"