Merge remote-tracking branch 'upstream/master' (1df54554) · Commits · codevise / react-native-video

.eslintrc

0 → 100644

+4 −0

Changes for .eslintrc: 4 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		{
		"extends": "airbnb",
		"parser": "babel-eslint"
		}

Examples/VideoPlayer/.flowconfig

+41 −15

Changes for Examples/VideoPlayer/.flowconfig: 41 added lines, 15 removed lines.
Original line number	Diff line number	Diff line
		@@ -14,17 +14,21 @@

		# Ignore react and fbjs where there are overlaps, but don't ignore
		# anything that react-native relies on
		./node_modules/fbjs-haste/./__tests__/.*
		.*/node_modules/fbjs-haste/__forks__/Map.js
		.*/node_modules/fbjs-haste/__forks__/Promise.js
		.*/node_modules/fbjs-haste/__forks__/fetch.js
		.*/node_modules/fbjs-haste/core/ExecutionEnvironment.js
		.*/node_modules/fbjs-haste/core/isEmpty.js
		.*/node_modules/fbjs-haste/crypto/crc32.js
		.*/node_modules/fbjs-haste/stubs/ErrorUtils.js
		.*/node_modules/react-haste/React.js
		.*/node_modules/react-haste/renderers/dom/ReactDOM.js
		.*/node_modules/react-haste/renderers/shared/event/eventPlugins/ResponderEventPlugin.js
		.*/node_modules/fbjs/lib/Map.js
		.*/node_modules/fbjs/lib/fetch.js
		.*/node_modules/fbjs/lib/ExecutionEnvironment.js
		.*/node_modules/fbjs/lib/ErrorUtils.js

		# Flow has a built-in definition for the 'react' module which we prefer to use
		# over the currently-untyped source
		.*/node_modules/react/react.js
		.*/node_modules/react/lib/React.js
		.*/node_modules/react/lib/ReactDOM.js

		./__mocks__/.
		./__tests__/.

		.*/commoner/test/source/widget/share.js

		# Ignore commoner tests
		./node_modules/commoner/test/.
		@@ -38,26 +42,48 @@
		# Ignore Website
		./website/.

		./node_modules/is-my-json-valid/test/.\.json
		./node_modules/iconv-lite/encodings/tables/.\.json
		./node_modules/y18n/test/.\.json
		.*/node_modules/spdx-license-ids/spdx-license-ids.json
		.*/node_modules/spdx-exceptions/index.json
		.*/node_modules/resolve/test/subdirs/node_modules/a/b/c/x.json
		.*/node_modules/resolve/lib/core.json
		./node_modules/jsonparse/samplejson/.\.json
		./node_modules/json5/test/.\.json
		./node_modules/ua-parser-js/test/.\.json
		.*/node_modules/builtin-modules/builtin-modules.json
		.*/node_modules/binary-extensions/binary-extensions.json
		.*/node_modules/url-regex/tlds.json
		./node_modules/joi/.\.json
		./node_modules/isemail/.\.json
		./node_modules/tr46/.\.json

		[include]

		[libs]
		node_modules/react-native/Libraries/react-native/react-native-interface.js
		node_modules/react-native/flow
		flow/

		[options]
		module.system=haste

		esproposal.class_static_fields=enable
		esproposal.class_instance_fields=enable

		munge_underscores=true

		module.name_mapper='^image![a-zA-Z0-9$_-]+$' -> 'GlobalImageStub'
		module.name_mapper='^[./a-zA-Z0-9$_-]+\.png$' -> 'RelativeImageStub'
		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'

		suppress_type=$FlowIssue
		suppress_type=$FlowFixMe
		suppress_type=$FixMe

		suppress_comment=\$.\\\|\n\$\\$FlowFixMe\$$\\\|[^(]\\\|(\\(>=0\\.\\(1[0-8]\\\|[0-9]\$.[0-9]\\)? \$site=[a-z,_]react_native[a-z,_]\$?)\\)
		suppress_comment=\$.\\\|\n\$\\$FlowIssue\$(\\(>=0\\.\\(1[0-8]\\\|[0-9]\$.[0-9]\\)? \$site=[a-z,_]react_native[a-z,_]\$?)\\)? #[0-9]+
		suppress_comment=\$.\\\|\n\$\\$FlowFixMe\$$\\\|[^(]\\\|(\\(>=0\\.\\(2[0-2]\\\|1[0-9]\\\|[0-9]\$.[0-9]\\)? \$site=[a-z,_]react_native[a-z,_]\$?)\\)
		suppress_comment=\$.\\\|\n\$\\$FlowIssue\$(\\(>=0\\.\\(2[0-2]\\\|1[0-9]\\\|[0-9]\$.[0-9]\\)? \$site=[a-z,_]react_native[a-z,_]\$?)\\)?:? #[0-9]+
		suppress_comment=\$.\\\|\n\$*\\$FlowFixedInNextDeploy

		[version]
		0.18.1
		0.22.0

Examples/VideoPlayer/.gitignore

+37 −1

Changes for Examples/VideoPlayer/.gitignore: 37 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		node_modules/*/
		VideoPlayer.xcodeproj/project.xcworkspace/*/
		VideoPlayer.xcodeproj/xcuserdata/*/

		# OSX
		#
		.DS_Store

		# Xcode
		#
		build/
		*.pbxuser
		!default.pbxuser
		*.mode1v3
		!default.mode1v3
		*.mode2v3
		!default.mode2v3
		*.perspectivev3
		!default.perspectivev3
		xcuserdata
		*.xccheckout
		*.moved-aside
		DerivedData
		*.hmap
		*.ipa
		*.xcuserstate
		project.xcworkspace

		# Android/IJ
		#
		.idea
		.gradle
		local.properties

		# node.js
		#
		node_modules/
		npm-debug.log

Examples/VideoPlayer/VideoPlayer.xcodeproj/project.pbxproj

+6 −1

Changes for Examples/VideoPlayer/VideoPlayer.xcodeproj/project.pbxproj: 6 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -302,7 +302,7 @@
		83CBB9F71A601CBA00E9B192 /* Project object */ = {
		isa = PBXProject;
		attributes = {
		LastUpgradeCheck = 0610;
		LastUpgradeCheck = 0720;
		ORGANIZATIONNAME = Facebook;
		};
		buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "VideoPlayer" */;
		@@ -487,8 +487,10 @@
		"$(SRCROOT)/node_modules/react-native/React/**",
		);
		INFOPLIST_FILE = "$(SRCROOT)/iOS/Info.plist";
		IPHONEOS_DEPLOYMENT_TARGET = 8.0;
		LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
		OTHER_LDFLAGS = "-ObjC";
		PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
		PRODUCT_NAME = VideoPlayer;
		};
		name = Debug;
		@@ -503,8 +505,10 @@
		"$(SRCROOT)/node_modules/react-native/React/**",
		);
		INFOPLIST_FILE = "$(SRCROOT)/iOS/Info.plist";
		IPHONEOS_DEPLOYMENT_TARGET = 8.0;
		LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
		OTHER_LDFLAGS = "-ObjC";
		PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
		PRODUCT_NAME = VideoPlayer;
		};
		name = Release;
		@@ -529,6 +533,7 @@
		"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
		COPY_PHASE_STRIP = NO;
		ENABLE_STRICT_OBJC_MSGSEND = YES;
		ENABLE_TESTABILITY = YES;
		GCC_C_LANGUAGE_STANDARD = gnu99;
		GCC_DYNAMIC_NO_PIC = NO;
		GCC_OPTIMIZATION_LEVEL = 0;

Examples/VideoPlayer/VideoPlayer.xcodeproj/project.xcworkspace/contents.xcworkspacedata

deleted100644 → 0

+0 −7

Changes for Examples/VideoPlayer/VideoPlayer.xcodeproj/project.xcworkspace/contents.xcworkspacedata: 0 added lines, 7 removed lines.
Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="UTF-8"?>
		<Workspace
		version = "1.0">
		<FileRef
		location = "self:VideoPlayer.xcodeproj">
		</FileRef>
		</Workspace>