Browse Source

env files after update

Daniel Zlotin 8 years ago
parent
commit
06b20c4a57

+ 23
- 61
example-redux/.flowconfig View File

@@ -1,70 +1,28 @@
1 1
 [ignore]
2 2
 
3 3
 # We fork some components by platform.
4
-.*/*.web.js
5 4
 .*/*.android.js
6 5
 
7
-# Some modules have their own node_modules with overlap
8
-.*/node_modules/node-haste/.*
9
-
10
-# Ugh
11
-.*/node_modules/babel.*
12
-.*/node_modules/babylon.*
13
-.*/node_modules/invariant.*
14
-
15
-# Ignore react and fbjs where there are overlaps, but don't ignore
16
-# anything that react-native relies on
17
-.*/node_modules/fbjs/lib/Map.js
18
-.*/node_modules/fbjs/lib/fetch.js
19
-.*/node_modules/fbjs/lib/ExecutionEnvironment.js
20
-.*/node_modules/fbjs/lib/ErrorUtils.js
21
-
22
-# Flow has a built-in definition for the 'react' module which we prefer to use
23
-# over the currently-untyped source
24
-.*/node_modules/react/react.js
25
-.*/node_modules/react/lib/React.js
26
-.*/node_modules/react/lib/ReactDOM.js
27
-
28
-.*/__mocks__/.*
29
-.*/__tests__/.*
30
-
31
-.*/commoner/test/source/widget/share.js
32
-
33
-# Ignore commoner tests
34
-.*/node_modules/commoner/test/.*
35
-
36
-# See https://github.com/facebook/flow/issues/442
37
-.*/react-tools/node_modules/commoner/lib/reader.js
6
+# Ignore templates with `@flow` in header
7
+.*/local-cli/generator.*
38 8
 
39
-# Ignore jest
40
-.*/node_modules/jest-cli/.*
9
+# Ignore malformed json
10
+.*/node_modules/y18n/test/.*\.json
41 11
 
42
-# Ignore Website
43
-.*/website/.*
12
+# Ignore the website subdir
13
+<PROJECT_ROOT>/website/.*
44 14
 
45
-# Ignore generators
46
-.*/local-cli/generator.*
15
+# Ignore BUCK generated dirs
16
+<PROJECT_ROOT>/\.buckd/
47 17
 
48
-# Ignore BUCK generated folders
49
-.*\.buckd/
50
-
51
-.*/node_modules/is-my-json-valid/test/.*\.json
52
-.*/node_modules/iconv-lite/encodings/tables/.*\.json
53
-.*/node_modules/y18n/test/.*\.json
54
-.*/node_modules/spdx-license-ids/spdx-license-ids.json
55
-.*/node_modules/spdx-exceptions/index.json
56
-.*/node_modules/resolve/test/subdirs/node_modules/a/b/c/x.json
57
-.*/node_modules/resolve/lib/core.json
58
-.*/node_modules/jsonparse/samplejson/.*\.json
59
-.*/node_modules/json5/test/.*\.json
60
-.*/node_modules/ua-parser-js/test/.*\.json
61
-.*/node_modules/builtin-modules/builtin-modules.json
62
-.*/node_modules/binary-extensions/binary-extensions.json
63
-.*/node_modules/url-regex/tlds.json
64
-.*/node_modules/joi/.*\.json
65
-.*/node_modules/isemail/.*\.json
66
-.*/node_modules/tr46/.*\.json
18
+# Ignore unexpected extra @providesModule
19
+.*/node_modules/commoner/test/source/widget/share.js
67 20
 
21
+# Ignore duplicate module providers
22
+# For RN Apps installed via npm, "Libraries" folder is inside node_modules/react-native but in the source repo it is in the root
23
+.*/Libraries/react-native/React.js
24
+.*/Libraries/react-native/ReactNative.js
25
+.*/node_modules/jest-runtime/build/__tests__/.*
68 26
 
69 27
 [include]
70 28
 
@@ -79,18 +37,22 @@ module.system=haste
79 37
 esproposal.class_static_fields=enable
80 38
 esproposal.class_instance_fields=enable
81 39
 
40
+experimental.strict_type_args=true
41
+
82 42
 munge_underscores=true
83 43
 
84 44
 module.name_mapper='^image![a-zA-Z0-9$_-]+$' -> 'GlobalImageStub'
85
-module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\)$' -> 'RelativeImageStub'
45
+module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
86 46
 
87 47
 suppress_type=$FlowIssue
88 48
 suppress_type=$FlowFixMe
89 49
 suppress_type=$FixMe
90 50
 
91
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(2[0-3]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
92
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(2[0-3]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
51
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(2[0-9]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
52
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(2[0-9]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
93 53
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
94 54
 
55
+unsafe.enable_getters_and_setters=true
56
+
95 57
 [version]
96
-0.23.0
58
+^0.29.0

+ 1
- 1
example-redux/android/app/BUCK View File

@@ -5,7 +5,7 @@ import re
5 5
 # - install Buck
6 6
 # - `npm start` - to start the packager
7 7
 # - `cd android`
8
-# - `keytool -genkey -v -keystore keystores/debug.keystore -storepass android -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US`
8
+# - `keytool -genkey -v -keystore keystores/debug.keystore -storepass android -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US"`
9 9
 # - `./gradlew :app:copyDownloadableDepsToLibs` - make all Gradle compile dependencies available to Buck
10 10
 # - `buck install -r android/app` - compile, install and run application
11 11
 #

+ 7
- 6
example-redux/android/app/build.gradle View File

@@ -55,7 +55,13 @@ import com.android.build.OutputFile
55 55
  *   // date; if you have any other folders that you want to ignore for performance reasons (gradle
56 56
  *   // indexes the entire tree), add them here. Alternatively, if you have JS files in android/
57 57
  *   // for example, you might want to remove it from here.
58
- *   inputExcludes: ["android/**", "ios/**"]
58
+ *   inputExcludes: ["android/**", "ios/**"],
59
+ *
60
+ *   // override which node gets called and with what additional arguments
61
+ *   nodeExecutableAndArgs: ["node"]
62
+ *
63
+ *   // supply additional arguments to the packager
64
+ *   extraPackagerArgs: []
59 65
  * ]
60 66
  */
61 67
 
@@ -125,7 +131,6 @@ dependencies {
125 131
     compile "com.facebook.react:react-native:+"  // From node_modules
126 132
     debugCompile project(path: ':react-native-navigation', configuration: 'libraryDebug')
127 133
     releaseCompile project(path: ':react-native-navigation', configuration: 'libraryRelease')
128
-//    compile project(':react-native-navigation')
129 134
 }
130 135
 
131 136
 // Run this once to be able to run the application with BUCK
@@ -134,7 +139,3 @@ task copyDownloadableDepsToLibs(type: Copy) {
134 139
   from configurations.compile
135 140
   into 'libs'
136 141
 }
137
-
138
-task runDebug(dependsOn: ['assembleDebug', 'installDebug']) << {
139
-    println 'FINISHED'
140
-}

+ 6
- 3
example-redux/android/app/proguard-rules.pro View File

@@ -26,11 +26,14 @@
26 26
 # See http://sourceforge.net/p/proguard/bugs/466/
27 27
 -keep,allowobfuscation @interface com.facebook.proguard.annotations.DoNotStrip
28 28
 -keep,allowobfuscation @interface com.facebook.proguard.annotations.KeepGettersAndSetters
29
+-keep,allowobfuscation @interface com.facebook.common.internal.DoNotStrip
29 30
 
30 31
 # Do not strip any method/class that is annotated with @DoNotStrip
31 32
 -keep @com.facebook.proguard.annotations.DoNotStrip class *
33
+-keep @com.facebook.common.internal.DoNotStrip class *
32 34
 -keepclassmembers class * {
33 35
     @com.facebook.proguard.annotations.DoNotStrip *;
36
+    @com.facebook.common.internal.DoNotStrip *;
34 37
 }
35 38
 
36 39
 -keepclassmembers @com.facebook.proguard.annotations.KeepGettersAndSetters class * {
@@ -51,9 +54,9 @@
51 54
 
52 55
 -keepattributes Signature
53 56
 -keepattributes *Annotation*
54
--keep class com.squareup.okhttp.** { *; }
55
--keep interface com.squareup.okhttp.** { *; }
56
--dontwarn com.squareup.okhttp.**
57
+-keep class okhttp3.** { *; }
58
+-keep interface okhttp3.** { *; }
59
+-dontwarn okhttp3.**
57 60
 
58 61
 # okio
59 62
 

+ 2
- 2
example-redux/android/build.gradle View File

@@ -5,7 +5,7 @@ buildscript {
5 5
         jcenter()
6 6
     }
7 7
     dependencies {
8
-        classpath 'com.android.tools.build:gradle:2.1.3'
8
+        classpath 'com.android.tools.build:gradle:1.3.1'
9 9
 
10 10
         // NOTE: Do not place your application dependencies here; they belong
11 11
         // in the individual module build.gradle files
@@ -18,7 +18,7 @@ allprojects {
18 18
         jcenter()
19 19
         maven {
20 20
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
21
-            url "$projectDir/../../node_modules/react-native/android"
21
+            url "$rootDir/../node_modules/react-native/android"
22 22
         }
23 23
     }
24 24
 }