forked from
jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
Remove direct dependency on `@expo/config-plugins` (#10152)
authored by
Samuel Newman
and committed by
GitHub
19df58f1
c79dff9b
+26
-48
-1
package.json
-1
package.json
+1
-2
plugins/notificationsExtension/withAppEntitlements.js
+1
-2
plugins/notificationsExtension/withAppEntitlements.js
···
1
-
const {withEntitlementsPlist} = require('@expo/config-plugins')
1
+
const {withEntitlementsPlist} = require('expo/config-plugins')
2
2
3
3
const withAppEntitlements = config => {
4
-
// eslint-disable-next-line no-shadow
5
4
return withEntitlementsPlist(config, async config => {
6
5
config.modResults['com.apple.security.application-groups'] = [
7
6
`group.app.bsky`,
+1
-2
plugins/notificationsExtension/withExtensionEntitlements.js
+1
-2
plugins/notificationsExtension/withExtensionEntitlements.js
···
1
-
const {withInfoPlist} = require('@expo/config-plugins')
1
+
const {withInfoPlist} = require('expo/config-plugins')
2
2
const plist = require('@expo/plist')
3
3
const path = require('path')
4
4
const fs = require('fs')
5
5
6
6
const withExtensionEntitlements = (config, {extensionName}) => {
7
-
// eslint-disable-next-line no-shadow
8
7
return withInfoPlist(config, config => {
9
8
const extensionEntitlementsPath = path.join(
10
9
config.modRequest.platformProjectRoot,
+1
-2
plugins/notificationsExtension/withExtensionInfoPlist.js
+1
-2
plugins/notificationsExtension/withExtensionInfoPlist.js
···
1
-
const {withInfoPlist} = require('@expo/config-plugins')
1
+
const {withInfoPlist} = require('expo/config-plugins')
2
2
const plist = require('@expo/plist')
3
3
const path = require('path')
4
4
const fs = require('fs')
5
5
6
6
const withExtensionInfoPlist = (config, {extensionName}) => {
7
-
// eslint-disable-next-line no-shadow
8
7
return withInfoPlist(config, config => {
9
8
const plistPath = path.join(
10
9
config.modRequest.projectRoot,
+1
-2
plugins/notificationsExtension/withExtensionViewController.js
+1
-2
plugins/notificationsExtension/withExtensionViewController.js
···
1
-
const {withXcodeProject} = require('@expo/config-plugins')
1
+
const {withXcodeProject} = require('expo/config-plugins')
2
2
const path = require('path')
3
3
const fs = require('fs')
4
4
···
6
6
config,
7
7
{controllerName, extensionName},
8
8
) => {
9
-
// eslint-disable-next-line no-shadow
10
9
return withXcodeProject(config, config => {
11
10
const controllerPath = path.join(
12
11
config.modRequest.projectRoot,
+1
-1
plugins/notificationsExtension/withNotificationsExtension.js
+1
-1
plugins/notificationsExtension/withNotificationsExtension.js
···
1
-
const {withPlugins} = require('@expo/config-plugins')
1
+
const {withPlugins} = require('expo/config-plugins')
2
2
const {withAppEntitlements} = require('./withAppEntitlements')
3
3
const {withXcodeTarget} = require('./withXcodeTarget')
4
4
const {withExtensionEntitlements} = require('./withExtensionEntitlements')
+1
-2
plugins/notificationsExtension/withSounds.js
+1
-2
plugins/notificationsExtension/withSounds.js
···
1
-
const {withXcodeProject} = require('@expo/config-plugins')
1
+
const {withXcodeProject} = require('expo/config-plugins')
2
2
const path = require('path')
3
3
const fs = require('fs')
4
4
5
5
const withSounds = (config, {extensionName, soundFiles}) => {
6
-
// eslint-disable-next-line no-shadow
7
6
return withXcodeProject(config, config => {
8
7
for (const file of soundFiles) {
9
8
const soundPath = path.join(config.modRequest.projectRoot, 'assets', file)
+1
-4
plugins/notificationsExtension/withXcodeTarget.js
+1
-4
plugins/notificationsExtension/withXcodeTarget.js
···
1
-
const {withXcodeProject, IOSConfig} = require('@expo/config-plugins')
2
-
const path = require('path')
3
-
const PBXFile = require('xcode/lib/pbxFile')
1
+
const {withXcodeProject} = require('expo/config-plugins')
4
2
5
3
const withXcodeTarget = (
6
4
config,
7
5
{extensionName, controllerName, soundFiles},
8
6
) => {
9
-
// eslint-disable-next-line no-shadow
10
7
return withXcodeProject(config, config => {
11
8
let pbxProject = config.modResults
12
9
+1
-2
plugins/starterPackAppClipExtension/withAppEntitlements.js
+1
-2
plugins/starterPackAppClipExtension/withAppEntitlements.js
···
1
-
const {withEntitlementsPlist} = require('@expo/config-plugins')
1
+
const {withEntitlementsPlist} = require('expo/config-plugins')
2
2
3
3
const withAppEntitlements = config => {
4
-
// eslint-disable-next-line no-shadow
5
4
return withEntitlementsPlist(config, async config => {
6
5
config.modResults['com.apple.security.application-groups'] = [
7
6
`group.app.bsky`,
+1
-2
plugins/starterPackAppClipExtension/withClipEntitlements.js
+1
-2
plugins/starterPackAppClipExtension/withClipEntitlements.js
···
1
-
const {withInfoPlist} = require('@expo/config-plugins')
1
+
const {withInfoPlist} = require('expo/config-plugins')
2
2
const plist = require('@expo/plist')
3
3
const path = require('path')
4
4
const fs = require('fs')
5
5
6
6
const withClipEntitlements = (config, {targetName}) => {
7
-
// eslint-disable-next-line no-shadow
8
7
return withInfoPlist(config, config => {
9
8
const entitlementsPath = path.join(
10
9
config.modRequest.platformProjectRoot,
+1
-2
plugins/starterPackAppClipExtension/withClipInfoPlist.js
+1
-2
plugins/starterPackAppClipExtension/withClipInfoPlist.js
···
1
-
const {withInfoPlist} = require('@expo/config-plugins')
1
+
const {withInfoPlist} = require('expo/config-plugins')
2
2
const plist = require('@expo/plist')
3
3
const path = require('path')
4
4
const fs = require('fs')
5
5
6
6
const withClipInfoPlist = (config, {targetName}) => {
7
-
// eslint-disable-next-line no-shadow
8
7
return withInfoPlist(config, config => {
9
8
const targetPath = path.join(
10
9
config.modRequest.platformProjectRoot,
+1
-2
plugins/starterPackAppClipExtension/withFiles.js
+1
-2
plugins/starterPackAppClipExtension/withFiles.js
···
1
-
const {withXcodeProject} = require('@expo/config-plugins')
1
+
const {withXcodeProject} = require('expo/config-plugins')
2
2
const path = require('path')
3
3
const fs = require('fs')
4
4
5
5
const FILES = ['AppDelegate.swift', 'ViewController.swift']
6
6
7
7
const withFiles = (config, {targetName}) => {
8
-
// eslint-disable-next-line no-shadow
9
8
return withXcodeProject(config, config => {
10
9
const basePath = path.join(
11
10
config.modRequest.projectRoot,
+1
-1
plugins/starterPackAppClipExtension/withStarterPackAppClip.js
+1
-1
plugins/starterPackAppClipExtension/withStarterPackAppClip.js
···
1
-
const {withPlugins} = require('@expo/config-plugins')
1
+
const {withPlugins} = require('expo/config-plugins')
2
2
const {withAppEntitlements} = require('./withAppEntitlements')
3
3
const {withClipEntitlements} = require('./withClipEntitlements')
4
4
const {withClipInfoPlist} = require('./withClipInfoPlist')
+1
-2
plugins/starterPackAppClipExtension/withXcodeTarget.js
+1
-2
plugins/starterPackAppClipExtension/withXcodeTarget.js
···
1
-
const {withXcodeProject} = require('@expo/config-plugins')
1
+
const {withXcodeProject} = require('expo/config-plugins')
2
2
3
3
const BUILD_PHASE_FILES = ['AppDelegate.swift', 'ViewController.swift']
4
4
5
5
const withXcodeTarget = (config, {targetName}) => {
6
-
// eslint-disable-next-line no-shadow
7
6
return withXcodeProject(config, config => {
8
7
const pbxProject = config.modResults
9
8
+1
-2
plugins/withAndroidManifestIntentQueriesPlugin.js
+1
-2
plugins/withAndroidManifestIntentQueriesPlugin.js
···
1
-
const {withAndroidManifest} = require('@expo/config-plugins')
1
+
const {withAndroidManifest} = require('expo/config-plugins')
2
2
3
3
const withProcessTextQuery = config =>
4
-
// eslint-disable-next-line no-shadow
5
4
withAndroidManifest(config, config => {
6
5
const manifest = config.modResults.manifest
7
6
+1
-1
plugins/withAndroidNoJitpackPlugin.js
+1
-1
plugins/withAndroidNoJitpackPlugin.js
+1
-1
plugins/withAndroidStylesAccentColorPlugin.js
+1
-1
plugins/withAndroidStylesAccentColorPlugin.js
···
3
3
* This way we get a sane default color for spinners, text inputs, etc.
4
4
*/
5
5
6
-
const {withAndroidStyles, AndroidConfig} = require('@expo/config-plugins')
6
+
const {withAndroidStyles, AndroidConfig} = require('expo/config-plugins')
7
7
8
8
module.exports = function withAndroidStylesAccentColorPlugin(appConfig) {
9
9
return withAndroidStyles(appConfig, function (decoratedAppConfig) {
+3
-4
plugins/withAppDelegateReferrer.js
+3
-4
plugins/withAppDelegateReferrer.js
···
1
-
const {withAppDelegate} = require('@expo/config-plugins')
2
-
const {mergeContents} = require('@expo/config-plugins/build/utils/generateCode')
1
+
const {withAppDelegate, CodeGenerator} = require('expo/config-plugins')
3
2
4
3
module.exports = config =>
5
4
withAppDelegate(config, config => {
6
5
let contents = config.modResults.contents
7
6
8
-
contents = mergeContents({
7
+
contents = CodeGenerator.mergeContents({
9
8
src: contents,
10
9
anchor: '// Linking API',
11
10
newSrc: `
···
22
21
comment: '//',
23
22
}).contents
24
23
25
-
contents = mergeContents({
24
+
contents = CodeGenerator.mergeContents({
26
25
src: contents,
27
26
anchor: '// Universal Links',
28
27
newSrc: `