Skip to content

Commit 8da2063

Browse files
authored
Merge pull request #980 from repository-settings/esm-again
Reapply "Revert "ESM support (#569)" (#587)"
2 parents 2d36c8c + 220c602 commit 8da2063

31 files changed

+527
-49
lines changed
File renamed without changes.

index.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
const mergeArrayByName = require('./lib/mergeArrayByName')
1+
import mergeArrayByName from './lib/mergeArrayByName.js'
2+
import SettingsApp from './lib/settings.js'
23

34
/**
45
* @param {import('probot').Probot} robot
56
*/
6-
module.exports = (robot, _, Settings = require('./lib/settings')) => {
7+
export default (robot, _, Settings = SettingsApp) => {
78
async function syncSettings (context, repo = context.repo()) {
89
const config = await context.config('settings.yml', {}, { arrayMerge: mergeArrayByName })
910
return Settings.sync(context.octokit, repo, config)

lib/mergeArrayByName.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// https://github.com/KyleAMathews/deepmerge#arraymerge
22

3-
const merge = require('deepmerge')
3+
import merge from 'deepmerge'
44

55
function findMatchingIndex (sourceItem, target) {
66
if (Object.prototype.hasOwnProperty.call(sourceItem, 'name')) {
@@ -10,7 +10,7 @@ function findMatchingIndex (sourceItem, target) {
1010
}
1111
}
1212

13-
function mergeByName (target, source, options) {
13+
export default function mergeByName (target, source, options) {
1414
const destination = target.slice()
1515

1616
source.forEach(sourceItem => {
@@ -24,5 +24,3 @@ function mergeByName (target, source, options) {
2424

2525
return destination
2626
}
27-
28-
module.exports = mergeByName

lib/plugins/branches.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const previewHeaders = {
33
'application/vnd.github.hellcat-preview+json,application/vnd.github.luke-cage-preview+json,application/vnd.github.zzzax-preview+json'
44
}
55

6-
module.exports = class Branches {
6+
export default class Branches {
77
constructor (github, repo, settings) {
88
this.github = github
99
this.repo = repo

lib/plugins/collaborators.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
const Diffable = require('./diffable')
1+
import Diffable from './diffable.js'
22

3-
module.exports = class Collaborators extends Diffable {
3+
export default class Collaborators extends Diffable {
44
constructor (...args) {
55
super(...args)
66

lib/plugins/diffable.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
// remove(existing) {
2020
// }
2121
// }
22-
module.exports = class Diffable {
22+
export default class Diffable {
2323
constructor (github, repo, entries) {
2424
this.github = github
2525
this.repo = repo

lib/plugins/environments.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const Diffable = require('./diffable')
1+
import Diffable from './diffable.js'
22

33
const environmentRepoEndpoint = '/repos/:org/:repo/environments/:environment_name'
44

@@ -60,7 +60,7 @@ function deploymentBranchPolicyHasChanged (existing, attrs) {
6060
)
6161
}
6262

63-
module.exports = class Environments extends Diffable {
63+
export default class Environments extends Diffable {
6464
constructor (...args) {
6565
super(...args)
6666

lib/plugins/labels.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
const Diffable = require('./diffable')
1+
import Diffable from './diffable.js'
22
const previewHeaders = { accept: 'application/vnd.github.symmetra-preview+json' }
33

4-
module.exports = class Labels extends Diffable {
4+
export default class Labels extends Diffable {
55
constructor (...args) {
66
super(...args)
77

lib/plugins/milestones.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
const Diffable = require('./diffable')
1+
import Diffable from './diffable.js'
22

3-
module.exports = class Milestones extends Diffable {
3+
export default class Milestones extends Diffable {
44
constructor (...args) {
55
super(...args)
66

lib/plugins/repository.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const enableVulnerabilityAlerts = ({ github, settings, enabled }) => {
3232
return github.repos[methodName](args)
3333
}
3434

35-
module.exports = class Repository {
35+
export default class Repository {
3636
constructor (github, repo, settings) {
3737
this.github = github
3838
this.settings = Object.assign({ mediaType: { previews: ['baptiste'] } }, settings, repo)

0 commit comments

Comments
 (0)