Merge pull request #6864 from StoDevX/hawken/flipper

Author: hawkrives

package.json

@@ -13,7 +13,7 @@
     "ios": "react-native run-ios",
     "lint": "eslint --report-unused-disable-directives --cache source/ modules/ scripts/ images/",
     "prepare": "patch -p0 -Nfsi contrib/*.patch || true",
-    "pretty": "prettier --write '{source,modules,scripts,images,e2e}/**/*.{js,ts,tsx,json}' 'data/**/*.css' '{*,.*}.{yaml,yml,json,js,ts,tsx}'",
+    "pretty": "prettier --write '{source,modules,scripts,images,e2e}/**/*.{js,ts,tsx,json}' 'data/**/*.css' '{*,.*}.{yaml,yml,json,json5,js,ts,tsx}'",
     "p": "pretty-quick",
     "pods": "scripts/pods.sh",
     "start": "react-native start",

renovate.json5

@@ -1,56 +1,52 @@
 {
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:base",
-    // go ahead and update Docker FROM sources, and pin them with a hash
-    ":docker",
-    "docker:pinDigests",
-    // update lockfile versions weekly
-    ":maintainLockFilesWeekly",
-    // keep all dependency versions pinned - except peerDependencies
-    ":pinAllExceptPeerDependencies",
-    // pin github-actions with a digest, to avoid surprises when they update
-    "helpers:pinGitHubActionDigests",
-    // > wait until the npm package is three days old before raising the 
-    // > update. This prevents npm unpublishing a package you already upgraded to.
-    "npm:unpublishSafe",
-    // include ts-jest and @types/jest in jestjs grouped updates
-    "group:jestPlusTSJest",
-    "group:jestPlusTypes"
-  ],
-  "packageRules": [
-    // require manual approval for new minor OR major versions of these packages
-    {
-      "matchPackageNames": [
-        "@types/react-native",
-        "react-native",
-        "metro-react-native-babel-preset",
-        "@types/react-test-renderer",
-        "react-test-renderer",
-        "@types/react",
-        "react"
-      ],
-      "matchUpdateTypes": ["minor", "major"],
-      "dependencyDashboardApproval": true
-    },
-    // require manual approval for new major versions of these packages
-    {
-      "matchPackageNames": [
-        "react-markdown"
-      ],
-      "matchUpdateTypes": ["major"],
-      "dependencyDashboardApproval": true
-    },
-    // disable renovate for the app/build.gradle react-native and webkit dependencies
-    {
-      "matchPackageNames": ["com.facebook.react:react-native", "org.webkit:android-jsc"],
-      "enabled": false
-    },
-    // stop widening peerDep ranges for custom modules
-    {
-      "matchPaths": ["modules/**/package.json"],
-      "matchDepTypes": ["peerDependencies"],
-      "rangeStrategy": "bump"
-    }
-  ]
+	$schema: 'https://docs.renovatebot.com/renovate-schema.json',
+	extends: [
+		'config:base',
+		// go ahead and update Docker FROM sources, and pin them with a hash
+		':docker',
+		'docker:pinDigests',
+		// update lockfile versions weekly
+		':maintainLockFilesWeekly',
+		// keep all dependency versions pinned - except peerDependencies
+		':pinAllExceptPeerDependencies',
+		// pin github-actions with a digest, to avoid surprises when they update
+		'helpers:pinGitHubActionDigests',
+		// > wait until the npm package is three days old before raising the
+		// > update. This prevents npm unpublishing a package you already upgraded to.
+		'npm:unpublishSafe',
+		// include ts-jest and @types/jest in jestjs grouped updates
+		'group:jestPlusTSJest',
+		'group:jestPlusTypes',
+	],
+	packageRules: [
+		// require manual approval for new minor OR major versions of these packages
+		{
+			matchPackageNames: [
+				'@types/react-native',
+				'react-native',
+				'metro-react-native-babel-preset',
+				'@types/react-test-renderer',
+				'react-test-renderer',
+				'@types/react',
+				'react',
+				'com.facebook.flipper:flipper',
+				'com.facebook.flipper:flipper-fresco-plugin',
+				'com.facebook.flipper:flipper-network-plugin',
+			],
+			matchUpdateTypes: ['minor', 'major'],
+			dependencyDashboardApproval: true,
+		},
+		// require manual approval for new major versions of these packages
+		{
+			matchPackageNames: ['react-markdown'],
+			matchUpdateTypes: ['major'],
+			dependencyDashboardApproval: true,
+		},
+		// stop widening peerDep ranges for custom modules
+		{
+			matchPaths: ['modules/**/package.json'],
+			matchDepTypes: ['peerDependencies'],
+			rangeStrategy: 'bump',
+		},
+	],
 }