Properly destructure plugins

machulav · Mar 25, 2022 · ad1eb20 · ad1eb20
1 parent 1fc7e25
commit ad1eb20
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -62580,22 +62580,19 @@ try {
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
 const core = __webpack_require__(42186);
-const rest = __webpack_require__(55375);
-const githubUtils = __webpack_require__(73030);
-const retry = __webpack_require__(86298);
-const throttling = __webpack_require__(9968);
+const { Octokit } = __webpack_require__(55375);
+const { getOctokitOptions } = __webpack_require__(73030);
+const { retry } = __webpack_require__(86298);
+const { throttling } = __webpack_require__(9968);
 const _ = __webpack_require__(90250);
 const config = __webpack_require__(34570);
 
 let octokit;
 
 function getOctokit(token) {
   if (!octokit) {
-    console.log(rest);
-    console.log(rest.Octokit);
-    console.log(rest.Octokit.plugin);
-    const ConfiguredOctokit = rest.Octokit.plugin(retry, throttling);
-    octokit = new ConfiguredOctokit(githubUtils.getOctokitOptions(token, {
+    const ConfiguredOctokit = Octokit.plugin(retry, throttling);
+    octokit = new ConfiguredOctokit(getOctokitOptions(token, {
       request: {
         retries: 2,
       },

diff --git a/src/gh.js b/src/gh.js
@@ -1,20 +1,17 @@
 const core = require('@actions/core');
-const rest = require('@octokit/rest');
-const githubUtils = require('@actions/github/lib/utils');
-const retry = require('@octokit/plugin-retry');
-const throttling = require('@octokit/plugin-throttling');
+const { Octokit } = require('@octokit/rest');
+const { getOctokitOptions } = require('@actions/github/lib/utils');
+const { retry } = require('@octokit/plugin-retry');
+const { throttling } = require('@octokit/plugin-throttling');
 const _ = require('lodash');
 const config = require('./config');
 
 let octokit;
 
 function getOctokit(token) {
   if (!octokit) {
-    console.log(rest);
-    console.log(rest.Octokit);
-    console.log(rest.Octokit.plugin);
-    const ConfiguredOctokit = rest.Octokit.plugin(retry, throttling);
-    octokit = new ConfiguredOctokit(githubUtils.getOctokitOptions(token, {
+    const ConfiguredOctokit = Octokit.plugin(retry, throttling);
+    octokit = new ConfiguredOctokit(getOctokitOptions(token, {
       request: {
         retries: 2,
       },