Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .changeset/fresh-clocks-pay.md

This file was deleted.

2 changes: 2 additions & 0 deletions .changeset/huge-moments-poke.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
191 changes: 68 additions & 123 deletions packages/expo/app.plugin.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,114 +20,10 @@ const path = require('path');
const fs = require('fs');

const CLERK_IOS_REPO = 'https://github.com/clerk/clerk-ios.git';
const CLERK_IOS_VERSION = '1.1.3';
const CLERK_IOS_REQUIREMENT = {
kind: 'exactVersion',
version: CLERK_IOS_VERSION,
};
const CLERK_IOS_VERSION = '1.0.0';

const CLERK_MIN_IOS_VERSION = '17.0';

const normalizeRepositoryURL = repositoryURL => String(repositoryURL || '').replace(/^"|"$/g, '');

const isClerkIOSPackageReference = ref => normalizeRepositoryURL(ref?.repositoryURL) === CLERK_IOS_REPO;

const removeObjectReference = (list, uuid) => {
if (!Array.isArray(list)) {
return;
}

for (let index = list.length - 1; index >= 0; index--) {
if (list[index]?.value === uuid) {
list.splice(index, 1);
}
}
};

const removeSwiftPackageProductDependencies = (xcodeProject, packageUuids) => {
const productDependencies = xcodeProject.hash.project.objects.XCSwiftPackageProductDependency || {};
const packageUuidSet = new Set(packageUuids);

for (const [productUuid, dependency] of Object.entries(productDependencies)) {
if (!packageUuidSet.has(dependency?.package)) {
continue;
}

delete productDependencies[productUuid];

const targets = xcodeProject.hash.project.objects.PBXNativeTarget || {};
for (const target of Object.values(targets)) {
removeObjectReference(target?.packageProductDependencies, productUuid);
}
}
};

const removeSwiftPackageReferences = (xcodeProject, packageUuids) => {
const packageReferences = xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference || {};

for (const packageUuid of packageUuids) {
delete packageReferences[packageUuid];
}

const projects = xcodeProject.hash.project.objects.PBXProject || {};
for (const project of Object.values(projects)) {
for (const packageUuid of packageUuids) {
removeObjectReference(project?.packageReferences, packageUuid);
}
}

removeSwiftPackageProductDependencies(xcodeProject, packageUuids);
};

const findOrCreateClerkIOSPackageReference = xcodeProject => {
const packageReferences = xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference;
const existingEntries = Object.entries(packageReferences).filter(([, ref]) => isClerkIOSPackageReference(ref));

if (existingEntries.length > 0) {
const [uuid, ref] = existingEntries[0];
ref.repositoryURL = CLERK_IOS_REPO;
ref.requirement = { ...CLERK_IOS_REQUIREMENT };

const duplicateUuids = existingEntries.slice(1).map(([duplicateUuid]) => duplicateUuid);
removeSwiftPackageReferences(xcodeProject, duplicateUuids);

return uuid;
}

const packageUuid = xcodeProject.generateUuid();
packageReferences[packageUuid] = {
isa: 'XCRemoteSwiftPackageReference',
repositoryURL: CLERK_IOS_REPO,
requirement: { ...CLERK_IOS_REQUIREMENT },
};
return packageUuid;
};

const findOrCreateSwiftPackageProductDependency = (xcodeProject, packageUuid, productName) => {
const productDependencies = xcodeProject.hash.project.objects.XCSwiftPackageProductDependency;
const existingEntry = Object.entries(productDependencies).find(
([, dep]) => dep?.package === packageUuid && dep?.productName === productName,
);

if (existingEntry) {
return existingEntry[0];
}

const productUuid = xcodeProject.generateUuid();
productDependencies[productUuid] = {
isa: 'XCSwiftPackageProductDependency',
package: packageUuid,
productName,
};
return productUuid;
};

const addObjectReference = (list, uuid, comment) => {
if (!list.some(ref => ref.value === uuid)) {
list.push({ value: uuid, comment });
}
};

const withClerkIOS = config => {
console.log('✅ Clerk iOS plugin loaded');

Expand DownExpand Up@@ -201,21 +97,42 @@ const withClerkIOS = config => {
const targetUuid = targets.uuid;
const targetName = targets.name;

// Add Swift Package reference to the project
const packageUuid = xcodeProject.generateUuid();
const packageName = 'clerk-ios';

// Add package reference to XCRemoteSwiftPackageReference section
if (!xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference) {
xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference = {};
}

const packageUuid = findOrCreateClerkIOSPackageReference(xcodeProject);
xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference[packageUuid] = {
isa: 'XCRemoteSwiftPackageReference',
repositoryURL: CLERK_IOS_REPO,
requirement: {
kind: 'exactVersion',
version: CLERK_IOS_VERSION,
},
};

// Add package product dependencies (ClerkKit + ClerkKitUI)
const productUuidKit = xcodeProject.generateUuid();
const productUuidKitUI = xcodeProject.generateUuid();
if (!xcodeProject.hash.project.objects.XCSwiftPackageProductDependency) {
xcodeProject.hash.project.objects.XCSwiftPackageProductDependency = {};
}

const productUuidKit = findOrCreateSwiftPackageProductDependency(xcodeProject, packageUuid, 'ClerkKit');
const productUuidKitUI = findOrCreateSwiftPackageProductDependency(xcodeProject, packageUuid, 'ClerkKitUI');
xcodeProject.hash.project.objects.XCSwiftPackageProductDependency[productUuidKit] = {
isa: 'XCSwiftPackageProductDependency',
package: packageUuid,
productName: 'ClerkKit',
};

xcodeProject.hash.project.objects.XCSwiftPackageProductDependency[productUuidKitUI] = {
isa: 'XCSwiftPackageProductDependency',
package: packageUuid,
productName: 'ClerkKitUI',
};

// Add package to project's package references
const projectSection = xcodeProject.hash.project.objects.PBXProject;
Expand All@@ -226,16 +143,40 @@ const withClerkIOS = config => {
project.packageReferences = [];
}

addObjectReference(project.packageReferences, packageUuid, packageName);
// Check if package is already added
const alreadyAdded = project.packageReferences.some(ref => {
const refObj = xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference[ref.value];
return refObj && refObj.repositoryURL === CLERK_IOS_REPO;
});

if (!alreadyAdded) {
project.packageReferences.push({
value: packageUuid,
comment: packageName,
});
}

// Add package products to main app target
const nativeTarget = xcodeProject.hash.project.objects.PBXNativeTarget[targetUuid];
if (!nativeTarget.packageProductDependencies) {
nativeTarget.packageProductDependencies = [];
}

addObjectReference(nativeTarget.packageProductDependencies, productUuidKit, 'ClerkKit');
addObjectReference(nativeTarget.packageProductDependencies, productUuidKitUI, 'ClerkKitUI');
const kitAlreadyAdded = nativeTarget.packageProductDependencies.some(dep => dep.value === productUuidKit);
if (!kitAlreadyAdded) {
nativeTarget.packageProductDependencies.push({
value: productUuidKit,
comment: 'ClerkKit',
});
}

const kitUIAlreadyAdded = nativeTarget.packageProductDependencies.some(dep => dep.value === productUuidKitUI);
if (!kitUIAlreadyAdded) {
nativeTarget.packageProductDependencies.push({
value: productUuidKitUI,
comment: 'ClerkKitUI',
});
}

// Also add packages to ClerkExpo pod target if it exists
const allTargets = xcodeProject.hash.project.objects.PBXNativeTarget;
Expand All@@ -245,8 +186,21 @@ const withClerkIOS = config => {
target.packageProductDependencies = [];
}

addObjectReference(target.packageProductDependencies, productUuidKit, 'ClerkKit');
addObjectReference(target.packageProductDependencies, productUuidKitUI, 'ClerkKitUI');
const podKitAdded = target.packageProductDependencies.some(dep => dep.value === productUuidKit);
if (!podKitAdded) {
target.packageProductDependencies.push({
value: productUuidKit,
comment: 'ClerkKit',
});
}

const podKitUIAdded = target.packageProductDependencies.some(dep => dep.value === productUuidKitUI);
if (!podKitUIAdded) {
target.packageProductDependencies.push({
value: productUuidKitUI,
comment: 'ClerkKitUI',
});
}

console.log(`✅ Added ClerkKit and ClerkKitUI packages to ClerkExpo pod target`);
}
Expand DownExpand Up@@ -762,13 +716,4 @@ const withClerkExpo = (config, props = {}) => {
};

module.exports = withClerkExpo;
module.exports._testing = {
validateThemeJson,
isPlainObject,
VALID_COLOR_KEYS,
HEX_COLOR_REGEX,
CLERK_IOS_VERSION,
CLERK_IOS_REQUIREMENT,
findOrCreateClerkIOSPackageReference,
findOrCreateSwiftPackageProductDependency,
};
module.exports._testing = { validateThemeJson, isPlainObject, VALID_COLOR_KEYS, HEX_COLOR_REGEX };
132 changes: 0 additions & 132 deletions packages/expo/src/__tests__/appPlugin.ios.test.js

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Revert "fix(expo): pin clerk-ios and dedupe Expo SPM refs" by wobsoriano · Pull Request #8692 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .changeset/fresh-clocks-pay.md

This file was deleted.

2 changes: 2 additions & 0 deletions .changeset/huge-moments-poke.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
191 changes: 68 additions & 123 deletions packages/expo/app.plugin.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,114 +20,10 @@ const path = require('path');
const fs = require('fs');

const CLERK_IOS_REPO = 'https://github.com/clerk/clerk-ios.git';
const CLERK_IOS_VERSION = '1.1.3';
const CLERK_IOS_REQUIREMENT = {
kind: 'exactVersion',
version: CLERK_IOS_VERSION,
};
const CLERK_IOS_VERSION = '1.0.0';

const CLERK_MIN_IOS_VERSION = '17.0';

const normalizeRepositoryURL = repositoryURL => String(repositoryURL || '').replace(/^"|"$/g, '');

const isClerkIOSPackageReference = ref => normalizeRepositoryURL(ref?.repositoryURL) === CLERK_IOS_REPO;

const removeObjectReference = (list, uuid) => {
if (!Array.isArray(list)) {
return;
}

for (let index = list.length - 1; index >= 0; index--) {
if (list[index]?.value === uuid) {
list.splice(index, 1);
}
}
};

const removeSwiftPackageProductDependencies = (xcodeProject, packageUuids) => {
const productDependencies = xcodeProject.hash.project.objects.XCSwiftPackageProductDependency || {};
const packageUuidSet = new Set(packageUuids);

for (const [productUuid, dependency] of Object.entries(productDependencies)) {
if (!packageUuidSet.has(dependency?.package)) {
continue;
}

delete productDependencies[productUuid];

const targets = xcodeProject.hash.project.objects.PBXNativeTarget || {};
for (const target of Object.values(targets)) {
removeObjectReference(target?.packageProductDependencies, productUuid);
}
}
};

const removeSwiftPackageReferences = (xcodeProject, packageUuids) => {
const packageReferences = xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference || {};

for (const packageUuid of packageUuids) {
delete packageReferences[packageUuid];
}

const projects = xcodeProject.hash.project.objects.PBXProject || {};
for (const project of Object.values(projects)) {
for (const packageUuid of packageUuids) {
removeObjectReference(project?.packageReferences, packageUuid);
}
}

removeSwiftPackageProductDependencies(xcodeProject, packageUuids);
};

const findOrCreateClerkIOSPackageReference = xcodeProject => {
const packageReferences = xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference;
const existingEntries = Object.entries(packageReferences).filter(([, ref]) => isClerkIOSPackageReference(ref));

if (existingEntries.length > 0) {
const [uuid, ref] = existingEntries[0];
ref.repositoryURL = CLERK_IOS_REPO;
ref.requirement = { ...CLERK_IOS_REQUIREMENT };

const duplicateUuids = existingEntries.slice(1).map(([duplicateUuid]) => duplicateUuid);
removeSwiftPackageReferences(xcodeProject, duplicateUuids);

return uuid;
}

const packageUuid = xcodeProject.generateUuid();
packageReferences[packageUuid] = {
isa: 'XCRemoteSwiftPackageReference',
repositoryURL: CLERK_IOS_REPO,
requirement: { ...CLERK_IOS_REQUIREMENT },
};
return packageUuid;
};

const findOrCreateSwiftPackageProductDependency = (xcodeProject, packageUuid, productName) => {
const productDependencies = xcodeProject.hash.project.objects.XCSwiftPackageProductDependency;
const existingEntry = Object.entries(productDependencies).find(
([, dep]) => dep?.package === packageUuid && dep?.productName === productName,
);

if (existingEntry) {
return existingEntry[0];
}

const productUuid = xcodeProject.generateUuid();
productDependencies[productUuid] = {
isa: 'XCSwiftPackageProductDependency',
package: packageUuid,
productName,
};
return productUuid;
};

const addObjectReference = (list, uuid, comment) => {
if (!list.some(ref => ref.value === uuid)) {
list.push({ value: uuid, comment });
}
};

const withClerkIOS = config => {
console.log('✅ Clerk iOS plugin loaded');

Expand DownExpand Up@@ -201,21 +97,42 @@ const withClerkIOS = config => {
const targetUuid = targets.uuid;
const targetName = targets.name;

// Add Swift Package reference to the project
const packageUuid = xcodeProject.generateUuid();
const packageName = 'clerk-ios';

// Add package reference to XCRemoteSwiftPackageReference section
if (!xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference) {
xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference = {};
}

const packageUuid = findOrCreateClerkIOSPackageReference(xcodeProject);
xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference[packageUuid] = {
isa: 'XCRemoteSwiftPackageReference',
repositoryURL: CLERK_IOS_REPO,
requirement: {
kind: 'exactVersion',
version: CLERK_IOS_VERSION,
},
};

// Add package product dependencies (ClerkKit + ClerkKitUI)
const productUuidKit = xcodeProject.generateUuid();
const productUuidKitUI = xcodeProject.generateUuid();
if (!xcodeProject.hash.project.objects.XCSwiftPackageProductDependency) {
xcodeProject.hash.project.objects.XCSwiftPackageProductDependency = {};
}

const productUuidKit = findOrCreateSwiftPackageProductDependency(xcodeProject, packageUuid, 'ClerkKit');
const productUuidKitUI = findOrCreateSwiftPackageProductDependency(xcodeProject, packageUuid, 'ClerkKitUI');
xcodeProject.hash.project.objects.XCSwiftPackageProductDependency[productUuidKit] = {
isa: 'XCSwiftPackageProductDependency',
package: packageUuid,
productName: 'ClerkKit',
};

xcodeProject.hash.project.objects.XCSwiftPackageProductDependency[productUuidKitUI] = {
isa: 'XCSwiftPackageProductDependency',
package: packageUuid,
productName: 'ClerkKitUI',
};

// Add package to project's package references
const projectSection = xcodeProject.hash.project.objects.PBXProject;
Expand All@@ -226,16 +143,40 @@ const withClerkIOS = config => {
project.packageReferences = [];
}

addObjectReference(project.packageReferences, packageUuid, packageName);
// Check if package is already added
const alreadyAdded = project.packageReferences.some(ref => {
const refObj = xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference[ref.value];
return refObj && refObj.repositoryURL === CLERK_IOS_REPO;
});

if (!alreadyAdded) {
project.packageReferences.push({
value: packageUuid,
comment: packageName,
});
}

// Add package products to main app target
const nativeTarget = xcodeProject.hash.project.objects.PBXNativeTarget[targetUuid];
if (!nativeTarget.packageProductDependencies) {
nativeTarget.packageProductDependencies = [];
}

addObjectReference(nativeTarget.packageProductDependencies, productUuidKit, 'ClerkKit');
addObjectReference(nativeTarget.packageProductDependencies, productUuidKitUI, 'ClerkKitUI');
const kitAlreadyAdded = nativeTarget.packageProductDependencies.some(dep => dep.value === productUuidKit);
if (!kitAlreadyAdded) {
nativeTarget.packageProductDependencies.push({
value: productUuidKit,
comment: 'ClerkKit',
});
}

const kitUIAlreadyAdded = nativeTarget.packageProductDependencies.some(dep => dep.value === productUuidKitUI);
if (!kitUIAlreadyAdded) {
nativeTarget.packageProductDependencies.push({
value: productUuidKitUI,
comment: 'ClerkKitUI',
});
}

// Also add packages to ClerkExpo pod target if it exists
const allTargets = xcodeProject.hash.project.objects.PBXNativeTarget;
Expand All@@ -245,8 +186,21 @@ const withClerkIOS = config => {
target.packageProductDependencies = [];
}

addObjectReference(target.packageProductDependencies, productUuidKit, 'ClerkKit');
addObjectReference(target.packageProductDependencies, productUuidKitUI, 'ClerkKitUI');
const podKitAdded = target.packageProductDependencies.some(dep => dep.value === productUuidKit);
if (!podKitAdded) {
target.packageProductDependencies.push({
value: productUuidKit,
comment: 'ClerkKit',
});
}

const podKitUIAdded = target.packageProductDependencies.some(dep => dep.value === productUuidKitUI);
if (!podKitUIAdded) {
target.packageProductDependencies.push({
value: productUuidKitUI,
comment: 'ClerkKitUI',
});
}

console.log(`✅ Added ClerkKit and ClerkKitUI packages to ClerkExpo pod target`);
}
Expand DownExpand Up@@ -762,13 +716,4 @@ const withClerkExpo = (config, props = {}) => {
};

module.exports = withClerkExpo;
module.exports._testing = {
validateThemeJson,
isPlainObject,
VALID_COLOR_KEYS,
HEX_COLOR_REGEX,
CLERK_IOS_VERSION,
CLERK_IOS_REQUIREMENT,
findOrCreateClerkIOSPackageReference,
findOrCreateSwiftPackageProductDependency,
};
module.exports._testing = { validateThemeJson, isPlainObject, VALID_COLOR_KEYS, HEX_COLOR_REGEX };
132 changes: 0 additions & 132 deletions packages/expo/src/__tests__/appPlugin.ios.test.js

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Revert "fix(expo): pin clerk-ios and dedupe Expo SPM refs" by wobsoriano · Pull Request #8692 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .changeset/fresh-clocks-pay.md

This file was deleted.

2 changes: 2 additions & 0 deletions .changeset/huge-moments-poke.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
191 changes: 68 additions & 123 deletions packages/expo/app.plugin.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,114 +20,10 @@ const path = require('path');
const fs = require('fs');

const CLERK_IOS_REPO = 'https://github.com/clerk/clerk-ios.git';
const CLERK_IOS_VERSION = '1.1.3';
const CLERK_IOS_REQUIREMENT = {
kind: 'exactVersion',
version: CLERK_IOS_VERSION,
};
const CLERK_IOS_VERSION = '1.0.0';

const CLERK_MIN_IOS_VERSION = '17.0';

const normalizeRepositoryURL = repositoryURL => String(repositoryURL || '').replace(/^"|"$/g, '');

const isClerkIOSPackageReference = ref => normalizeRepositoryURL(ref?.repositoryURL) === CLERK_IOS_REPO;

const removeObjectReference = (list, uuid) => {
if (!Array.isArray(list)) {
return;
}

for (let index = list.length - 1; index >= 0; index--) {
if (list[index]?.value === uuid) {
list.splice(index, 1);
}
}
};

const removeSwiftPackageProductDependencies = (xcodeProject, packageUuids) => {
const productDependencies = xcodeProject.hash.project.objects.XCSwiftPackageProductDependency || {};
const packageUuidSet = new Set(packageUuids);

for (const [productUuid, dependency] of Object.entries(productDependencies)) {
if (!packageUuidSet.has(dependency?.package)) {
continue;
}

delete productDependencies[productUuid];

const targets = xcodeProject.hash.project.objects.PBXNativeTarget || {};
for (const target of Object.values(targets)) {
removeObjectReference(target?.packageProductDependencies, productUuid);
}
}
};

const removeSwiftPackageReferences = (xcodeProject, packageUuids) => {
const packageReferences = xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference || {};

for (const packageUuid of packageUuids) {
delete packageReferences[packageUuid];
}

const projects = xcodeProject.hash.project.objects.PBXProject || {};
for (const project of Object.values(projects)) {
for (const packageUuid of packageUuids) {
removeObjectReference(project?.packageReferences, packageUuid);
}
}

removeSwiftPackageProductDependencies(xcodeProject, packageUuids);
};

const findOrCreateClerkIOSPackageReference = xcodeProject => {
const packageReferences = xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference;
const existingEntries = Object.entries(packageReferences).filter(([, ref]) => isClerkIOSPackageReference(ref));

if (existingEntries.length > 0) {
const [uuid, ref] = existingEntries[0];
ref.repositoryURL = CLERK_IOS_REPO;
ref.requirement = { ...CLERK_IOS_REQUIREMENT };

const duplicateUuids = existingEntries.slice(1).map(([duplicateUuid]) => duplicateUuid);
removeSwiftPackageReferences(xcodeProject, duplicateUuids);

return uuid;
}

const packageUuid = xcodeProject.generateUuid();
packageReferences[packageUuid] = {
isa: 'XCRemoteSwiftPackageReference',
repositoryURL: CLERK_IOS_REPO,
requirement: { ...CLERK_IOS_REQUIREMENT },
};
return packageUuid;
};

const findOrCreateSwiftPackageProductDependency = (xcodeProject, packageUuid, productName) => {
const productDependencies = xcodeProject.hash.project.objects.XCSwiftPackageProductDependency;
const existingEntry = Object.entries(productDependencies).find(
([, dep]) => dep?.package === packageUuid && dep?.productName === productName,
);

if (existingEntry) {
return existingEntry[0];
}

const productUuid = xcodeProject.generateUuid();
productDependencies[productUuid] = {
isa: 'XCSwiftPackageProductDependency',
package: packageUuid,
productName,
};
return productUuid;
};

const addObjectReference = (list, uuid, comment) => {
if (!list.some(ref => ref.value === uuid)) {
list.push({ value: uuid, comment });
}
};

const withClerkIOS = config => {
console.log('✅ Clerk iOS plugin loaded');

Expand DownExpand Up@@ -201,21 +97,42 @@ const withClerkIOS = config => {
const targetUuid = targets.uuid;
const targetName = targets.name;

// Add Swift Package reference to the project
const packageUuid = xcodeProject.generateUuid();
const packageName = 'clerk-ios';

// Add package reference to XCRemoteSwiftPackageReference section
if (!xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference) {
xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference = {};
}

const packageUuid = findOrCreateClerkIOSPackageReference(xcodeProject);
xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference[packageUuid] = {
isa: 'XCRemoteSwiftPackageReference',
repositoryURL: CLERK_IOS_REPO,
requirement: {
kind: 'exactVersion',
version: CLERK_IOS_VERSION,
},
};

// Add package product dependencies (ClerkKit + ClerkKitUI)
const productUuidKit = xcodeProject.generateUuid();
const productUuidKitUI = xcodeProject.generateUuid();
if (!xcodeProject.hash.project.objects.XCSwiftPackageProductDependency) {
xcodeProject.hash.project.objects.XCSwiftPackageProductDependency = {};
}

const productUuidKit = findOrCreateSwiftPackageProductDependency(xcodeProject, packageUuid, 'ClerkKit');
const productUuidKitUI = findOrCreateSwiftPackageProductDependency(xcodeProject, packageUuid, 'ClerkKitUI');
xcodeProject.hash.project.objects.XCSwiftPackageProductDependency[productUuidKit] = {
isa: 'XCSwiftPackageProductDependency',
package: packageUuid,
productName: 'ClerkKit',
};

xcodeProject.hash.project.objects.XCSwiftPackageProductDependency[productUuidKitUI] = {
isa: 'XCSwiftPackageProductDependency',
package: packageUuid,
productName: 'ClerkKitUI',
};

// Add package to project's package references
const projectSection = xcodeProject.hash.project.objects.PBXProject;
Expand All@@ -226,16 +143,40 @@ const withClerkIOS = config => {
project.packageReferences = [];
}

addObjectReference(project.packageReferences, packageUuid, packageName);
// Check if package is already added
const alreadyAdded = project.packageReferences.some(ref => {
const refObj = xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference[ref.value];
return refObj && refObj.repositoryURL === CLERK_IOS_REPO;
});

if (!alreadyAdded) {
project.packageReferences.push({
value: packageUuid,
comment: packageName,
});
}

// Add package products to main app target
const nativeTarget = xcodeProject.hash.project.objects.PBXNativeTarget[targetUuid];
if (!nativeTarget.packageProductDependencies) {
nativeTarget.packageProductDependencies = [];
}

addObjectReference(nativeTarget.packageProductDependencies, productUuidKit, 'ClerkKit');
addObjectReference(nativeTarget.packageProductDependencies, productUuidKitUI, 'ClerkKitUI');
const kitAlreadyAdded = nativeTarget.packageProductDependencies.some(dep => dep.value === productUuidKit);
if (!kitAlreadyAdded) {
nativeTarget.packageProductDependencies.push({
value: productUuidKit,
comment: 'ClerkKit',
});
}

const kitUIAlreadyAdded = nativeTarget.packageProductDependencies.some(dep => dep.value === productUuidKitUI);
if (!kitUIAlreadyAdded) {
nativeTarget.packageProductDependencies.push({
value: productUuidKitUI,
comment: 'ClerkKitUI',
});
}

// Also add packages to ClerkExpo pod target if it exists
const allTargets = xcodeProject.hash.project.objects.PBXNativeTarget;
Expand All@@ -245,8 +186,21 @@ const withClerkIOS = config => {
target.packageProductDependencies = [];
}

addObjectReference(target.packageProductDependencies, productUuidKit, 'ClerkKit');
addObjectReference(target.packageProductDependencies, productUuidKitUI, 'ClerkKitUI');
const podKitAdded = target.packageProductDependencies.some(dep => dep.value === productUuidKit);
if (!podKitAdded) {
target.packageProductDependencies.push({
value: productUuidKit,
comment: 'ClerkKit',
});
}

const podKitUIAdded = target.packageProductDependencies.some(dep => dep.value === productUuidKitUI);
if (!podKitUIAdded) {
target.packageProductDependencies.push({
value: productUuidKitUI,
comment: 'ClerkKitUI',
});
}

console.log(`✅ Added ClerkKit and ClerkKitUI packages to ClerkExpo pod target`);
}
Expand DownExpand Up@@ -762,13 +716,4 @@ const withClerkExpo = (config, props = {}) => {
};

module.exports = withClerkExpo;
module.exports._testing = {
validateThemeJson,
isPlainObject,
VALID_COLOR_KEYS,
HEX_COLOR_REGEX,
CLERK_IOS_VERSION,
CLERK_IOS_REQUIREMENT,
findOrCreateClerkIOSPackageReference,
findOrCreateSwiftPackageProductDependency,
};
module.exports._testing = { validateThemeJson, isPlainObject, VALID_COLOR_KEYS, HEX_COLOR_REGEX };
132 changes: 0 additions & 132 deletions packages/expo/src/__tests__/appPlugin.ios.test.js

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Revert "fix(expo): pin clerk-ios and dedupe Expo SPM refs" by wobsoriano · Pull Request #8692 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .changeset/fresh-clocks-pay.md

This file was deleted.

2 changes: 2 additions & 0 deletions .changeset/huge-moments-poke.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
191 changes: 68 additions & 123 deletions packages/expo/app.plugin.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,114 +20,10 @@ const path = require('path');
const fs = require('fs');

const CLERK_IOS_REPO = 'https://github.com/clerk/clerk-ios.git';
const CLERK_IOS_VERSION = '1.1.3';
const CLERK_IOS_REQUIREMENT = {
kind: 'exactVersion',
version: CLERK_IOS_VERSION,
};
const CLERK_IOS_VERSION = '1.0.0';

const CLERK_MIN_IOS_VERSION = '17.0';

const normalizeRepositoryURL = repositoryURL => String(repositoryURL || '').replace(/^"|"$/g, '');

const isClerkIOSPackageReference = ref => normalizeRepositoryURL(ref?.repositoryURL) === CLERK_IOS_REPO;

const removeObjectReference = (list, uuid) => {
if (!Array.isArray(list)) {
return;
}

for (let index = list.length - 1; index >= 0; index--) {
if (list[index]?.value === uuid) {
list.splice(index, 1);
}
}
};

const removeSwiftPackageProductDependencies = (xcodeProject, packageUuids) => {
const productDependencies = xcodeProject.hash.project.objects.XCSwiftPackageProductDependency || {};
const packageUuidSet = new Set(packageUuids);

for (const [productUuid, dependency] of Object.entries(productDependencies)) {
if (!packageUuidSet.has(dependency?.package)) {
continue;
}

delete productDependencies[productUuid];

const targets = xcodeProject.hash.project.objects.PBXNativeTarget || {};
for (const target of Object.values(targets)) {
removeObjectReference(target?.packageProductDependencies, productUuid);
}
}
};

const removeSwiftPackageReferences = (xcodeProject, packageUuids) => {
const packageReferences = xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference || {};

for (const packageUuid of packageUuids) {
delete packageReferences[packageUuid];
}

const projects = xcodeProject.hash.project.objects.PBXProject || {};
for (const project of Object.values(projects)) {
for (const packageUuid of packageUuids) {
removeObjectReference(project?.packageReferences, packageUuid);
}
}

removeSwiftPackageProductDependencies(xcodeProject, packageUuids);
};

const findOrCreateClerkIOSPackageReference = xcodeProject => {
const packageReferences = xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference;
const existingEntries = Object.entries(packageReferences).filter(([, ref]) => isClerkIOSPackageReference(ref));

if (existingEntries.length > 0) {
const [uuid, ref] = existingEntries[0];
ref.repositoryURL = CLERK_IOS_REPO;
ref.requirement = { ...CLERK_IOS_REQUIREMENT };

const duplicateUuids = existingEntries.slice(1).map(([duplicateUuid]) => duplicateUuid);
removeSwiftPackageReferences(xcodeProject, duplicateUuids);

return uuid;
}

const packageUuid = xcodeProject.generateUuid();
packageReferences[packageUuid] = {
isa: 'XCRemoteSwiftPackageReference',
repositoryURL: CLERK_IOS_REPO,
requirement: { ...CLERK_IOS_REQUIREMENT },
};
return packageUuid;
};

const findOrCreateSwiftPackageProductDependency = (xcodeProject, packageUuid, productName) => {
const productDependencies = xcodeProject.hash.project.objects.XCSwiftPackageProductDependency;
const existingEntry = Object.entries(productDependencies).find(
([, dep]) => dep?.package === packageUuid && dep?.productName === productName,
);

if (existingEntry) {
return existingEntry[0];
}

const productUuid = xcodeProject.generateUuid();
productDependencies[productUuid] = {
isa: 'XCSwiftPackageProductDependency',
package: packageUuid,
productName,
};
return productUuid;
};

const addObjectReference = (list, uuid, comment) => {
if (!list.some(ref => ref.value === uuid)) {
list.push({ value: uuid, comment });
}
};

const withClerkIOS = config => {
console.log('✅ Clerk iOS plugin loaded');

Expand DownExpand Up@@ -201,21 +97,42 @@ const withClerkIOS = config => {
const targetUuid = targets.uuid;
const targetName = targets.name;

// Add Swift Package reference to the project
const packageUuid = xcodeProject.generateUuid();
const packageName = 'clerk-ios';

// Add package reference to XCRemoteSwiftPackageReference section
if (!xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference) {
xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference = {};
}

const packageUuid = findOrCreateClerkIOSPackageReference(xcodeProject);
xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference[packageUuid] = {
isa: 'XCRemoteSwiftPackageReference',
repositoryURL: CLERK_IOS_REPO,
requirement: {
kind: 'exactVersion',
version: CLERK_IOS_VERSION,
},
};

// Add package product dependencies (ClerkKit + ClerkKitUI)
const productUuidKit = xcodeProject.generateUuid();
const productUuidKitUI = xcodeProject.generateUuid();
if (!xcodeProject.hash.project.objects.XCSwiftPackageProductDependency) {
xcodeProject.hash.project.objects.XCSwiftPackageProductDependency = {};
}

const productUuidKit = findOrCreateSwiftPackageProductDependency(xcodeProject, packageUuid, 'ClerkKit');
const productUuidKitUI = findOrCreateSwiftPackageProductDependency(xcodeProject, packageUuid, 'ClerkKitUI');
xcodeProject.hash.project.objects.XCSwiftPackageProductDependency[productUuidKit] = {
isa: 'XCSwiftPackageProductDependency',
package: packageUuid,
productName: 'ClerkKit',
};

xcodeProject.hash.project.objects.XCSwiftPackageProductDependency[productUuidKitUI] = {
isa: 'XCSwiftPackageProductDependency',
package: packageUuid,
productName: 'ClerkKitUI',
};

// Add package to project's package references
const projectSection = xcodeProject.hash.project.objects.PBXProject;
Expand All@@ -226,16 +143,40 @@ const withClerkIOS = config => {
project.packageReferences = [];
}

addObjectReference(project.packageReferences, packageUuid, packageName);
// Check if package is already added
const alreadyAdded = project.packageReferences.some(ref => {
const refObj = xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference[ref.value];
return refObj && refObj.repositoryURL === CLERK_IOS_REPO;
});

if (!alreadyAdded) {
project.packageReferences.push({
value: packageUuid,
comment: packageName,
});
}

// Add package products to main app target
const nativeTarget = xcodeProject.hash.project.objects.PBXNativeTarget[targetUuid];
if (!nativeTarget.packageProductDependencies) {
nativeTarget.packageProductDependencies = [];
}

addObjectReference(nativeTarget.packageProductDependencies, productUuidKit, 'ClerkKit');
addObjectReference(nativeTarget.packageProductDependencies, productUuidKitUI, 'ClerkKitUI');
const kitAlreadyAdded = nativeTarget.packageProductDependencies.some(dep => dep.value === productUuidKit);
if (!kitAlreadyAdded) {
nativeTarget.packageProductDependencies.push({
value: productUuidKit,
comment: 'ClerkKit',
});
}

const kitUIAlreadyAdded = nativeTarget.packageProductDependencies.some(dep => dep.value === productUuidKitUI);
if (!kitUIAlreadyAdded) {
nativeTarget.packageProductDependencies.push({
value: productUuidKitUI,
comment: 'ClerkKitUI',
});
}

// Also add packages to ClerkExpo pod target if it exists
const allTargets = xcodeProject.hash.project.objects.PBXNativeTarget;
Expand All@@ -245,8 +186,21 @@ const withClerkIOS = config => {
target.packageProductDependencies = [];
}

addObjectReference(target.packageProductDependencies, productUuidKit, 'ClerkKit');
addObjectReference(target.packageProductDependencies, productUuidKitUI, 'ClerkKitUI');
const podKitAdded = target.packageProductDependencies.some(dep => dep.value === productUuidKit);
if (!podKitAdded) {
target.packageProductDependencies.push({
value: productUuidKit,
comment: 'ClerkKit',
});
}

const podKitUIAdded = target.packageProductDependencies.some(dep => dep.value === productUuidKitUI);
if (!podKitUIAdded) {
target.packageProductDependencies.push({
value: productUuidKitUI,
comment: 'ClerkKitUI',
});
}

console.log(`✅ Added ClerkKit and ClerkKitUI packages to ClerkExpo pod target`);
}
Expand DownExpand Up@@ -762,13 +716,4 @@ const withClerkExpo = (config, props = {}) => {
};

module.exports = withClerkExpo;
module.exports._testing = {
validateThemeJson,
isPlainObject,
VALID_COLOR_KEYS,
HEX_COLOR_REGEX,
CLERK_IOS_VERSION,
CLERK_IOS_REQUIREMENT,
findOrCreateClerkIOSPackageReference,
findOrCreateSwiftPackageProductDependency,
};
module.exports._testing = { validateThemeJson, isPlainObject, VALID_COLOR_KEYS, HEX_COLOR_REGEX };
132 changes: 0 additions & 132 deletions packages/expo/src/__tests__/appPlugin.ios.test.js

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Revert "fix(expo): pin clerk-ios and dedupe Expo SPM refs" by wobsoriano · Pull Request #8692 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .changeset/fresh-clocks-pay.md

This file was deleted.

2 changes: 2 additions & 0 deletions .changeset/huge-moments-poke.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
191 changes: 68 additions & 123 deletions packages/expo/app.plugin.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,114 +20,10 @@ const path = require('path');
const fs = require('fs');

const CLERK_IOS_REPO = 'https://github.com/clerk/clerk-ios.git';
const CLERK_IOS_VERSION = '1.1.3';
const CLERK_IOS_REQUIREMENT = {
kind: 'exactVersion',
version: CLERK_IOS_VERSION,
};
const CLERK_IOS_VERSION = '1.0.0';

const CLERK_MIN_IOS_VERSION = '17.0';

const normalizeRepositoryURL = repositoryURL => String(repositoryURL || '').replace(/^"|"$/g, '');

const isClerkIOSPackageReference = ref => normalizeRepositoryURL(ref?.repositoryURL) === CLERK_IOS_REPO;

const removeObjectReference = (list, uuid) => {
if (!Array.isArray(list)) {
return;
}

for (let index = list.length - 1; index >= 0; index--) {
if (list[index]?.value === uuid) {
list.splice(index, 1);
}
}
};

const removeSwiftPackageProductDependencies = (xcodeProject, packageUuids) => {
const productDependencies = xcodeProject.hash.project.objects.XCSwiftPackageProductDependency || {};
const packageUuidSet = new Set(packageUuids);

for (const [productUuid, dependency] of Object.entries(productDependencies)) {
if (!packageUuidSet.has(dependency?.package)) {
continue;
}

delete productDependencies[productUuid];

const targets = xcodeProject.hash.project.objects.PBXNativeTarget || {};
for (const target of Object.values(targets)) {
removeObjectReference(target?.packageProductDependencies, productUuid);
}
}
};

const removeSwiftPackageReferences = (xcodeProject, packageUuids) => {
const packageReferences = xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference || {};

for (const packageUuid of packageUuids) {
delete packageReferences[packageUuid];
}

const projects = xcodeProject.hash.project.objects.PBXProject || {};
for (const project of Object.values(projects)) {
for (const packageUuid of packageUuids) {
removeObjectReference(project?.packageReferences, packageUuid);
}
}

removeSwiftPackageProductDependencies(xcodeProject, packageUuids);
};

const findOrCreateClerkIOSPackageReference = xcodeProject => {
const packageReferences = xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference;
const existingEntries = Object.entries(packageReferences).filter(([, ref]) => isClerkIOSPackageReference(ref));

if (existingEntries.length > 0) {
const [uuid, ref] = existingEntries[0];
ref.repositoryURL = CLERK_IOS_REPO;
ref.requirement = { ...CLERK_IOS_REQUIREMENT };

const duplicateUuids = existingEntries.slice(1).map(([duplicateUuid]) => duplicateUuid);
removeSwiftPackageReferences(xcodeProject, duplicateUuids);

return uuid;
}

const packageUuid = xcodeProject.generateUuid();
packageReferences[packageUuid] = {
isa: 'XCRemoteSwiftPackageReference',
repositoryURL: CLERK_IOS_REPO,
requirement: { ...CLERK_IOS_REQUIREMENT },
};
return packageUuid;
};

const findOrCreateSwiftPackageProductDependency = (xcodeProject, packageUuid, productName) => {
const productDependencies = xcodeProject.hash.project.objects.XCSwiftPackageProductDependency;
const existingEntry = Object.entries(productDependencies).find(
([, dep]) => dep?.package === packageUuid && dep?.productName === productName,
);

if (existingEntry) {
return existingEntry[0];
}

const productUuid = xcodeProject.generateUuid();
productDependencies[productUuid] = {
isa: 'XCSwiftPackageProductDependency',
package: packageUuid,
productName,
};
return productUuid;
};

const addObjectReference = (list, uuid, comment) => {
if (!list.some(ref => ref.value === uuid)) {
list.push({ value: uuid, comment });
}
};

const withClerkIOS = config => {
console.log('✅ Clerk iOS plugin loaded');

Expand DownExpand Up@@ -201,21 +97,42 @@ const withClerkIOS = config => {
const targetUuid = targets.uuid;
const targetName = targets.name;

// Add Swift Package reference to the project
const packageUuid = xcodeProject.generateUuid();
const packageName = 'clerk-ios';

// Add package reference to XCRemoteSwiftPackageReference section
if (!xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference) {
xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference = {};
}

const packageUuid = findOrCreateClerkIOSPackageReference(xcodeProject);
xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference[packageUuid] = {
isa: 'XCRemoteSwiftPackageReference',
repositoryURL: CLERK_IOS_REPO,
requirement: {
kind: 'exactVersion',
version: CLERK_IOS_VERSION,
},
};

// Add package product dependencies (ClerkKit + ClerkKitUI)
const productUuidKit = xcodeProject.generateUuid();
const productUuidKitUI = xcodeProject.generateUuid();
if (!xcodeProject.hash.project.objects.XCSwiftPackageProductDependency) {
xcodeProject.hash.project.objects.XCSwiftPackageProductDependency = {};
}

const productUuidKit = findOrCreateSwiftPackageProductDependency(xcodeProject, packageUuid, 'ClerkKit');
const productUuidKitUI = findOrCreateSwiftPackageProductDependency(xcodeProject, packageUuid, 'ClerkKitUI');
xcodeProject.hash.project.objects.XCSwiftPackageProductDependency[productUuidKit] = {
isa: 'XCSwiftPackageProductDependency',
package: packageUuid,
productName: 'ClerkKit',
};

xcodeProject.hash.project.objects.XCSwiftPackageProductDependency[productUuidKitUI] = {
isa: 'XCSwiftPackageProductDependency',
package: packageUuid,
productName: 'ClerkKitUI',
};

// Add package to project's package references
const projectSection = xcodeProject.hash.project.objects.PBXProject;
Expand All@@ -226,16 +143,40 @@ const withClerkIOS = config => {
project.packageReferences = [];
}

addObjectReference(project.packageReferences, packageUuid, packageName);
// Check if package is already added
const alreadyAdded = project.packageReferences.some(ref => {
const refObj = xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference[ref.value];
return refObj && refObj.repositoryURL === CLERK_IOS_REPO;
});

if (!alreadyAdded) {
project.packageReferences.push({
value: packageUuid,
comment: packageName,
});
}

// Add package products to main app target
const nativeTarget = xcodeProject.hash.project.objects.PBXNativeTarget[targetUuid];
if (!nativeTarget.packageProductDependencies) {
nativeTarget.packageProductDependencies = [];
}

addObjectReference(nativeTarget.packageProductDependencies, productUuidKit, 'ClerkKit');
addObjectReference(nativeTarget.packageProductDependencies, productUuidKitUI, 'ClerkKitUI');
const kitAlreadyAdded = nativeTarget.packageProductDependencies.some(dep => dep.value === productUuidKit);
if (!kitAlreadyAdded) {
nativeTarget.packageProductDependencies.push({
value: productUuidKit,
comment: 'ClerkKit',
});
}

const kitUIAlreadyAdded = nativeTarget.packageProductDependencies.some(dep => dep.value === productUuidKitUI);
if (!kitUIAlreadyAdded) {
nativeTarget.packageProductDependencies.push({
value: productUuidKitUI,
comment: 'ClerkKitUI',
});
}

// Also add packages to ClerkExpo pod target if it exists
const allTargets = xcodeProject.hash.project.objects.PBXNativeTarget;
Expand All@@ -245,8 +186,21 @@ const withClerkIOS = config => {
target.packageProductDependencies = [];
}

addObjectReference(target.packageProductDependencies, productUuidKit, 'ClerkKit');
addObjectReference(target.packageProductDependencies, productUuidKitUI, 'ClerkKitUI');
const podKitAdded = target.packageProductDependencies.some(dep => dep.value === productUuidKit);
if (!podKitAdded) {
target.packageProductDependencies.push({
value: productUuidKit,
comment: 'ClerkKit',
});
}

const podKitUIAdded = target.packageProductDependencies.some(dep => dep.value === productUuidKitUI);
if (!podKitUIAdded) {
target.packageProductDependencies.push({
value: productUuidKitUI,
comment: 'ClerkKitUI',
});
}

console.log(`✅ Added ClerkKit and ClerkKitUI packages to ClerkExpo pod target`);
}
Expand DownExpand Up@@ -762,13 +716,4 @@ const withClerkExpo = (config, props = {}) => {
};

module.exports = withClerkExpo;
module.exports._testing = {
validateThemeJson,
isPlainObject,
VALID_COLOR_KEYS,
HEX_COLOR_REGEX,
CLERK_IOS_VERSION,
CLERK_IOS_REQUIREMENT,
findOrCreateClerkIOSPackageReference,
findOrCreateSwiftPackageProductDependency,
};
module.exports._testing = { validateThemeJson, isPlainObject, VALID_COLOR_KEYS, HEX_COLOR_REGEX };
132 changes: 0 additions & 132 deletions packages/expo/src/__tests__/appPlugin.ios.test.js

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Revert "fix(expo): pin clerk-ios and dedupe Expo SPM refs" by wobsoriano · Pull Request #8692 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .changeset/fresh-clocks-pay.md

This file was deleted.

2 changes: 2 additions & 0 deletions .changeset/huge-moments-poke.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
191 changes: 68 additions & 123 deletions packages/expo/app.plugin.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,114 +20,10 @@ const path = require('path');
const fs = require('fs');

const CLERK_IOS_REPO = 'https://github.com/clerk/clerk-ios.git';
const CLERK_IOS_VERSION = '1.1.3';
const CLERK_IOS_REQUIREMENT = {
kind: 'exactVersion',
version: CLERK_IOS_VERSION,
};
const CLERK_IOS_VERSION = '1.0.0';

const CLERK_MIN_IOS_VERSION = '17.0';

const normalizeRepositoryURL = repositoryURL => String(repositoryURL || '').replace(/^"|"$/g, '');

const isClerkIOSPackageReference = ref => normalizeRepositoryURL(ref?.repositoryURL) === CLERK_IOS_REPO;

const removeObjectReference = (list, uuid) => {
if (!Array.isArray(list)) {
return;
}

for (let index = list.length - 1; index >= 0; index--) {
if (list[index]?.value === uuid) {
list.splice(index, 1);
}
}
};

const removeSwiftPackageProductDependencies = (xcodeProject, packageUuids) => {
const productDependencies = xcodeProject.hash.project.objects.XCSwiftPackageProductDependency || {};
const packageUuidSet = new Set(packageUuids);

for (const [productUuid, dependency] of Object.entries(productDependencies)) {
if (!packageUuidSet.has(dependency?.package)) {
continue;
}

delete productDependencies[productUuid];

const targets = xcodeProject.hash.project.objects.PBXNativeTarget || {};
for (const target of Object.values(targets)) {
removeObjectReference(target?.packageProductDependencies, productUuid);
}
}
};

const removeSwiftPackageReferences = (xcodeProject, packageUuids) => {
const packageReferences = xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference || {};

for (const packageUuid of packageUuids) {
delete packageReferences[packageUuid];
}

const projects = xcodeProject.hash.project.objects.PBXProject || {};
for (const project of Object.values(projects)) {
for (const packageUuid of packageUuids) {
removeObjectReference(project?.packageReferences, packageUuid);
}
}

removeSwiftPackageProductDependencies(xcodeProject, packageUuids);
};

const findOrCreateClerkIOSPackageReference = xcodeProject => {
const packageReferences = xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference;
const existingEntries = Object.entries(packageReferences).filter(([, ref]) => isClerkIOSPackageReference(ref));

if (existingEntries.length > 0) {
const [uuid, ref] = existingEntries[0];
ref.repositoryURL = CLERK_IOS_REPO;
ref.requirement = { ...CLERK_IOS_REQUIREMENT };

const duplicateUuids = existingEntries.slice(1).map(([duplicateUuid]) => duplicateUuid);
removeSwiftPackageReferences(xcodeProject, duplicateUuids);

return uuid;
}

const packageUuid = xcodeProject.generateUuid();
packageReferences[packageUuid] = {
isa: 'XCRemoteSwiftPackageReference',
repositoryURL: CLERK_IOS_REPO,
requirement: { ...CLERK_IOS_REQUIREMENT },
};
return packageUuid;
};

const findOrCreateSwiftPackageProductDependency = (xcodeProject, packageUuid, productName) => {
const productDependencies = xcodeProject.hash.project.objects.XCSwiftPackageProductDependency;
const existingEntry = Object.entries(productDependencies).find(
([, dep]) => dep?.package === packageUuid && dep?.productName === productName,
);

if (existingEntry) {
return existingEntry[0];
}

const productUuid = xcodeProject.generateUuid();
productDependencies[productUuid] = {
isa: 'XCSwiftPackageProductDependency',
package: packageUuid,
productName,
};
return productUuid;
};

const addObjectReference = (list, uuid, comment) => {
if (!list.some(ref => ref.value === uuid)) {
list.push({ value: uuid, comment });
}
};

const withClerkIOS = config => {
console.log('✅ Clerk iOS plugin loaded');

Expand DownExpand Up@@ -201,21 +97,42 @@ const withClerkIOS = config => {
const targetUuid = targets.uuid;
const targetName = targets.name;

// Add Swift Package reference to the project
const packageUuid = xcodeProject.generateUuid();
const packageName = 'clerk-ios';

// Add package reference to XCRemoteSwiftPackageReference section
if (!xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference) {
xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference = {};
}

const packageUuid = findOrCreateClerkIOSPackageReference(xcodeProject);
xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference[packageUuid] = {
isa: 'XCRemoteSwiftPackageReference',
repositoryURL: CLERK_IOS_REPO,
requirement: {
kind: 'exactVersion',
version: CLERK_IOS_VERSION,
},
};

// Add package product dependencies (ClerkKit + ClerkKitUI)
const productUuidKit = xcodeProject.generateUuid();
const productUuidKitUI = xcodeProject.generateUuid();
if (!xcodeProject.hash.project.objects.XCSwiftPackageProductDependency) {
xcodeProject.hash.project.objects.XCSwiftPackageProductDependency = {};
}

const productUuidKit = findOrCreateSwiftPackageProductDependency(xcodeProject, packageUuid, 'ClerkKit');
const productUuidKitUI = findOrCreateSwiftPackageProductDependency(xcodeProject, packageUuid, 'ClerkKitUI');
xcodeProject.hash.project.objects.XCSwiftPackageProductDependency[productUuidKit] = {
isa: 'XCSwiftPackageProductDependency',
package: packageUuid,
productName: 'ClerkKit',
};

xcodeProject.hash.project.objects.XCSwiftPackageProductDependency[productUuidKitUI] = {
isa: 'XCSwiftPackageProductDependency',
package: packageUuid,
productName: 'ClerkKitUI',
};

// Add package to project's package references
const projectSection = xcodeProject.hash.project.objects.PBXProject;
Expand All@@ -226,16 +143,40 @@ const withClerkIOS = config => {
project.packageReferences = [];
}

addObjectReference(project.packageReferences, packageUuid, packageName);
// Check if package is already added
const alreadyAdded = project.packageReferences.some(ref => {
const refObj = xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference[ref.value];
return refObj && refObj.repositoryURL === CLERK_IOS_REPO;
});

if (!alreadyAdded) {
project.packageReferences.push({
value: packageUuid,
comment: packageName,
});
}

// Add package products to main app target
const nativeTarget = xcodeProject.hash.project.objects.PBXNativeTarget[targetUuid];
if (!nativeTarget.packageProductDependencies) {
nativeTarget.packageProductDependencies = [];
}

addObjectReference(nativeTarget.packageProductDependencies, productUuidKit, 'ClerkKit');
addObjectReference(nativeTarget.packageProductDependencies, productUuidKitUI, 'ClerkKitUI');
const kitAlreadyAdded = nativeTarget.packageProductDependencies.some(dep => dep.value === productUuidKit);
if (!kitAlreadyAdded) {
nativeTarget.packageProductDependencies.push({
value: productUuidKit,
comment: 'ClerkKit',
});
}

const kitUIAlreadyAdded = nativeTarget.packageProductDependencies.some(dep => dep.value === productUuidKitUI);
if (!kitUIAlreadyAdded) {
nativeTarget.packageProductDependencies.push({
value: productUuidKitUI,
comment: 'ClerkKitUI',
});
}

// Also add packages to ClerkExpo pod target if it exists
const allTargets = xcodeProject.hash.project.objects.PBXNativeTarget;
Expand All@@ -245,8 +186,21 @@ const withClerkIOS = config => {
target.packageProductDependencies = [];
}

addObjectReference(target.packageProductDependencies, productUuidKit, 'ClerkKit');
addObjectReference(target.packageProductDependencies, productUuidKitUI, 'ClerkKitUI');
const podKitAdded = target.packageProductDependencies.some(dep => dep.value === productUuidKit);
if (!podKitAdded) {
target.packageProductDependencies.push({
value: productUuidKit,
comment: 'ClerkKit',
});
}

const podKitUIAdded = target.packageProductDependencies.some(dep => dep.value === productUuidKitUI);
if (!podKitUIAdded) {
target.packageProductDependencies.push({
value: productUuidKitUI,
comment: 'ClerkKitUI',
});
}

console.log(`✅ Added ClerkKit and ClerkKitUI packages to ClerkExpo pod target`);
}
Expand DownExpand Up@@ -762,13 +716,4 @@ const withClerkExpo = (config, props = {}) => {
};

module.exports = withClerkExpo;
module.exports._testing = {
validateThemeJson,
isPlainObject,
VALID_COLOR_KEYS,
HEX_COLOR_REGEX,
CLERK_IOS_VERSION,
CLERK_IOS_REQUIREMENT,
findOrCreateClerkIOSPackageReference,
findOrCreateSwiftPackageProductDependency,
};
module.exports._testing = { validateThemeJson, isPlainObject, VALID_COLOR_KEYS, HEX_COLOR_REGEX };
132 changes: 0 additions & 132 deletions packages/expo/src/__tests__/appPlugin.ios.test.js

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Revert "fix(expo): pin clerk-ios and dedupe Expo SPM refs" by wobsoriano · Pull Request #8692 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .changeset/fresh-clocks-pay.md

This file was deleted.

2 changes: 2 additions & 0 deletions .changeset/huge-moments-poke.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
191 changes: 68 additions & 123 deletions packages/expo/app.plugin.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,114 +20,10 @@ const path = require('path');
const fs = require('fs');

const CLERK_IOS_REPO = 'https://github.com/clerk/clerk-ios.git';
const CLERK_IOS_VERSION = '1.1.3';
const CLERK_IOS_REQUIREMENT = {
kind: 'exactVersion',
version: CLERK_IOS_VERSION,
};
const CLERK_IOS_VERSION = '1.0.0';

const CLERK_MIN_IOS_VERSION = '17.0';

const normalizeRepositoryURL = repositoryURL => String(repositoryURL || '').replace(/^"|"$/g, '');

const isClerkIOSPackageReference = ref => normalizeRepositoryURL(ref?.repositoryURL) === CLERK_IOS_REPO;

const removeObjectReference = (list, uuid) => {
if (!Array.isArray(list)) {
return;
}

for (let index = list.length - 1; index >= 0; index--) {
if (list[index]?.value === uuid) {
list.splice(index, 1);
}
}
};

const removeSwiftPackageProductDependencies = (xcodeProject, packageUuids) => {
const productDependencies = xcodeProject.hash.project.objects.XCSwiftPackageProductDependency || {};
const packageUuidSet = new Set(packageUuids);

for (const [productUuid, dependency] of Object.entries(productDependencies)) {
if (!packageUuidSet.has(dependency?.package)) {
continue;
}

delete productDependencies[productUuid];

const targets = xcodeProject.hash.project.objects.PBXNativeTarget || {};
for (const target of Object.values(targets)) {
removeObjectReference(target?.packageProductDependencies, productUuid);
}
}
};

const removeSwiftPackageReferences = (xcodeProject, packageUuids) => {
const packageReferences = xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference || {};

for (const packageUuid of packageUuids) {
delete packageReferences[packageUuid];
}

const projects = xcodeProject.hash.project.objects.PBXProject || {};
for (const project of Object.values(projects)) {
for (const packageUuid of packageUuids) {
removeObjectReference(project?.packageReferences, packageUuid);
}
}

removeSwiftPackageProductDependencies(xcodeProject, packageUuids);
};

const findOrCreateClerkIOSPackageReference = xcodeProject => {
const packageReferences = xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference;
const existingEntries = Object.entries(packageReferences).filter(([, ref]) => isClerkIOSPackageReference(ref));

if (existingEntries.length > 0) {
const [uuid, ref] = existingEntries[0];
ref.repositoryURL = CLERK_IOS_REPO;
ref.requirement = { ...CLERK_IOS_REQUIREMENT };

const duplicateUuids = existingEntries.slice(1).map(([duplicateUuid]) => duplicateUuid);
removeSwiftPackageReferences(xcodeProject, duplicateUuids);

return uuid;
}

const packageUuid = xcodeProject.generateUuid();
packageReferences[packageUuid] = {
isa: 'XCRemoteSwiftPackageReference',
repositoryURL: CLERK_IOS_REPO,
requirement: { ...CLERK_IOS_REQUIREMENT },
};
return packageUuid;
};

const findOrCreateSwiftPackageProductDependency = (xcodeProject, packageUuid, productName) => {
const productDependencies = xcodeProject.hash.project.objects.XCSwiftPackageProductDependency;
const existingEntry = Object.entries(productDependencies).find(
([, dep]) => dep?.package === packageUuid && dep?.productName === productName,
);

if (existingEntry) {
return existingEntry[0];
}

const productUuid = xcodeProject.generateUuid();
productDependencies[productUuid] = {
isa: 'XCSwiftPackageProductDependency',
package: packageUuid,
productName,
};
return productUuid;
};

const addObjectReference = (list, uuid, comment) => {
if (!list.some(ref => ref.value === uuid)) {
list.push({ value: uuid, comment });
}
};

const withClerkIOS = config => {
console.log('✅ Clerk iOS plugin loaded');

Expand DownExpand Up@@ -201,21 +97,42 @@ const withClerkIOS = config => {
const targetUuid = targets.uuid;
const targetName = targets.name;

// Add Swift Package reference to the project
const packageUuid = xcodeProject.generateUuid();
const packageName = 'clerk-ios';

// Add package reference to XCRemoteSwiftPackageReference section
if (!xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference) {
xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference = {};
}

const packageUuid = findOrCreateClerkIOSPackageReference(xcodeProject);
xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference[packageUuid] = {
isa: 'XCRemoteSwiftPackageReference',
repositoryURL: CLERK_IOS_REPO,
requirement: {
kind: 'exactVersion',
version: CLERK_IOS_VERSION,
},
};

// Add package product dependencies (ClerkKit + ClerkKitUI)
const productUuidKit = xcodeProject.generateUuid();
const productUuidKitUI = xcodeProject.generateUuid();
if (!xcodeProject.hash.project.objects.XCSwiftPackageProductDependency) {
xcodeProject.hash.project.objects.XCSwiftPackageProductDependency = {};
}

const productUuidKit = findOrCreateSwiftPackageProductDependency(xcodeProject, packageUuid, 'ClerkKit');
const productUuidKitUI = findOrCreateSwiftPackageProductDependency(xcodeProject, packageUuid, 'ClerkKitUI');
xcodeProject.hash.project.objects.XCSwiftPackageProductDependency[productUuidKit] = {
isa: 'XCSwiftPackageProductDependency',
package: packageUuid,
productName: 'ClerkKit',
};

xcodeProject.hash.project.objects.XCSwiftPackageProductDependency[productUuidKitUI] = {
isa: 'XCSwiftPackageProductDependency',
package: packageUuid,
productName: 'ClerkKitUI',
};

// Add package to project's package references
const projectSection = xcodeProject.hash.project.objects.PBXProject;
Expand All@@ -226,16 +143,40 @@ const withClerkIOS = config => {
project.packageReferences = [];
}

addObjectReference(project.packageReferences, packageUuid, packageName);
// Check if package is already added
const alreadyAdded = project.packageReferences.some(ref => {
const refObj = xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference[ref.value];
return refObj && refObj.repositoryURL === CLERK_IOS_REPO;
});

if (!alreadyAdded) {
project.packageReferences.push({
value: packageUuid,
comment: packageName,
});
}

// Add package products to main app target
const nativeTarget = xcodeProject.hash.project.objects.PBXNativeTarget[targetUuid];
if (!nativeTarget.packageProductDependencies) {
nativeTarget.packageProductDependencies = [];
}

addObjectReference(nativeTarget.packageProductDependencies, productUuidKit, 'ClerkKit');
addObjectReference(nativeTarget.packageProductDependencies, productUuidKitUI, 'ClerkKitUI');
const kitAlreadyAdded = nativeTarget.packageProductDependencies.some(dep => dep.value === productUuidKit);
if (!kitAlreadyAdded) {
nativeTarget.packageProductDependencies.push({
value: productUuidKit,
comment: 'ClerkKit',
});
}

const kitUIAlreadyAdded = nativeTarget.packageProductDependencies.some(dep => dep.value === productUuidKitUI);
if (!kitUIAlreadyAdded) {
nativeTarget.packageProductDependencies.push({
value: productUuidKitUI,
comment: 'ClerkKitUI',
});
}

// Also add packages to ClerkExpo pod target if it exists
const allTargets = xcodeProject.hash.project.objects.PBXNativeTarget;
Expand All@@ -245,8 +186,21 @@ const withClerkIOS = config => {
target.packageProductDependencies = [];
}

addObjectReference(target.packageProductDependencies, productUuidKit, 'ClerkKit');
addObjectReference(target.packageProductDependencies, productUuidKitUI, 'ClerkKitUI');
const podKitAdded = target.packageProductDependencies.some(dep => dep.value === productUuidKit);
if (!podKitAdded) {
target.packageProductDependencies.push({
value: productUuidKit,
comment: 'ClerkKit',
});
}

const podKitUIAdded = target.packageProductDependencies.some(dep => dep.value === productUuidKitUI);
if (!podKitUIAdded) {
target.packageProductDependencies.push({
value: productUuidKitUI,
comment: 'ClerkKitUI',
});
}

console.log(`✅ Added ClerkKit and ClerkKitUI packages to ClerkExpo pod target`);
}
Expand DownExpand Up@@ -762,13 +716,4 @@ const withClerkExpo = (config, props = {}) => {
};

module.exports = withClerkExpo;
module.exports._testing = {
validateThemeJson,
isPlainObject,
VALID_COLOR_KEYS,
HEX_COLOR_REGEX,
CLERK_IOS_VERSION,
CLERK_IOS_REQUIREMENT,
findOrCreateClerkIOSPackageReference,
findOrCreateSwiftPackageProductDependency,
};
module.exports._testing = { validateThemeJson, isPlainObject, VALID_COLOR_KEYS, HEX_COLOR_REGEX };
132 changes: 0 additions & 132 deletions packages/expo/src/__tests__/appPlugin.ios.test.js

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Revert "fix(expo): pin clerk-ios and dedupe Expo SPM refs" by wobsoriano · Pull Request #8692 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .changeset/fresh-clocks-pay.md

This file was deleted.

2 changes: 2 additions & 0 deletions .changeset/huge-moments-poke.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
191 changes: 68 additions & 123 deletions packages/expo/app.plugin.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,114 +20,10 @@ const path = require('path');
const fs = require('fs');

const CLERK_IOS_REPO = 'https://github.com/clerk/clerk-ios.git';
const CLERK_IOS_VERSION = '1.1.3';
const CLERK_IOS_REQUIREMENT = {
kind: 'exactVersion',
version: CLERK_IOS_VERSION,
};
const CLERK_IOS_VERSION = '1.0.0';

const CLERK_MIN_IOS_VERSION = '17.0';

const normalizeRepositoryURL = repositoryURL => String(repositoryURL || '').replace(/^"|"$/g, '');

const isClerkIOSPackageReference = ref => normalizeRepositoryURL(ref?.repositoryURL) === CLERK_IOS_REPO;

const removeObjectReference = (list, uuid) => {
if (!Array.isArray(list)) {
return;
}

for (let index = list.length - 1; index >= 0; index--) {
if (list[index]?.value === uuid) {
list.splice(index, 1);
}
}
};

const removeSwiftPackageProductDependencies = (xcodeProject, packageUuids) => {
const productDependencies = xcodeProject.hash.project.objects.XCSwiftPackageProductDependency || {};
const packageUuidSet = new Set(packageUuids);

for (const [productUuid, dependency] of Object.entries(productDependencies)) {
if (!packageUuidSet.has(dependency?.package)) {
continue;
}

delete productDependencies[productUuid];

const targets = xcodeProject.hash.project.objects.PBXNativeTarget || {};
for (const target of Object.values(targets)) {
removeObjectReference(target?.packageProductDependencies, productUuid);
}
}
};

const removeSwiftPackageReferences = (xcodeProject, packageUuids) => {
const packageReferences = xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference || {};

for (const packageUuid of packageUuids) {
delete packageReferences[packageUuid];
}

const projects = xcodeProject.hash.project.objects.PBXProject || {};
for (const project of Object.values(projects)) {
for (const packageUuid of packageUuids) {
removeObjectReference(project?.packageReferences, packageUuid);
}
}

removeSwiftPackageProductDependencies(xcodeProject, packageUuids);
};

const findOrCreateClerkIOSPackageReference = xcodeProject => {
const packageReferences = xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference;
const existingEntries = Object.entries(packageReferences).filter(([, ref]) => isClerkIOSPackageReference(ref));

if (existingEntries.length > 0) {
const [uuid, ref] = existingEntries[0];
ref.repositoryURL = CLERK_IOS_REPO;
ref.requirement = { ...CLERK_IOS_REQUIREMENT };

const duplicateUuids = existingEntries.slice(1).map(([duplicateUuid]) => duplicateUuid);
removeSwiftPackageReferences(xcodeProject, duplicateUuids);

return uuid;
}

const packageUuid = xcodeProject.generateUuid();
packageReferences[packageUuid] = {
isa: 'XCRemoteSwiftPackageReference',
repositoryURL: CLERK_IOS_REPO,
requirement: { ...CLERK_IOS_REQUIREMENT },
};
return packageUuid;
};

const findOrCreateSwiftPackageProductDependency = (xcodeProject, packageUuid, productName) => {
const productDependencies = xcodeProject.hash.project.objects.XCSwiftPackageProductDependency;
const existingEntry = Object.entries(productDependencies).find(
([, dep]) => dep?.package === packageUuid && dep?.productName === productName,
);

if (existingEntry) {
return existingEntry[0];
}

const productUuid = xcodeProject.generateUuid();
productDependencies[productUuid] = {
isa: 'XCSwiftPackageProductDependency',
package: packageUuid,
productName,
};
return productUuid;
};

const addObjectReference = (list, uuid, comment) => {
if (!list.some(ref => ref.value === uuid)) {
list.push({ value: uuid, comment });
}
};

const withClerkIOS = config => {
console.log('✅ Clerk iOS plugin loaded');

Expand DownExpand Up@@ -201,21 +97,42 @@ const withClerkIOS = config => {
const targetUuid = targets.uuid;
const targetName = targets.name;

// Add Swift Package reference to the project
const packageUuid = xcodeProject.generateUuid();
const packageName = 'clerk-ios';

// Add package reference to XCRemoteSwiftPackageReference section
if (!xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference) {
xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference = {};
}

const packageUuid = findOrCreateClerkIOSPackageReference(xcodeProject);
xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference[packageUuid] = {
isa: 'XCRemoteSwiftPackageReference',
repositoryURL: CLERK_IOS_REPO,
requirement: {
kind: 'exactVersion',
version: CLERK_IOS_VERSION,
},
};

// Add package product dependencies (ClerkKit + ClerkKitUI)
const productUuidKit = xcodeProject.generateUuid();
const productUuidKitUI = xcodeProject.generateUuid();
if (!xcodeProject.hash.project.objects.XCSwiftPackageProductDependency) {
xcodeProject.hash.project.objects.XCSwiftPackageProductDependency = {};
}

const productUuidKit = findOrCreateSwiftPackageProductDependency(xcodeProject, packageUuid, 'ClerkKit');
const productUuidKitUI = findOrCreateSwiftPackageProductDependency(xcodeProject, packageUuid, 'ClerkKitUI');
xcodeProject.hash.project.objects.XCSwiftPackageProductDependency[productUuidKit] = {
isa: 'XCSwiftPackageProductDependency',
package: packageUuid,
productName: 'ClerkKit',
};

xcodeProject.hash.project.objects.XCSwiftPackageProductDependency[productUuidKitUI] = {
isa: 'XCSwiftPackageProductDependency',
package: packageUuid,
productName: 'ClerkKitUI',
};

// Add package to project's package references
const projectSection = xcodeProject.hash.project.objects.PBXProject;
Expand All@@ -226,16 +143,40 @@ const withClerkIOS = config => {
project.packageReferences = [];
}

addObjectReference(project.packageReferences, packageUuid, packageName);
// Check if package is already added
const alreadyAdded = project.packageReferences.some(ref => {
const refObj = xcodeProject.hash.project.objects.XCRemoteSwiftPackageReference[ref.value];
return refObj && refObj.repositoryURL === CLERK_IOS_REPO;
});

if (!alreadyAdded) {
project.packageReferences.push({
value: packageUuid,
comment: packageName,
});
}

// Add package products to main app target
const nativeTarget = xcodeProject.hash.project.objects.PBXNativeTarget[targetUuid];
if (!nativeTarget.packageProductDependencies) {
nativeTarget.packageProductDependencies = [];
}

addObjectReference(nativeTarget.packageProductDependencies, productUuidKit, 'ClerkKit');
addObjectReference(nativeTarget.packageProductDependencies, productUuidKitUI, 'ClerkKitUI');
const kitAlreadyAdded = nativeTarget.packageProductDependencies.some(dep => dep.value === productUuidKit);
if (!kitAlreadyAdded) {
nativeTarget.packageProductDependencies.push({
value: productUuidKit,
comment: 'ClerkKit',
});
}

const kitUIAlreadyAdded = nativeTarget.packageProductDependencies.some(dep => dep.value === productUuidKitUI);
if (!kitUIAlreadyAdded) {
nativeTarget.packageProductDependencies.push({
value: productUuidKitUI,
comment: 'ClerkKitUI',
});
}

// Also add packages to ClerkExpo pod target if it exists
const allTargets = xcodeProject.hash.project.objects.PBXNativeTarget;
Expand All@@ -245,8 +186,21 @@ const withClerkIOS = config => {
target.packageProductDependencies = [];
}

addObjectReference(target.packageProductDependencies, productUuidKit, 'ClerkKit');
addObjectReference(target.packageProductDependencies, productUuidKitUI, 'ClerkKitUI');
const podKitAdded = target.packageProductDependencies.some(dep => dep.value === productUuidKit);
if (!podKitAdded) {
target.packageProductDependencies.push({
value: productUuidKit,
comment: 'ClerkKit',
});
}

const podKitUIAdded = target.packageProductDependencies.some(dep => dep.value === productUuidKitUI);
if (!podKitUIAdded) {
target.packageProductDependencies.push({
value: productUuidKitUI,
comment: 'ClerkKitUI',
});
}

console.log(`✅ Added ClerkKit and ClerkKitUI packages to ClerkExpo pod target`);
}
Expand DownExpand Up@@ -762,13 +716,4 @@ const withClerkExpo = (config, props = {}) => {
};

module.exports = withClerkExpo;
module.exports._testing = {
validateThemeJson,
isPlainObject,
VALID_COLOR_KEYS,
HEX_COLOR_REGEX,
CLERK_IOS_VERSION,
CLERK_IOS_REQUIREMENT,
findOrCreateClerkIOSPackageReference,
findOrCreateSwiftPackageProductDependency,
};
module.exports._testing = { validateThemeJson, isPlainObject, VALID_COLOR_KEYS, HEX_COLOR_REGEX };
132 changes: 0 additions & 132 deletions packages/expo/src/__tests__/appPlugin.ios.test.js

This file was deleted.

Loading