Skip to content

Commit

Permalink
Migrate from CommonJS to ESM (#6651)
Browse files Browse the repository at this point in the history
  • Loading branch information
PyvesB committed Jul 9, 2021
1 parent 23678fe commit 23c0406
Show file tree
Hide file tree
Showing 1,130 changed files with 4,458 additions and 6,712 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ jobs:

e2e:
docker:
- image: cypress/base:14
- image: cypress/base:14.16.0
steps:
- checkout

Expand Down
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
/build
/coverage
/__snapshots__
/public
public
badge-maker/node_modules/
!.github/
1 change: 0 additions & 1 deletion .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ rules:
# Shields additions.
no-var: 'error'
prefer-const: 'error'
strict: 'error'
arrow-body-style: ['error', 'as-needed']
no-extension-in-require/main: 'error'
object-shorthand: ['error', 'properties']
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@ service-definitions.yml
!/config/local*.template.yml

# Gatsby
/.cache
/frontend/.cache
/frontend/public
/public

# Cypress
Expand Down
1 change: 0 additions & 1 deletion .mocharc-frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ require:
- '@babel/polyfill'
- '@babel/register'
- mocha-yaml-loader
- frontend/mocha-ignore-pngs
4 changes: 2 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ package.json
package-lock.json
/__snapshots__
/.next
/.cache
.cache
/api-docs
/build
/public
public
/coverage
private/*.json
/.nyc_output
Expand Down
15 changes: 7 additions & 8 deletions core/badge-urls/make-badge-url.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
'use strict'

const { URL } = require('url')
const queryString = require('query-string')
const { compile } = require('path-to-regexp')
// Avoid "Attempted import error: 'URL' is not exported from 'url'" in frontend.
import url from 'url'
import queryString from 'query-string'
import { compile } from 'path-to-regexp'

function badgeUrlFromPath({
baseUrl = '',
Expand Down Expand Up @@ -147,13 +146,13 @@ function dynamicBadgeUrl({
function rasterRedirectUrl({ rasterUrl }, badgeUrl) {
// Ensure we're always using the `rasterUrl` by using just the path from
// the request URL.
const { pathname, search } = new URL(badgeUrl, 'https://bogus.test')
const result = new URL(pathname, rasterUrl)
const { pathname, search } = new url.URL(badgeUrl, 'https://bogus.test')
const result = new url.URL(pathname, rasterUrl)
result.search = search
return result
}

module.exports = {
export {
badgeUrlFromPath,
badgeUrlFromPattern,
encodeField,
Expand Down
8 changes: 3 additions & 5 deletions core/badge-urls/make-badge-url.spec.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
'use strict'

const { test, given } = require('sazerac')
const {
import { test, given } from 'sazerac'
import {
badgeUrlFromPath,
badgeUrlFromPattern,
encodeField,
staticBadgeUrl,
queryStringStaticBadgeUrl,
dynamicBadgeUrl,
} = require('./make-badge-url')
} from './make-badge-url.js'

describe('Badge URL generation functions', function () {
test(badgeUrlFromPath, () => {
Expand Down
6 changes: 1 addition & 5 deletions core/badge-urls/path-helpers.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict'

// Escapes `t` using the format specified in
// <https://github.com/espadrine/gh-badges/issues/12#issuecomment-31518129>
function escapeFormat(t) {
Expand All @@ -13,6 +11,4 @@ function escapeFormat(t) {
)
}

module.exports = {
escapeFormat,
}
export { escapeFormat }
6 changes: 2 additions & 4 deletions core/badge-urls/path-helpers.spec.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
'use strict'

const { test, given } = require('sazerac')
const { escapeFormat } = require('./path-helpers')
import { test, given } from 'sazerac'
import { escapeFormat } from './path-helpers.js'

describe('Badge URL helper functions', function () {
test(escapeFormat, () => {
Expand Down
8 changes: 3 additions & 5 deletions core/base-service/auth-helper.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
'use strict'

const { URL } = require('url')
const { InvalidParameter } = require('./errors')
import { URL } from 'url'
import { InvalidParameter } from './errors.js'

class AuthHelper {
constructor(
Expand Down Expand Up @@ -207,4 +205,4 @@ class AuthHelper {
}
}

module.exports = { AuthHelper }
export { AuthHelper }
10 changes: 4 additions & 6 deletions core/base-service/auth-helper.spec.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
'use strict'

const { expect } = require('chai')
const { test, given, forCases } = require('sazerac')
const { AuthHelper } = require('./auth-helper')
const { InvalidParameter } = require('./errors')
import { expect } from 'chai'
import { test, given, forCases } from 'sazerac'
import { AuthHelper } from './auth-helper.js'
import { InvalidParameter } from './errors.js'

describe('AuthHelper', function () {
describe('constructor checks', function () {
Expand Down
12 changes: 5 additions & 7 deletions core/base-service/base-graphql.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@
* @module
*/

'use strict'

const { print } = require('graphql/language/printer')
const BaseService = require('./base')
const { InvalidResponse, ShieldsRuntimeError } = require('./errors')
const { parseJson } = require('./json')
import { print } from 'graphql/language/printer.js'
import BaseService from './base.js'
import { InvalidResponse, ShieldsRuntimeError } from './errors.js'
import { parseJson } from './json.js'

function defaultTransformErrors(errors) {
return new InvalidResponse({ prettyMessage: errors[0].message })
Expand Down Expand Up @@ -93,4 +91,4 @@ class BaseGraphqlService extends BaseService {
}
}

module.exports = BaseGraphqlService
export default BaseGraphqlService
14 changes: 6 additions & 8 deletions core/base-service/base-graphql.spec.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
'use strict'

const Joi = require('joi')
const { expect } = require('chai')
const gql = require('graphql-tag')
const sinon = require('sinon')
const BaseGraphqlService = require('./base-graphql')
const { InvalidResponse } = require('./errors')
import Joi from 'joi'
import { expect } from 'chai'
import gql from 'graphql-tag'
import sinon from 'sinon'
import BaseGraphqlService from './base-graphql.js'
import { InvalidResponse } from './errors.js'

const dummySchema = Joi.object({
requiredString: Joi.string().required(),
Expand Down
8 changes: 3 additions & 5 deletions core/base-service/base-json.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@
* @module
*/

'use strict'

const BaseService = require('./base')
const { parseJson } = require('./json')
import BaseService from './base.js'
import { parseJson } from './json.js'

/**
* Services which query a JSON endpoint should extend BaseJsonService
Expand Down Expand Up @@ -54,4 +52,4 @@ class BaseJsonService extends BaseService {
}
}

module.exports = BaseJsonService
export default BaseJsonService
10 changes: 4 additions & 6 deletions core/base-service/base-json.spec.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
'use strict'

const Joi = require('joi')
const { expect } = require('chai')
const sinon = require('sinon')
const BaseJsonService = require('./base-json')
import Joi from 'joi'
import { expect } from 'chai'
import sinon from 'sinon'
import BaseJsonService from './base-json.js'

const dummySchema = Joi.object({
requiredString: Joi.string().required(),
Expand Down
20 changes: 9 additions & 11 deletions core/base-service/base-static.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
'use strict'

const makeBadge = require('../../badge-maker/lib/make-badge')
const BaseService = require('./base')
const {
import makeBadge from '../../badge-maker/lib/make-badge.js'
import BaseService from './base.js'
import {
serverHasBeenUpSinceResourceCached,
setCacheHeadersForStaticResource,
} = require('./cache-headers')
const { makeSend } = require('./legacy-result-sender')
const { MetricHelper } = require('./metric-helper')
const coalesceBadge = require('./coalesce-badge')
const { prepareRoute, namedParamsForMatch } = require('./route')
} from './cache-headers.js'
import { makeSend } from './legacy-result-sender.js'
import { MetricHelper } from './metric-helper.js'
import coalesceBadge from './coalesce-badge.js'
import { prepareRoute, namedParamsForMatch } from './route.js'

module.exports = class BaseStaticService extends BaseService {
export default class BaseStaticService extends BaseService {
static register({ camp, metricInstance }, serviceConfig) {
const { regex, captureNames } = prepareRoute(this.route)

Expand Down
12 changes: 5 additions & 7 deletions core/base-service/base-svg-scraping.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
* @module
*/

'use strict'

// See available emoji at http://emoji.muan.co/
const emojic = require('emojic')
const BaseService = require('./base')
const trace = require('./trace')
const { InvalidResponse } = require('./errors')
import emojic from 'emojic'
import BaseService from './base.js'
import trace from './trace.js'
import { InvalidResponse } from './errors.js'

const defaultValueMatcher = />([^<>]+)<\/text><\/g>/
const leadingWhitespace = /(?:\r\n\s*|\r\s*|\n\s*)/g
Expand Down Expand Up @@ -90,4 +88,4 @@ class BaseSvgScrapingService extends BaseService {
}
}

module.exports = BaseSvgScrapingService
export default BaseSvgScrapingService
12 changes: 5 additions & 7 deletions core/base-service/base-svg-scraping.spec.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
'use strict'

const { expect } = require('chai')
const sinon = require('sinon')
const Joi = require('joi')
const makeBadge = require('../../badge-maker/lib/make-badge')
const BaseSvgScrapingService = require('./base-svg-scraping')
import { expect } from 'chai'
import sinon from 'sinon'
import Joi from 'joi'
import makeBadge from '../../badge-maker/lib/make-badge.js'
import BaseSvgScrapingService from './base-svg-scraping.js'

const schema = Joi.object({
message: Joi.string().required(),
Expand Down
14 changes: 6 additions & 8 deletions core/base-service/base-xml.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@
* @module
*/

'use strict'

// See available emoji at http://emoji.muan.co/
const emojic = require('emojic')
const fastXmlParser = require('fast-xml-parser')
const BaseService = require('./base')
const trace = require('./trace')
const { InvalidResponse } = require('./errors')
import emojic from 'emojic'
import fastXmlParser from 'fast-xml-parser'
import BaseService from './base.js'
import trace from './trace.js'
import { InvalidResponse } from './errors.js'

/**
* Services which query a XML endpoint should extend BaseXmlService
Expand Down Expand Up @@ -68,4 +66,4 @@ class BaseXmlService extends BaseService {
}
}

module.exports = BaseXmlService
export default BaseXmlService
10 changes: 4 additions & 6 deletions core/base-service/base-xml.spec.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
'use strict'

const Joi = require('joi')
const { expect } = require('chai')
const sinon = require('sinon')
const BaseXmlService = require('./base-xml')
import Joi from 'joi'
import { expect } from 'chai'
import sinon from 'sinon'
import BaseXmlService from './base-xml.js'

const dummySchema = Joi.object({
requiredString: Joi.string().required(),
Expand Down
14 changes: 6 additions & 8 deletions core/base-service/base-yaml.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
* @module
*/

'use strict'

const emojic = require('emojic')
const yaml = require('js-yaml')
const BaseService = require('./base')
const { InvalidResponse } = require('./errors')
const trace = require('./trace')
import emojic from 'emojic'
import yaml from 'js-yaml'
import BaseService from './base.js'
import { InvalidResponse } from './errors.js'
import trace from './trace.js'

/**
* Services which query a YAML endpoint should extend BaseYamlService
Expand Down Expand Up @@ -72,4 +70,4 @@ class BaseYamlService extends BaseService {
}
}

module.exports = BaseYamlService
export default BaseYamlService
10 changes: 4 additions & 6 deletions core/base-service/base-yaml.spec.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
'use strict'

const Joi = require('joi')
const { expect } = require('chai')
const sinon = require('sinon')
const BaseYamlService = require('./base-yaml')
import Joi from 'joi'
import { expect } from 'chai'
import sinon from 'sinon'
import BaseYamlService from './base-yaml.js'

const dummySchema = Joi.object({
requiredString: Joi.string().required(),
Expand Down
Loading

0 comments on commit 23c0406

Please sign in to comment.