Update to runtime v2

manifest.yml

@@ -48,7 +48,7 @@ modules:
     - key: process-gitlab-event
       handler: index.processGitlabEvent
     - key: import-projects
-      handler: resolvers/import-queue-resolver.run
+      handler: index.importQueueResolver
     - key: pre-uninstall
       handler: index.preUninstall
     - key: data-provider-fn
@@ -65,6 +65,8 @@ modules:
         method: import
 app:
   id: ari:cloud:ecosystem::app/fe7b0913-7421-4c84-b401-041eaab2ef2e
+  runtime:
+    name: nodejs18.x
   features:
     autoUserConsent: true
 resources:

package.json

@@ -8,7 +8,7 @@
   "private": true,
   "devDependencies": {
     "@atlaskit/eslint-plugin-design-system": "^8.7.0",
-    "@forge/cli": "^6.21.0",
+    "@forge/cli": "^10.5.0",
     "@types/jest": "^27.4.1",
     "@types/js-yaml": "^4.0.5",
     "@types/lodash": "^4.14.182",
@@ -35,14 +35,12 @@
     "typescript": "~4.5.5"
   },
   "dependencies": {
-    "@atlaskit/primitives": "^12.1.0",
-    "@atlaskit/tokens": "^1.29.1",
     "@atlassian/forge-graphql": "13.10.1",
-    "@forge/api": "^2.8.1",
-    "@forge/bridge": "^2.6.0",
-    "@forge/events": "^0.5.3",
-    "@forge/metrics": "^0.1.1",
-    "@forge/resolver": "^1.4.6",
+    "@forge/api": "^3.9.1",
+    "@forge/bridge": "^3.5.0",
+    "@forge/events": "^0.9.1",
+    "@forge/metrics": "^0.2.17",
+    "@forge/resolver": "^1.5.39",
     "@forge/ui": "^1.1.0",
     "exponential-backoff": "^3.1.0",
     "js-yaml": "^4.1.0",

src/index.ts

@@ -1,5 +1,6 @@
 import adminResolver from './resolvers/admin-resolvers';
 import importResolver from './resolvers/import-resolvers';
+import importQueueResolver from './resolvers/import-queue-resolver';
 
 import { processGitlabEvent } from './entry/webtriggers';
 import { dataProvider } from './entry/data-provider';
@@ -12,7 +13,7 @@ export { preUninstall };
 // webtriggers
 export { processGitlabEvent };
 // resolvers
-export { adminResolver, importResolver };
+export { adminResolver, importResolver, importQueueResolver };
 // dataProvider
 export { dataProvider, callback };
 // configValidator

src/resolvers/import-queue-resolver.ts

@@ -101,4 +101,4 @@ resolver.define('import', async (req) => {
   }
 });
 
-export const run = resolver.getDefinitions();
+export default resolver.getDefinitions();

ui/package.json

@@ -24,8 +24,7 @@
     "@atlaskit/tokens": "^1.29.1",
     "@atlaskit/tooltip": "^17.5.9",
     "@atlassian/forge-graphql": "13.9.1",
-    "@forge/api": "^2.8.1",
-    "@forge/bridge": "^2.6.0",
+    "@forge/bridge": "^3.5.0",
     "escape-string-regexp": "^5.0.0",
     "lodash": "^4.17.21",
     "lodash.debounce": "^4.0.8",

ui/yarn.lock

@@ -2533,35 +2533,17 @@
     "@types/node-fetch" "^2.6.9"
     node-fetch "2.7.0"
 
-"@forge/api@^2.8.1":
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/@forge/api/-/api-2.11.0.tgz#7cb0bbf4eb661228100e4ba1fdb1ea71a66dadd2"
-  integrity sha512-FcXELcnD4g1Ohjx1NA5ATXt+OM9WE60TsKk94UwGn/aEq2tLuupIFCAjD0Z1D3ekQOKx81WuvCDPlNE4rm7suw==
-  dependencies:
-    "@forge/auth" "^0.0.1"
-    "@forge/egress" "^1.1.2"
-    "@forge/storage" "^1.3.1"
-    "@types/node-fetch" "^2.5.7"
-    node-fetch "2.6.7"
-
 "@forge/[email protected]":
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/@forge/auth/-/auth-0.0.5.tgz#d8df38fc55a7508121bef2508f494ee4a81e8072"
   integrity sha512-JIJMRRnNWQjvLlnf2Goc+/CEzx+XTpzTarOR7wzRMOEoE715T5gdvb4hWeyQVyRJkRJUQQAXxDPT0WH7rINOcg==
   dependencies:
     tslib "^2.6.2"
 
-"@forge/auth@^0.0.1":
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/@forge/auth/-/auth-0.0.1.tgz#3fb4e82e90bd555d4ae9ef45b3aed6782a282d0c"
-  integrity sha512-twZjWbIk+PrW2XzrUfVCzYhh1qe5igS4h9NpapZLHNm2CaCi1gjh8klVcGJijcYJWT1Sj6Qr9gBUtkZjCinJXw==
-  dependencies:
-    tslib "^1.11.0"
-
-"@forge/bridge@^2.6.0":
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/@forge/bridge/-/bridge-2.6.0.tgz#ba83161c6a2d2139bf91dc9bcd8e491718143dc3"
-  integrity sha512-DNzRCR1UUYU7Mob0WoSGFQrxOt7akeTB+yZppxpBHNkosTnP+CXK39hWIf2huzQBZOsh7baE8oeJFcspzv+H+w==
+"@forge/bridge@^3.5.0":
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/@forge/bridge/-/bridge-3.5.0.tgz#3c32691406f674624ece9f7055f61e3a1cbc2df3"
+  integrity sha512-g7XoM50giYsRNU5nJQthOzmtvO4qxyhIC2jklYCOiCntWCee79gAzxareeNNmEggXGXqoDUZpa20ipTk+bryFA==
   dependencies:
     "@types/history" "^4.7.11"
 
@@ -2572,23 +2554,11 @@
   dependencies:
     minimatch "^9.0.3"
 
-"@forge/egress@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@forge/egress/-/egress-1.1.2.tgz#8e94c41ef4f5f38c71aad0823eabc08356ae4bfb"
-  integrity sha512-gyDuvsz3VRh6Cb++WLJNRcucD/FBgAu9txHLGB1cYzb49094w5mgrte2BaAYGBNNjy3ZdgbgoRt+UclEX6EqKA==
-  dependencies:
-    minimatch "^5.1.0"
-
 "@forge/[email protected]":
   version "1.5.13"
   resolved "https://registry.yarnpkg.com/@forge/storage/-/storage-1.5.13.tgz#e94551f7cc34d66e850254ad8e126b7b1846a96a"
   integrity sha512-V9BSggOxeu/r0LMHLwLTndvTkxwn57UAF4Q6zQ+huJ0Q6UGKjuo7eBtw4JTH4bQFPrAqj1Kh64ebtK6F3naN+w==
 
-"@forge/storage@^1.3.1":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@forge/storage/-/storage-1.3.1.tgz#e4d8f2811654de961ce93deacdf4cc4a4817fb50"
-  integrity sha512-BU1qU0R08FH68MynaF409sp6mt3Ps8+XxyMk4Lsh9PYwYxMOpz5ynczv/DY0331G2n0LMBS1nVsJ9q88PFxI/Q==
-
 "@forge/[email protected]":
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/@forge/util/-/util-1.3.3.tgz#f9b6d955d66deeaad6a81a09ca4799ce69be94a6"
@@ -3344,14 +3314,6 @@
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
   integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
 
-"@types/node-fetch@^2.5.7":
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.1.tgz#8f127c50481db65886800ef496f20bbf15518975"
-  integrity sha512-oMqjURCaxoSIsHSr1E47QHzbmzNR5rK8McHuNb11BOM9cHcIK3Avy0s/b2JlXHoQGTYS3NsvWzV1M0iK7l0wbA==
-  dependencies:
-    "@types/node" "*"
-    form-data "^3.0.0"
-
 "@types/node-fetch@^2.6.9":
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.9.tgz#15f529d247f1ede1824f7e7acdaa192d5f28071e"
@@ -8088,13 +8050,6 @@ minimatch@^3.0.4, minimatch@^3.1.2:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^5.1.0:
-  version "5.1.6"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
-  integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
-  dependencies:
-    brace-expansion "^2.0.1"
-
 minimatch@^9.0.3:
   version "9.0.3"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
@@ -10688,7 +10643,7 @@ tsconfig-paths@^3.12.0:
     minimist "^1.2.0"
     strip-bom "^3.0.0"
 
-tslib@^1.11.0, tslib@^1.8.1:
+tslib@^1.8.1:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==