Skip to content

Commit da39d8e

Browse files
danielbariongabrieljablonski
authored andcommitted
ci: refactor beta-release.json to use import instead of require
1 parent 20bdb8c commit da39d8e

File tree

2 files changed

+22
-15
lines changed

2 files changed

+22
-15
lines changed

beta-release.js

+12-8
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
1-
/* eslint-disable @typescript-eslint/no-var-requires */
2-
const util = require('util')
3-
const exec = util.promisify(require('child_process').exec)
4-
const packageJson = require('./package.json')
1+
import util from 'util'
2+
import { exec as execCallback } from 'child_process'
3+
import minimist from 'minimist'
4+
import pkg from './package.json' assert { type: 'json' }
55

6-
const args = require('minimist')(process.argv.slice(2))
6+
const exec = util.promisify(execCallback)
7+
8+
const args = minimist(process.argv.slice(2))
9+
10+
console.log({ args })
711

812
const issueNumber = args['issue']
913

10-
console.log(issueNumber)
14+
console.log({ issueNumber })
1115

1216
const runCommand = async (command) => {
1317
return new Promise((resolve) => {
@@ -26,7 +30,7 @@ const AutoBetaRelease = async () => {
2630

2731
// check if there is a beta release with the same issue number on published versions
2832
const arrayOfBetaReleases = JSON.parse(stdout).filter((version) =>
29-
version.includes(`${packageJson.version}-beta.${issueNumber}`),
33+
version.includes(`${pkg.version}-beta.${issueNumber}`),
3034
)
3135

3236
let fullLastBetaRelease = null
@@ -56,7 +60,7 @@ const AutoBetaRelease = async () => {
5660
}
5761

5862
// next beta release version. Output: 1.0.0-beta.1.rc.1
59-
const nextBetaReleaseVesionFull = `${packageJson.version}-beta.${issueNumber}.rc.${nextBetaReleaseVersion}`
63+
const nextBetaReleaseVesionFull = `${pkg.version}-beta.${issueNumber}.rc.${nextBetaReleaseVersion}`
6064

6165
// update the beta version on packageJson.json
6266
const { error } = await runCommand(

src/components/TooltipController/TooltipController.tsx

+10-7
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,16 @@ const TooltipController = React.forwardRef<TooltipRefProps, ITooltipController>(
7070
const styleInjectionRef = useRef(disableStyleInjection)
7171

7272
const getDataAttributesFromAnchorElement = (elementReference: HTMLElement) => {
73-
const dataAttributes = elementReference?.getAttributeNames().reduce((acc, name) => {
74-
if (name.startsWith('data-tooltip-')) {
75-
const parsedAttribute = name.replace(/^data-tooltip-/, '') as DataAttribute
76-
acc[parsedAttribute] = elementReference?.getAttribute(name) ?? null
77-
}
78-
return acc
79-
}, {} as Record<DataAttribute, string | null>)
73+
const dataAttributes = elementReference?.getAttributeNames().reduce(
74+
(acc, name) => {
75+
if (name.startsWith('data-tooltip-')) {
76+
const parsedAttribute = name.replace(/^data-tooltip-/, '') as DataAttribute
77+
acc[parsedAttribute] = elementReference?.getAttribute(name) ?? null
78+
}
79+
return acc
80+
},
81+
{} as Record<DataAttribute, string | null>,
82+
)
8083

8184
return dataAttributes
8285
}

0 commit comments

Comments
 (0)