Skip to content

Commit

Permalink
fix(expo): revert javascript deps updates to ideally fix expo plugin (#…
Browse files Browse the repository at this point in the history
…559)

* Revert "build(deps): bump bob as well"

This reverts commit 4ba37c8.

* Revert "build(deps): update most javascript dependencies"

This reverts commit 0ca1229.
  • Loading branch information
mikehardy authored Sep 27, 2024
1 parent 4e819ef commit d9b4f7b
Show file tree
Hide file tree
Showing 10 changed files with 1,203 additions and 3,492 deletions.
12 changes: 0 additions & 12 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,5 @@ module.exports = {
extends: ['plugin:@typescript-eslint/recommended'],
rules: {
'prettier/prettier': 0,
'@typescript-eslint/no-unused-vars': [
'error',
{
args: 'all',
argsIgnorePattern: '^_',
caughtErrors: 'all',
caughtErrorsIgnorePattern: '^_',
destructuredArrayIgnorePattern: '^_',
varsIgnorePattern: '^_',
ignoreRestSiblings: true,
},
],
},
};
42 changes: 21 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,35 +94,35 @@
}
},
"devDependencies": {
"@babel/core": "^7.25.2",
"@babel/runtime": "^7.25.6",
"@babel/core": "^7.23.9",
"@babel/runtime": "^7.23.9",
"@react-native-community/eslint-config": "^3.2.0",
"@semantic-release/commit-analyzer": "^13.0.0",
"@semantic-release/commit-analyzer": "^11.1.0",
"@semantic-release/git": "^10.0.1",
"@semantic-release/github": "^11.0.0",
"@semantic-release/npm": "^12.0.1",
"@semantic-release/release-notes-generator": "^14.0.1",
"@semantic-release/github": "^9.2.6",
"@semantic-release/npm": "^11.0.2",
"@semantic-release/release-notes-generator": "^12.1.0",
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@tsconfig/node14": "^14.1.2",
"@types/react": "^18.3.9",
"@tsconfig/node14": "^14.1.0",
"@types/react": "^18.2.48",
"@types/xml2js": "^0.4.14",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"@typescript-eslint/eslint-plugin": "^6.19.1",
"@typescript-eslint/parser": "^6.19.1",
"babel-jest": "^29.7.0",
"babel-plugin-module-resolver": "^5.0.2",
"conventional-changelog-conventionalcommits": "^8.0.0",
"babel-plugin-module-resolver": "^5.0.0",
"conventional-changelog-conventionalcommits": "^7.0.2",
"eslint": "^8.56.0",
"expo": "^47.0.14",
"expo-module-scripts": "^3.5.2",
"expo": "^47",
"expo-module-scripts": "^3.4.0",
"jest": "^29.7.0",
"metro-react-native-babel-preset": "^0.77.0",
"prettier": "^3.3.3",
"react": "18.3.1",
"react-native": "^0.75.3",
"react-native-builder-bob": "^0.30.2",
"react-test-renderer": "18.3.1",
"semantic-release": "^24.1.1",
"typescript": "^5.6.2",
"prettier": "^3.2.4",
"react": "18.2.0",
"react-native": "^0.73.2",
"react-native-builder-bob": "^0.23.2",
"react-test-renderer": "18.2.0",
"semantic-release": "^23.0.0",
"typescript": "^5.3.3",
"xml2js": "^0.6.2"
},
"resolutions": {
Expand Down
17 changes: 9 additions & 8 deletions plugin/build/config.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.getMergePropsWithConfig = getMergePropsWithConfig;
exports.getFacebookAppId = getFacebookAppId;
exports.getFacebookClientToken = getFacebookClientToken;
exports.getFacebookScheme = getFacebookScheme;
exports.getFacebookDisplayName = getFacebookDisplayName;
exports.getFacebookAutoInitEnabled = getFacebookAutoInitEnabled;
exports.getFacebookAutoLogAppEvents = getFacebookAutoLogAppEvents;
exports.getFacebookAdvertiserIDCollection = getFacebookAdvertiserIDCollection;
exports.getFacebookAdvertiserIDCollection = exports.getFacebookAutoLogAppEvents = exports.getFacebookAutoInitEnabled = exports.getFacebookDisplayName = exports.getFacebookScheme = exports.getFacebookClientToken = exports.getFacebookAppId = exports.getMergePropsWithConfig = void 0;
function getMergePropsWithConfig(config, props) {
const { facebookAppId, facebookDisplayName, facebookScheme, facebookAutoInitEnabled, facebookAutoLogAppEventsEnabled, facebookAdvertiserIDCollectionEnabled, } = config;
const { appID = facebookAppId, clientToken, displayName = facebookDisplayName, scheme = facebookScheme ?? (appID ? `fb${appID}` : undefined), isAutoInitEnabled = facebookAutoInitEnabled ?? false, autoLogAppEventsEnabled = facebookAutoLogAppEventsEnabled ?? false, advertiserIDCollectionEnabled = facebookAdvertiserIDCollectionEnabled ??
Expand All @@ -23,24 +16,32 @@ function getMergePropsWithConfig(config, props) {
iosUserTrackingPermission,
};
}
exports.getMergePropsWithConfig = getMergePropsWithConfig;
function getFacebookAppId(config) {
return config.appID ?? null;
}
exports.getFacebookAppId = getFacebookAppId;
function getFacebookClientToken(config) {
return config.clientToken ?? null;
}
exports.getFacebookClientToken = getFacebookClientToken;
function getFacebookScheme(config) {
return config.scheme ?? null;
}
exports.getFacebookScheme = getFacebookScheme;
function getFacebookDisplayName(config) {
return config.displayName ?? null;
}
exports.getFacebookDisplayName = getFacebookDisplayName;
function getFacebookAutoInitEnabled(config) {
return config.isAutoInitEnabled ?? null;
}
exports.getFacebookAutoInitEnabled = getFacebookAutoInitEnabled;
function getFacebookAutoLogAppEvents(config) {
return config.autoLogAppEventsEnabled ?? null;
}
exports.getFacebookAutoLogAppEvents = getFacebookAutoLogAppEvents;
function getFacebookAdvertiserIDCollection(config) {
return config.advertiserIDCollectionEnabled ?? null;
}
exports.getFacebookAdvertiserIDCollection = getFacebookAdvertiserIDCollection;
4 changes: 2 additions & 2 deletions plugin/build/withFacebookAndroid.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.withAndroidPermissions = exports.withFacebookManifest = exports.withFacebookAppIdString = void 0;
exports.setFacebookConfig = setFacebookConfig;
exports.setFacebookConfig = exports.withAndroidPermissions = exports.withFacebookManifest = exports.withFacebookAppIdString = void 0;
const config_1 = require("./config");
const config_plugins_1 = require("@expo/config-plugins");
const { buildResourceItem } = config_plugins_1.AndroidConfig.Resources;
Expand Down Expand Up @@ -195,3 +194,4 @@ function setFacebookConfig(props, androidManifest) {
}
return androidManifest;
}
exports.setFacebookConfig = setFacebookConfig;
12 changes: 6 additions & 6 deletions plugin/build/withFacebookIOS.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import { ConfigPlugin, InfoPlist } from '@expo/config-plugins';
export declare const withFacebookIOS: ConfigPlugin<ConfigProps>;
export declare function setFacebookConfig(config: ConfigProps, infoPlist: InfoPlist): InfoPlist;
export declare function setFacebookScheme(config: ConfigProps, infoPlist: InfoPlist): InfoPlist;
export declare function setFacebookAutoInitEnabled(config: ConfigProps, { FacebookAutoInitEnabled: _, ...infoPlist }: InfoPlist): InfoPlist;
export declare function setFacebookAutoLogAppEventsEnabled(config: ConfigProps, { FacebookAutoLogAppEventsEnabled: _, ...infoPlist }: InfoPlist): InfoPlist;
export declare function setFacebookAdvertiserIDCollectionEnabled(config: ConfigProps, { FacebookAdvertiserIDCollectionEnabled: _, ...infoPlist }: InfoPlist): InfoPlist;
export declare function setFacebookAppId(config: ConfigProps, { FacebookAppID: _, ...infoPlist }: InfoPlist): InfoPlist;
export declare function setFacebookClientToken(config: ConfigProps, { FacebookClientToken: _, ...infoPlist }: InfoPlist): InfoPlist;
export declare function setFacebookDisplayName(config: ConfigProps, { FacebookDisplayName: _, ...infoPlist }: InfoPlist): InfoPlist;
export declare function setFacebookAutoInitEnabled(config: ConfigProps, { FacebookAutoInitEnabled, ...infoPlist }: InfoPlist): InfoPlist;
export declare function setFacebookAutoLogAppEventsEnabled(config: ConfigProps, { FacebookAutoLogAppEventsEnabled, ...infoPlist }: InfoPlist): InfoPlist;
export declare function setFacebookAdvertiserIDCollectionEnabled(config: ConfigProps, { FacebookAdvertiserIDCollectionEnabled, ...infoPlist }: InfoPlist): InfoPlist;
export declare function setFacebookAppId(config: ConfigProps, { FacebookAppID, ...infoPlist }: InfoPlist): InfoPlist;
export declare function setFacebookClientToken(config: ConfigProps, { FacebookClientToken, ...infoPlist }: InfoPlist): InfoPlist;
export declare function setFacebookDisplayName(config: ConfigProps, { FacebookDisplayName, ...infoPlist }: InfoPlist): InfoPlist;
export declare function setFacebookApplicationQuerySchemes(config: ConfigProps, infoPlist: InfoPlist): InfoPlist;
export declare const withUserTrackingPermission: ConfigPlugin<{
iosUserTrackingPermission?: string | false;
Expand Down
20 changes: 10 additions & 10 deletions plugin/build/withFacebookIOS.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.withUserTrackingPermission = exports.withFacebookIOS = void 0;
exports.setFacebookConfig = setFacebookConfig;
exports.setFacebookScheme = setFacebookScheme;
exports.setFacebookAutoInitEnabled = setFacebookAutoInitEnabled;
exports.setFacebookAutoLogAppEventsEnabled = setFacebookAutoLogAppEventsEnabled;
exports.setFacebookAdvertiserIDCollectionEnabled = setFacebookAdvertiserIDCollectionEnabled;
exports.setFacebookAppId = setFacebookAppId;
exports.setFacebookClientToken = setFacebookClientToken;
exports.setFacebookDisplayName = setFacebookDisplayName;
exports.setFacebookApplicationQuerySchemes = setFacebookApplicationQuerySchemes;
exports.withUserTrackingPermission = exports.setFacebookApplicationQuerySchemes = exports.setFacebookDisplayName = exports.setFacebookClientToken = exports.setFacebookAppId = exports.setFacebookAdvertiserIDCollectionEnabled = exports.setFacebookAutoLogAppEventsEnabled = exports.setFacebookAutoInitEnabled = exports.setFacebookScheme = exports.setFacebookConfig = exports.withFacebookIOS = void 0;
const config_1 = require("./config");
const config_plugins_1 = require("@expo/config-plugins");
const { Scheme } = config_plugins_1.IOSConfig;
Expand All @@ -33,6 +24,7 @@ function setFacebookConfig(config, infoPlist) {
infoPlist = setFacebookScheme(config, infoPlist);
return infoPlist;
}
exports.setFacebookConfig = setFacebookConfig;
function setFacebookScheme(config, infoPlist) {
const facebookScheme = (0, config_1.getFacebookScheme)(config);
if (!facebookScheme) {
Expand All @@ -43,6 +35,7 @@ function setFacebookScheme(config, infoPlist) {
}
return appendScheme(facebookScheme, infoPlist);
}
exports.setFacebookScheme = setFacebookScheme;
function setFacebookAutoInitEnabled(config, { FacebookAutoInitEnabled: _, ...infoPlist }) {
const isAutoInitEnabled = (0, config_1.getFacebookAutoInitEnabled)(config);
if (isAutoInitEnabled === null) {
Expand All @@ -53,6 +46,7 @@ function setFacebookAutoInitEnabled(config, { FacebookAutoInitEnabled: _, ...inf
FacebookAutoInitEnabled: isAutoInitEnabled,
};
}
exports.setFacebookAutoInitEnabled = setFacebookAutoInitEnabled;
function setFacebookAutoLogAppEventsEnabled(config, { FacebookAutoLogAppEventsEnabled: _, ...infoPlist }) {
const autoLogAppEventsEnabled = (0, config_1.getFacebookAutoLogAppEvents)(config);
if (autoLogAppEventsEnabled === null) {
Expand All @@ -63,6 +57,7 @@ function setFacebookAutoLogAppEventsEnabled(config, { FacebookAutoLogAppEventsEn
FacebookAutoLogAppEventsEnabled: autoLogAppEventsEnabled,
};
}
exports.setFacebookAutoLogAppEventsEnabled = setFacebookAutoLogAppEventsEnabled;
function setFacebookAdvertiserIDCollectionEnabled(config, { FacebookAdvertiserIDCollectionEnabled: _, ...infoPlist }) {
const advertiserIDCollectionEnabled = (0, config_1.getFacebookAdvertiserIDCollection)(config);
if (advertiserIDCollectionEnabled === null) {
Expand All @@ -73,6 +68,7 @@ function setFacebookAdvertiserIDCollectionEnabled(config, { FacebookAdvertiserID
FacebookAdvertiserIDCollectionEnabled: advertiserIDCollectionEnabled,
};
}
exports.setFacebookAdvertiserIDCollectionEnabled = setFacebookAdvertiserIDCollectionEnabled;
function setFacebookAppId(config, { FacebookAppID: _, ...infoPlist }) {
const appID = (0, config_1.getFacebookAppId)(config);
if (appID) {
Expand All @@ -83,6 +79,7 @@ function setFacebookAppId(config, { FacebookAppID: _, ...infoPlist }) {
}
return infoPlist;
}
exports.setFacebookAppId = setFacebookAppId;
function setFacebookClientToken(config, { FacebookClientToken: _, ...infoPlist }) {
const clientToken = (0, config_1.getFacebookClientToken)(config);
if (clientToken) {
Expand All @@ -93,6 +90,7 @@ function setFacebookClientToken(config, { FacebookClientToken: _, ...infoPlist }
}
return infoPlist;
}
exports.setFacebookClientToken = setFacebookClientToken;
function setFacebookDisplayName(config, { FacebookDisplayName: _, ...infoPlist }) {
const facebookDisplayName = (0, config_1.getFacebookDisplayName)(config);
if (facebookDisplayName) {
Expand All @@ -103,6 +101,7 @@ function setFacebookDisplayName(config, { FacebookDisplayName: _, ...infoPlist }
}
return infoPlist;
}
exports.setFacebookDisplayName = setFacebookDisplayName;
function setFacebookApplicationQuerySchemes(config, infoPlist) {
const facebookAppId = (0, config_1.getFacebookAppId)(config);
const existingSchemes = infoPlist.LSApplicationQueriesSchemes || [];
Expand Down Expand Up @@ -145,6 +144,7 @@ function setFacebookApplicationQuerySchemes(config, infoPlist) {
LSApplicationQueriesSchemes: updatedSchemes,
};
}
exports.setFacebookApplicationQuerySchemes = setFacebookApplicationQuerySchemes;
const withUserTrackingPermission = (config, { iosUserTrackingPermission } = {}) => {
if (!iosUserTrackingPermission) {
return config;
Expand Down
4 changes: 1 addition & 3 deletions plugin/build/withSKAdNetworkIdentifiers.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ const withSKAdNetworkIdentifiers = (config, identifiers) => {
config.ios.infoPlist.SKAdNetworkItems = [];
}
// Get ids
let existingIds = config.ios.infoPlist.SKAdNetworkItems.map(
// eslint-disable-next-line @typescript-eslint/no-explicit-any
(item) => item?.SKAdNetworkIdentifier ?? null).filter(Boolean);
let existingIds = config.ios.infoPlist.SKAdNetworkItems.map((item) => item?.SKAdNetworkIdentifier ?? null).filter(Boolean);
// remove duplicates
existingIds = [...new Set(existingIds)];
for (const id of identifiers) {
Expand Down
1 change: 0 additions & 1 deletion plugin/src/withSKAdNetworkIdentifiers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ export const withSKAdNetworkIdentifiers: ConfigPlugin<string[]> = (

// Get ids
let existingIds = config.ios.infoPlist.SKAdNetworkItems.map(
// eslint-disable-next-line @typescript-eslint/no-explicit-any
(item: any) => item?.SKAdNetworkIdentifier ?? null,
).filter(Boolean) as string[];
// remove duplicates
Expand Down
1 change: 0 additions & 1 deletion plugin/tsconfig.tsbuildinfo

This file was deleted.

Loading

0 comments on commit d9b4f7b

Please sign in to comment.