diff --git a/.eslintrc b/.eslintrc new file mode 100644 index 0000000000..2c3c080c74 --- /dev/null +++ b/.eslintrc @@ -0,0 +1,7 @@ +{ + "root": true, + "parserOptions": { + "ecmaVersion": "latest", + "sourceType": "module" + } +} diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index e351352491..0000000000 --- a/.eslintrc.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = { - root: true, -}; diff --git a/.husky/pre-commit b/.husky/pre-commit index f5a7b77e55..7f352ec37a 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,5 +1,5 @@ #!/usr/bin/env sh . "$(dirname -- "$0")/_/husky.sh" -npm run lint-staged npm run versions:metadata +npm run lint-staged diff --git a/.prettierignore b/.prettierignore index 8809e67434..4dfbf49728 100644 --- a/.prettierignore +++ b/.prettierignore @@ -5,4 +5,3 @@ coverage *.yaml .yarn packages/app/src/build-metadata.json -scripts/update-backstage.mjs diff --git a/packages/app/src/build-metadata.json b/packages/app/src/build-metadata.json index ae87f8f50b..6c284dba9b 100644 --- a/packages/app/src/build-metadata.json +++ b/packages/app/src/build-metadata.json @@ -3,6 +3,6 @@ "card": [ "RHDH Version: 1.2.0", "Backstage Version: 1.25.2", - "Last Commit: 2024-05-03T14:19:20Z" + "Last Commit: 2024-05-06T13:23:08Z" ] } \ No newline at end of file diff --git a/scripts/update-backstage.mjs b/scripts/update-backstage.mjs index 0c6765c5f2..9ab6363800 100644 --- a/scripts/update-backstage.mjs +++ b/scripts/update-backstage.mjs @@ -1,11 +1,10 @@ -/* eslint-disable */ import glob from 'glob'; import { execSync } from 'node:child_process'; import { existsSync, readFileSync, readdirSync, writeFileSync } from 'node:fs'; import { dirname, join } from 'node:path'; import { fileURLToPath } from 'node:url'; import semver from 'semver'; -import { updateBuildMetadata } from './update-metadata.mjs' +import { updateBuildMetadata } from './update-metadata.mjs'; const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename); diff --git a/scripts/update-metadata.mjs b/scripts/update-metadata.mjs index 4179a17ca4..7195381184 100644 --- a/scripts/update-metadata.mjs +++ b/scripts/update-metadata.mjs @@ -1,5 +1,3 @@ -/* eslint-disable */ -import { execSync } from 'node:child_process'; import { readFileSync, writeFileSync } from 'node:fs'; import { dirname, join } from 'node:path'; import { fileURLToPath } from 'node:url'; @@ -28,8 +26,8 @@ export function updateBuildMetadata(backstageVersion) { readFileSync('package.json', 'utf8'), ).version.toString(); - const commitTime = new Date().toISOString() // 2024-05-03T12:12:08.174Z - + const commitTime = new Date().toISOString().slice(0, -5) + 'Z'; // eg., 2024-05-03T12:12:08Z + const card = [ `RHDH Version: ${rhdhVersion}`, `Backstage Version: ${backstageVersion}`,