Skip to content

Commit

Permalink
Fix trailing commas in various config files
Browse files Browse the repository at this point in the history
  • Loading branch information
roryabraham committed Dec 29, 2020
1 parent 957815e commit bd776ba
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 17 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ module.exports = {
'.native.js',
'.ios.js',
'.android.js',
'.config.js',
],
},
},
Expand Down
4 changes: 2 additions & 2 deletions babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ const webpack = {
development: {
presets: defaultPresets,
plugins: defaultPlugins,
}
}
},
},
};

const metro = {
Expand Down
6 changes: 3 additions & 3 deletions config/electron.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ module.exports = {
hardenedRuntime: true,
entitlements: 'desktop/entitlements.mac.plist',
entitlementsInherit: 'desktop/entitlements.mac.plist',
type: 'distribution'
type: 'distribution',
},
dmg: {
title: 'Expensify.cash',
artifactName: 'Expensify.cash.dmg',
internetEnabled: true
internetEnabled: true,
},
publish: [{
provider: 's3',
bucket: 'chat-test-expensify-com',
channel: 'latest'
channel: 'latest',
}],
files: [
'./dist/**/*',
Expand Down
4 changes: 2 additions & 2 deletions config/webpack/webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ module.exports = {
exclude: [
// eslint-disable-next-line max-len
/node_modules\/(?!(react-native-webview|react-native-onyx)\/).*|\.native\.js$/,
platformExclude
platformExclude,
],
},
{
test: /\.js$/,
loader: 'eslint-loader',
exclude: [
/node_modules|\.native\.js$/,
platformExclude
platformExclude,
],
options: {
cache: false,
Expand Down
2 changes: 1 addition & 1 deletion config/webpack/webpack.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ module.exports = (parameters = {}) => {
// See https://reactnative.dev/docs/javascript-environment
__DEV__: true,
}),
]
],
});
};
2 changes: 1 addition & 1 deletion config/webpack/webpack.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ module.exports = merge(common, {
// react-native-render-html uses variable to log exclusively during development.
// See https://reactnative.dev/docs/javascript-environment
__DEV__: false,
})
}),
],
});
12 changes: 6 additions & 6 deletions desktop/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const {
Menu,
MenuItem,
shell,
ipcMain
ipcMain,
} = require('electron');
const serve = require('electron-serve');
const contextMenu = require('electron-context-menu');
Expand Down Expand Up @@ -58,14 +58,14 @@ const mainWindow = (() => {
role: 'back',
label: 'Back',
accelerator: process.platform === 'darwin' ? 'Cmd+[' : 'Shift+[',
click: () => { browserWindow.webContents.goBack(); }
click: () => { browserWindow.webContents.goBack(); },
},
{
role: 'forward',
label: 'Forward',
accelerator: process.platform === 'darwin' ? 'Cmd+]' : 'Shift+]',
click: () => { browserWindow.webContents.goForward(); }
}]
click: () => { browserWindow.webContents.goForward(); },
}],
}));

// On mac, pressing cmd++ actually sends a cmd+=. cmd++ is generally the zoom in shortcut, but this is
Expand All @@ -74,14 +74,14 @@ const mainWindow = (() => {
viewWindow.submenu.append(new MenuItem({
role: 'zoomin',
accelerator: 'CommandOrControl+=',
visible: false
visible: false,
}));
const windowMenu = systemMenu.items.find(item => item.role === 'windowmenu');
windowMenu.submenu.append(new MenuItem({type: 'separator'}));
windowMenu.submenu.append(new MenuItem({
label: 'Expensify.cash',
accelerator: 'CmdOrCtrl+1',
click: () => browserWindow.show()
click: () => browserWindow.show(),
}));
Menu.setApplicationMenu(systemMenu);

Expand Down
4 changes: 2 additions & 2 deletions detox.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ module.exports = {
build: 'xcodebuild -workspace ios/ExpensifyCash.xcworkspace -scheme ExpensifyCash -configuration '
+ 'Debug -sdk iphonesimulator -derivedDataPath ios/build | xcpretty',
type: 'ios.simulator',
name: 'iPhone 11'
name: 'iPhone 11',
},
'ios.sim.release': {
binaryPath: 'ios/build/Build/Products/Release-iphonesimulator/expensify.cash.app',
build: 'xcodebuild -workspace ios/ExpensifyCash.xcworkspace -scheme ExpensifyCash -configuration '
+ 'Release -sdk iphonesimulator -derivedDataPath ios/build | xcpretty',
type: 'ios.simulator',
name: 'iPhone 11'
name: 'iPhone 11',
},
},
};

0 comments on commit bd776ba

Please sign in to comment.