From 298ce6c488996ace82348a96e746b2881eeb5b1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= Date: Sun, 6 Mar 2016 14:03:15 +0100 Subject: [PATCH] migrate to import synthax --- example/src/AdvancedEffects/Banner.js | 6 ++-- example/src/AdvancedEffects/Intro.js | 6 ++-- example/src/AdvancedEffects/Slideshow.js | 11 ++++---- example/src/AdvancedEffects/Transition.js | 4 +-- .../AdvancedEffects/TransitionGenerator.js | 2 +- example/src/AdvancedEffects/Vignette.js | 6 ++-- example/src/AdvancedEffects/index.js | 16 +++++------ example/src/Hearts/Heart.js | 3 +- example/src/Hearts/index.js | 14 +++++----- example/src/Simple/AnimatedHelloGL.js | 7 ++--- example/src/Simple/Button.js | 6 ++-- example/src/Simple/HelloGL.js | 4 +-- example/src/Simple/HueRotate.js | 4 +-- example/src/Simple/OneFingerResponse.js | 8 ++---- example/src/Simple/PieProgress.js | 4 +-- example/src/Simple/Saturation.js | 4 +-- example/src/Simple/index.js | 26 ++++++++--------- example/src/Tests/Add.js | 4 +-- example/src/Tests/Copy.js | 4 +-- example/src/Tests/Display2.js | 4 +-- example/src/Tests/HelloGL.js | 4 +-- example/src/Tests/Layer.js | 4 +-- example/src/Tests/Multiply.js | 4 +-- example/src/Tests/NativeLayer.js | 5 +--- .../src/Tests/TransparentNonPremultiplied.js | 4 +-- example/src/Tests/index.js | 28 +++++++++---------- src/GLCanvas.captureFrame.android.js | 8 ++---- src/GLCanvas.captureFrame.ios.js | 4 +-- src/GLCanvas.js | 11 ++++---- src/Surface.js | 15 +++++----- src/index.js | 9 +++--- 31 files changed, 112 insertions(+), 127 deletions(-) diff --git a/example/src/AdvancedEffects/Banner.js b/example/src/AdvancedEffects/Banner.js index 5eab1b6..179c192 100644 --- a/example/src/AdvancedEffects/Banner.js +++ b/example/src/AdvancedEffects/Banner.js @@ -1,6 +1,6 @@ -const React = require("react-native"); -const GL = require("gl-react"); -const {Surface} = require("gl-react-native"); +import React from "react-native"; +import GL from "gl-react"; +import {Surface} from "gl-react-native"; const shaders = GL.Shaders.create({ banner: { frag: ` diff --git a/example/src/AdvancedEffects/Intro.js b/example/src/AdvancedEffects/Intro.js index c73a2bb..b68b3a3 100644 --- a/example/src/AdvancedEffects/Intro.js +++ b/example/src/AdvancedEffects/Intro.js @@ -1,10 +1,10 @@ -const React = require("react-native"); +import React from "react-native"; const { View, Text, } = React; -const GL = require("gl-react"); -const {Surface} = require("gl-react-native"); +import GL from "gl-react"; +import {Surface} from "gl-react-native"; const shaders = GL.Shaders.create({ drunkEffect: { diff --git a/example/src/AdvancedEffects/Slideshow.js b/example/src/AdvancedEffects/Slideshow.js index fc1f232..19d335c 100644 --- a/example/src/AdvancedEffects/Slideshow.js +++ b/example/src/AdvancedEffects/Slideshow.js @@ -1,9 +1,8 @@ -const React = require("react-native"); -const { View, Text, StyleSheet } = React; -const GL = require("gl-react"); -const {Surface} = require("gl-react-native"); -const TransitionGenerator = require("./TransitionGenerator"); -const Transition = require("./Transition"); +import React, { View, Text, StyleSheet } from "react-native"; +import GL from "gl-react"; +import {Surface} from "gl-react-native"; +import TransitionGenerator from "./TransitionGenerator"; +import Transition from "./Transition"; const shaders = GL.Shaders.create(TransitionGenerator.shaders); diff --git a/example/src/AdvancedEffects/Transition.js b/example/src/AdvancedEffects/Transition.js index adb7043..8e507b4 100644 --- a/example/src/AdvancedEffects/Transition.js +++ b/example/src/AdvancedEffects/Transition.js @@ -1,5 +1,5 @@ -const React = require("react-native"); -const GL = require("gl-react"); +import React from "react-native"; +import GL from "gl-react"; module.exports = GL.createComponent( ({ width, height, shader, progress, from, to, uniforms }) => { diff --git a/example/src/AdvancedEffects/TransitionGenerator.js b/example/src/AdvancedEffects/TransitionGenerator.js index 5870022..b70ba35 100644 --- a/example/src/AdvancedEffects/TransitionGenerator.js +++ b/example/src/AdvancedEffects/TransitionGenerator.js @@ -1,4 +1,4 @@ -const GlslTransitions = require("glsl-transitions"); +import GlslTransitions from "glsl-transitions"; const byName = {}; GlslTransitions.forEach(function (t) { byName[t.name] = t; diff --git a/example/src/AdvancedEffects/Vignette.js b/example/src/AdvancedEffects/Vignette.js index 8539830..4ed7b05 100644 --- a/example/src/AdvancedEffects/Vignette.js +++ b/example/src/AdvancedEffects/Vignette.js @@ -1,6 +1,6 @@ -const React = require("react-native"); -const GL = require("gl-react"); -const {Surface} = require("gl-react-native"); +import React from "react-native"; +import GL from "gl-react"; +import {Surface} from "gl-react-native"; const shaders = GL.Shaders.create({ imageVignette: { diff --git a/example/src/AdvancedEffects/index.js b/example/src/AdvancedEffects/index.js index d0173db..5c7c424 100644 --- a/example/src/AdvancedEffects/index.js +++ b/example/src/AdvancedEffects/index.js @@ -1,16 +1,14 @@ -const React = require("react-native"); -const { +import React, { StyleSheet, View, -} = React; +} from "react-native"; const { width: viewportW, height: viewportH } = require("Dimensions").get("window"); -const resolveAssetSource = require("react-native/Libraries/Image/resolveAssetSource"); - -const Banner = require("./Banner"); -const Intro = require("./Intro"); -const Vignette = require("./Vignette"); -const Slideshow = require("./Slideshow"); +import resolveAssetSource from "react-native/Libraries/Image/resolveAssetSource"; +import Banner from "./Banner"; +import Intro from "./Intro"; +import Vignette from "./Vignette"; +import Slideshow from "./Slideshow"; class AdvancedEffects extends React.Component { diff --git a/example/src/Hearts/Heart.js b/example/src/Hearts/Heart.js index 0810192..63d0da3 100644 --- a/example/src/Hearts/Heart.js +++ b/example/src/Hearts/Heart.js @@ -1,6 +1,5 @@ import GL from "gl-react"; -import React from "react"; -const {PropTypes} = React; +import React, {PropTypes} from "react"; const shaders = GL.Shaders.create({ Heart: { // inspired from http://glslsandbox.com/e#29521.0 diff --git a/example/src/Hearts/index.js b/example/src/Hearts/index.js index 96a87a8..24367c4 100644 --- a/example/src/Hearts/index.js +++ b/example/src/Hearts/index.js @@ -1,13 +1,13 @@ -const React = require("react-native"); -const { +import React, { StyleSheet, ListView, Component, -} = React; -const seedrandom = require("seedrandom"); -const { width: viewportWidth } = require("Dimensions").get("window"); -const {Surface} = require("gl-react-native"); -const Heart = require("./Heart"); +} from "react-native"; +import seedrandom from "seedrandom"; +import Dimensions from "Dimensions"; +const { width: viewportWidth } = Dimensions.get("window"); +import {Surface} from "gl-react-native"; +import Heart from "./Heart"; const sameColor = ([r,g,b], [R,G,B]) => r===R && g===G && b===B; diff --git a/example/src/Simple/AnimatedHelloGL.js b/example/src/Simple/AnimatedHelloGL.js index 8bb2a52..53dc336 100644 --- a/example/src/Simple/AnimatedHelloGL.js +++ b/example/src/Simple/AnimatedHelloGL.js @@ -1,7 +1,6 @@ -const React = require("react-native"); -const GL = require("gl-react"); -const {Surface} = require("gl-react-native"); -const {Animated} = React; +import React, {Animated} from "react-native"; +import GL from "gl-react"; +import {Surface} from "gl-react-native"; const shaders = GL.Shaders.create({ helloGL: { diff --git a/example/src/Simple/Button.js b/example/src/Simple/Button.js index 1cf8b93..a5dcb44 100644 --- a/example/src/Simple/Button.js +++ b/example/src/Simple/Button.js @@ -1,12 +1,10 @@ -const React = require("react-native"); - -const { +import React, { StyleSheet, Component, View, Text, TouchableOpacity -} = React; +} from "react-native"; const styles = StyleSheet.create({ root: { diff --git a/example/src/Simple/HelloGL.js b/example/src/Simple/HelloGL.js index 475087d..b0e546a 100644 --- a/example/src/Simple/HelloGL.js +++ b/example/src/Simple/HelloGL.js @@ -1,5 +1,5 @@ -const GL = require("gl-react"); -const React = require("react"); +import GL from "gl-react"; +import React from "react"; const shaders = GL.Shaders.create({ helloGL: { diff --git a/example/src/Simple/HueRotate.js b/example/src/Simple/HueRotate.js index 1c85254..9fc0837 100644 --- a/example/src/Simple/HueRotate.js +++ b/example/src/Simple/HueRotate.js @@ -1,5 +1,5 @@ -const GL = require("gl-react"); -const React = require("react"); +import GL from "gl-react"; +import React from "react"; const shaders = GL.Shaders.create({ hueRotate: { diff --git a/example/src/Simple/OneFingerResponse.js b/example/src/Simple/OneFingerResponse.js index 8cede14..de5bb52 100644 --- a/example/src/Simple/OneFingerResponse.js +++ b/example/src/Simple/OneFingerResponse.js @@ -1,8 +1,6 @@ -const React = require("react-native"); -const GL = require("gl-react"); -const {Surface} = require("gl-react-native"); - -const {PanResponder, UIManager} = React; +import React, {PanResponder, UIManager} from "react-native"; +import GL from "gl-react"; +import {Surface} from "gl-react-native"; const shaders = GL.Shaders.create({ oneFingerResponse: { diff --git a/example/src/Simple/PieProgress.js b/example/src/Simple/PieProgress.js index a7a8d57..ed1032e 100644 --- a/example/src/Simple/PieProgress.js +++ b/example/src/Simple/PieProgress.js @@ -1,5 +1,5 @@ -const GL = require("gl-react"); -const React = require("react"); +import GL from "gl-react"; +import React from "react"; const shaders = GL.Shaders.create({ pieProgress: { diff --git a/example/src/Simple/Saturation.js b/example/src/Simple/Saturation.js index f24ec3f..88b6f1e 100644 --- a/example/src/Simple/Saturation.js +++ b/example/src/Simple/Saturation.js @@ -1,5 +1,5 @@ -const GL = require("gl-react"); -const React = require("react"); +import GL from "gl-react"; +import React from "react"; const shaders = GL.Shaders.create({ saturation: { diff --git a/example/src/Simple/index.js b/example/src/Simple/index.js index 471a2bf..6fa741c 100644 --- a/example/src/Simple/index.js +++ b/example/src/Simple/index.js @@ -1,5 +1,4 @@ -const React = require("react-native"); -const { +import React, { StyleSheet, Text, View, @@ -7,9 +6,9 @@ const { TextInput, Component, TouchableOpacity, -} = React; +} from "react-native"; -const { Surface } = require("gl-react-native"); +import { Surface } from "gl-react-native"; const { mdl: { @@ -20,16 +19,15 @@ const { MKButton, } = require("react-native-material-kit"); -const RNFS = require("react-native-fs"); - -const HelloGL = require("./HelloGL"); -const Saturation = require("./Saturation"); -const HueRotate = require("./HueRotate"); -const PieProgress = require("./PieProgress"); -const OneFingerResponse = require("./OneFingerResponse"); -const AnimatedHelloGL = require("./AnimatedHelloGL"); -const {Blur} = require("gl-react-blur"); -const Button = require("./Button"); +import RNFS from "react-native-fs"; +import HelloGL from "./HelloGL"; +import Saturation from "./Saturation"; +import HueRotate from "./HueRotate"; +import PieProgress from "./PieProgress"; +import OneFingerResponse from "./OneFingerResponse"; +import AnimatedHelloGL from "./AnimatedHelloGL"; +import {Blur} from "gl-react-blur"; +import Button from "./Button"; class Demo extends Component { render () { diff --git a/example/src/Tests/Add.js b/example/src/Tests/Add.js index d25edd8..8236c1e 100644 --- a/example/src/Tests/Add.js +++ b/example/src/Tests/Add.js @@ -1,5 +1,5 @@ -const GL = require("gl-react"); -const React = require("react"); +import GL from "gl-react"; +import React from "react"; const shaders = GL.Shaders.create({ add: { diff --git a/example/src/Tests/Copy.js b/example/src/Tests/Copy.js index 33be68e..0005401 100644 --- a/example/src/Tests/Copy.js +++ b/example/src/Tests/Copy.js @@ -1,5 +1,5 @@ -const GL = require("gl-react"); -const React = require("react"); +import GL from "gl-react"; +import React from "react"; const shaders = GL.Shaders.create({ Copy: { diff --git a/example/src/Tests/Display2.js b/example/src/Tests/Display2.js index 003fd18..074365b 100644 --- a/example/src/Tests/Display2.js +++ b/example/src/Tests/Display2.js @@ -1,5 +1,5 @@ -const GL = require("gl-react"); -const React = require("react"); +import GL from "gl-react"; +import React from "react"; const shaders = GL.Shaders.create({ display2: { diff --git a/example/src/Tests/HelloGL.js b/example/src/Tests/HelloGL.js index d944c7c..0b27b92 100644 --- a/example/src/Tests/HelloGL.js +++ b/example/src/Tests/HelloGL.js @@ -1,5 +1,5 @@ -const GL = require("gl-react"); -const React = require("react"); +import GL from "gl-react"; +import React from "react"; const shaders = GL.Shaders.create({ helloGL: { diff --git a/example/src/Tests/Layer.js b/example/src/Tests/Layer.js index 5bef44b..3d57581 100644 --- a/example/src/Tests/Layer.js +++ b/example/src/Tests/Layer.js @@ -1,5 +1,5 @@ -const GL = require("gl-react"); -const React = require("react"); +import GL from "gl-react"; +import React from "react"; const shaders = GL.Shaders.create({ layer: { diff --git a/example/src/Tests/Multiply.js b/example/src/Tests/Multiply.js index fde8023..7e9ecb8 100644 --- a/example/src/Tests/Multiply.js +++ b/example/src/Tests/Multiply.js @@ -1,5 +1,5 @@ -const GL = require("gl-react"); -const React = require("react"); +import GL from "gl-react"; +import React from "react"; const shaders = GL.Shaders.create({ multiply: { diff --git a/example/src/Tests/NativeLayer.js b/example/src/Tests/NativeLayer.js index 1a10cd8..2b89084 100644 --- a/example/src/Tests/NativeLayer.js +++ b/example/src/Tests/NativeLayer.js @@ -1,7 +1,4 @@ -const React = require("react-native"); -const { - View -} = React; +import React, { View } from "react-native"; class NativeLayer extends React.Component { render () { diff --git a/example/src/Tests/TransparentNonPremultiplied.js b/example/src/Tests/TransparentNonPremultiplied.js index 39518a6..89e8ed1 100644 --- a/example/src/Tests/TransparentNonPremultiplied.js +++ b/example/src/Tests/TransparentNonPremultiplied.js @@ -1,5 +1,5 @@ -const GL = require("gl-react"); -const React = require("react"); +import GL from "gl-react"; +import React from "react"; const shaders = GL.Shaders.create({ TransparentNonPremultiplied: { diff --git a/example/src/Tests/index.js b/example/src/Tests/index.js index d6d1086..ae8f9ed 100644 --- a/example/src/Tests/index.js +++ b/example/src/Tests/index.js @@ -1,21 +1,21 @@ -const React = require("react-native"); -const { +import React, { Text, View, ScrollView, Image, -} = React; -const { Surface } = require("gl-react-native"); -const {Blur} = require("gl-react-blur"); -const Add = require("./Add"); -const Multiply = require("./Multiply"); -const Layer = require("./Layer"); -const NativeLayer = require("./NativeLayer"); -const HelloGL = require("./HelloGL"); -const Display2 = require("./Display2"); -const Copy = require("./Copy"); -const TransparentNonPremultiplied = require("./TransparentNonPremultiplied"); -const { width: viewportW, height: viewportH } = require("Dimensions").get("window"); +} from "react-native"; +import {Surface} from "gl-react-native"; +import {Blur} from "gl-react-blur"; +import Add from "./Add"; +import Multiply from "./Multiply"; +import Layer from "./Layer"; +import NativeLayer from "./NativeLayer"; +import HelloGL from "./HelloGL"; +import Display2 from "./Display2"; +import Copy from "./Copy"; +import TransparentNonPremultiplied from "./TransparentNonPremultiplied"; +import Dimensions from "Dimensions"; +const { width: viewportW, height: viewportH } = Dimensions.get("window"); class Tests extends React.Component { diff --git a/src/GLCanvas.captureFrame.android.js b/src/GLCanvas.captureFrame.android.js index f16ee53..2c24195 100644 --- a/src/GLCanvas.captureFrame.android.js +++ b/src/GLCanvas.captureFrame.android.js @@ -1,8 +1,6 @@ -const invariant = require("invariant"); -const React = require("react-native"); -const { - NativeModules: { UIManager } -} = React; +import invariant from "invariant"; +import {NativeModules} from "react-native"; +const {UIManager} = NativeModules; const {GLCanvas} = UIManager; invariant(GLCanvas, `gl-react-native: the native module is not available. diff --git a/src/GLCanvas.captureFrame.ios.js b/src/GLCanvas.captureFrame.ios.js index 80c2a53..fac4a0d 100644 --- a/src/GLCanvas.captureFrame.ios.js +++ b/src/GLCanvas.captureFrame.ios.js @@ -1,5 +1,5 @@ -const invariant = require("invariant"); -const React = require("react-native"); +import invariant from "invariant"; +import React from "react-native"; const { NativeModules: { GLCanvasManager } } = React; diff --git a/src/GLCanvas.js b/src/GLCanvas.js index 41d72a8..4696991 100644 --- a/src/GLCanvas.js +++ b/src/GLCanvas.js @@ -1,11 +1,10 @@ -const invariant = require("invariant"); -const React = require("react-native"); -const { +import invariant from "invariant"; +import React, { Component, requireNativeComponent, -} = React; -const defer = require("promise-defer"); -const captureFrame = require("./GLCanvas.captureFrame"); +} from "react-native"; +import defer from "promise-defer"; +import captureFrame from "./GLCanvas.captureFrame"; const serializeOption = config => config.format + ":" + config.type + ":" + config.quality; diff --git a/src/Surface.js b/src/Surface.js index d2afb5a..79b279c 100644 --- a/src/Surface.js +++ b/src/Surface.js @@ -1,12 +1,13 @@ -const invariant = require("invariant"); -const {createSurface} = require("gl-react"); -invariant(typeof createSurface === "function", "gl-react createSurface is not a function. Check your gl-react dependency"); -const React = require("react-native"); -const { +import invariant from "invariant"; +import {createSurface} from "gl-react"; +import React, { View, PixelRatio -} = React; -const GLCanvas = require("./GLCanvas"); +} from "react-native"; +import GLCanvas from "./GLCanvas"; + +invariant(typeof createSurface === "function", +"gl-react createSurface is not a function. Check your gl-react dependency"); const getPixelRatio = props => props.scale || PixelRatio.get(); diff --git a/src/index.js b/src/index.js index 3d35e29..7dcbe04 100644 --- a/src/index.js +++ b/src/index.js @@ -1,7 +1,8 @@ -const invariant = require("invariant"); -const { Shaders } = require("gl-react"); -const Surface = require("./Surface"); -const { NativeModules: { RNGLContext } } = require("react-native"); +import invariant from "invariant"; +import { Shaders } from "gl-react"; +import Surface from "./Surface"; +import {NativeModules} from "react-native"; +const {RNGLContext} = NativeModules; invariant(RNGLContext, `gl-react-native: the native module is not available. Make sure you have properly configured it. -- 2.26.2