Skip to content

Commit 289c855

Browse files
authored
fix(e2e-version): repair broken minified bundle (#251)
1 parent 8a42624 commit 289c855

7 files changed

Lines changed: 51 additions & 226 deletions

File tree

e2e-version/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ output:
3939

4040
runs:
4141
using: node24
42-
main: ./dist/index.js
42+
main: ./dist/index.mjs

e2e-version/dist/index.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

e2e-version/dist/index.mjs

Lines changed: 3 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
const core = require('@actions/core');
2-
const semver = require('semver');
3-
const fs = require('fs/promises');
4-
const path = require('path');
1+
import * as core from '@actions/core';
2+
import semver from 'semver';
3+
import fs from 'node:fs/promises';
4+
import path from 'node:path';
55

66
const SkipGrafanaNightlyImageInput = 'skip-grafana-nightly-image';
77
const SkipGrafanaDevImageInput = 'skip-grafana-dev-image';
@@ -147,9 +147,4 @@ async function getPluginGrafanaDependencyFromPluginJson() {
147147
}
148148
run();
149149

150-
module.exports = {
151-
run,
152-
VersionResolverTypeInput,
153-
VersionResolverTypes,
154-
GrafanaDependencyInput,
155-
};
150+
export { run, VersionResolverTypeInput, VersionResolverTypes, GrafanaDependencyInput };
Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
1-
const { run, VersionResolverTypeInput, VersionResolverTypes, GrafanaDependencyInput } = require('./index');
2-
const mockVersions = require('./mocks/versions');
3-
const { getInput, getBooleanInput } = require('@actions/core');
1+
import { jest, describe, it, expect } from '@jest/globals';
2+
import mockVersions from './mocks/versions.js';
3+
4+
const getInput = jest.fn();
5+
const getBooleanInput = jest.fn();
6+
7+
jest.unstable_mockModule('@actions/core', () => ({
8+
getInput,
9+
getBooleanInput,
10+
setFailed: jest.fn(),
11+
setOutput: jest.fn(),
12+
}));
413

514
global.fetch = jest.fn(() =>
615
Promise.resolve({
716
json: () => Promise.resolve(mockVersions),
817
})
918
);
1019

11-
jest.mock('@actions/core', () => ({
12-
...jest.requireActual('@actions/core'),
13-
getInput: jest.fn(),
14-
getBooleanInput: jest.fn(),
15-
}));
20+
const { run, VersionResolverTypeInput, VersionResolverTypes, GrafanaDependencyInput } = await import('./index.mjs');
1621

1722
describe('plugin-grafana-dependency mode', () => {
1823
it.each([

e2e-version/package-lock.json

Lines changed: 24 additions & 198 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e-version/package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,19 @@
22
"name": "grafana-e2e-versions",
33
"version": "0.0.1",
44
"description": "",
5-
"main": "index.js",
5+
"main": "index.mjs",
66
"scripts": {
7-
"bundle": "ncc build ./index.js -m -o dist",
8-
"test": "jest"
7+
"bundle": "ncc build ./index.mjs -m -o dist",
8+
"test": "node --experimental-vm-modules node_modules/.bin/jest"
99
},
1010
"author": "",
1111
"license": "ISC",
1212
"dependencies": {
13-
"@actions/core": "^2.0.3",
14-
"@actions/github": "^9.1.1",
13+
"@actions/core": "^3.0.1",
1514
"semver": "^7.5.4"
1615
},
1716
"devDependencies": {
18-
"@vercel/ncc": "^0.38.1",
17+
"@vercel/ncc": "^0.44.0",
1918
"jest": "^30.0.0"
2019
}
2120
}

0 commit comments

Comments
 (0)