diff --git a/app/extensions.js b/app/extensions.js index 59e61707a75..bf4d1c3a224 100644 --- a/app/extensions.js +++ b/app/extensions.js @@ -4,7 +4,7 @@ const extensionActions = require('./common/actions/extensionActions') const config = require('../js/constants/config') const appConfig = require('../js/constants/appConfig') const {fileUrl} = require('../js/lib/appUrlUtil') -const {getExtensionsPath, getBraveExtUrl, getBraveExtIndexHTML} = require('../js/lib/appUrlUtil') +const {getComponentExtensionsPath, getExtensionsPath, getBraveExtUrl, getBraveExtIndexHTML} = require('../js/lib/appUrlUtil') const {getSetting} = require('../js/settings') const settings = require('../js/constants/settings') const extensionStates = require('../js/constants/extensionStates') @@ -527,7 +527,7 @@ module.exports.init = () => { loadExtension(config.braveExtensionId, getExtensionsPath('brave'), generateBraveManifest(), 'component') // Cryptotoken extension is loaded from electron_resources.pak extensionInfo.setState(config.cryptoTokenExtensionId, extensionStates.REGISTERED) - loadExtension(config.cryptoTokenExtensionId, path.join(process.resourcesPath, 'cryptotoken'), {}, 'component') + loadExtension(config.cryptoTokenExtensionId, getComponentExtensionsPath('cryptotoken'), {}, 'component') extensionInfo.setState(config.syncExtensionId, extensionStates.REGISTERED) loadExtension(config.syncExtensionId, getExtensionsPath('brave'), generateSyncManifest(), 'unpacked') diff --git a/js/lib/appUrlUtil.js b/js/lib/appUrlUtil.js index 6ddbcdcc1fe..599ab1356b2 100644 --- a/js/lib/appUrlUtil.js +++ b/js/lib/appUrlUtil.js @@ -6,6 +6,7 @@ const Immutable = require('immutable') const path = require('path') const UrlUtil = require('./urlutil') const config = require('../constants/config') +const isDarwin = require('../../app/common/lib/platformUtil').isDarwin() module.exports.fileUrl = (filePath) => { // It's preferrable to call path.resolve but it's not available @@ -62,6 +63,14 @@ module.exports.getExtensionsPath = function (extensionDir) { : path.join(__dirname, '..', '..', 'app', 'extensions', extensionDir) } +module.exports.getComponentExtensionsPath = function (extensionDir) { + if (isDarwin) { + return path.join(process.resourcesPath, '../Frameworks/Brave Framework.framework/Resources/', extensionDir) + } else { + return path.join(process.resourcesPath, extensionDir) + } +} + module.exports.getGenDir = function (url) { const genDirRoots = [ module.exports.getBraveIndexPath,