From ddba1b195df0a72d684224e037a854574145e15c Mon Sep 17 00:00:00 2001 From: Jonathan Clem Date: Wed, 21 Apr 2021 16:16:20 -0400 Subject: [PATCH] Use non-Webpack-require in evaluated scripts --- dist/index.js | 21 +-------------------- src/async-function.ts | 4 ++-- src/main.ts | 4 +++- 3 files changed, 6 insertions(+), 23 deletions(-) diff --git a/dist/index.js b/dist/index.js index 096668f4d..4c95e1c59 100644 --- a/dist/index.js +++ b/dist/index.js @@ -6144,7 +6144,7 @@ async function main() { const github = Object(lib_github.getOctokit)(token, opts); const script = Object(core.getInput)('script', { required: true }); // Using property/value shorthand on `require` (e.g. `{require}`) causes compilation errors. - const result = await callAsyncFunction({ require: __webpack_require__(875), github, context: lib_github.context, core: core, glob: glob, io: io }, script); + const result = await callAsyncFunction({ require: require, github, context: lib_github.context, core: core, glob: glob, io: io }, script); let encoding = Object(core.getInput)('result-encoding'); encoding = encoding ? encoding : 'json'; let output; @@ -6901,25 +6901,6 @@ function expand(str, isTop) { -/***/ }), - -/***/ 875: -/***/ (function(module) { - -function webpackEmptyContext(req) { - if (typeof req === 'number' && __webpack_require__.m[req]) - return __webpack_require__(req); -try { return require(req) } -catch (e) { if (e.code !== 'MODULE_NOT_FOUND') throw e } -var e = new Error("Cannot find module '" + req + "'"); - e.code = 'MODULE_NOT_FOUND'; - throw e; -} -webpackEmptyContext.keys = function() { return []; }; -webpackEmptyContext.resolve = webpackEmptyContext; -module.exports = webpackEmptyContext; -webpackEmptyContext.id = 875; - /***/ }), /***/ 877: diff --git a/src/async-function.ts b/src/async-function.ts index 64d12abf2..17b254833 100644 --- a/src/async-function.ts +++ b/src/async-function.ts @@ -1,6 +1,6 @@ import * as core from '@actions/core' -import {Context} from '@actions/github/lib/context' -import {GitHub} from '@actions/github/lib/utils' +import { Context } from '@actions/github/lib/context' +import { GitHub } from '@actions/github/lib/utils' import * as glob from '@actions/glob' import * as io from '@actions/io' diff --git a/src/main.ts b/src/main.ts index dd47f2c22..726bf7e44 100644 --- a/src/main.ts +++ b/src/main.ts @@ -4,6 +4,8 @@ import * as glob from '@actions/glob' import * as io from '@actions/io' import {callAsyncFunction} from './async-function' +declare const __non_webpack_require__: typeof require + process.on('unhandledRejection', handleError) main().catch(handleError) @@ -29,7 +31,7 @@ async function main(): Promise { // Using property/value shorthand on `require` (e.g. `{require}`) causes compilation errors. const result = await callAsyncFunction( - {require: require, github, context, core, glob, io}, + {require: __non_webpack_require__, github, context, core, glob, io}, script )