paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 23 Packages Projects Releases Wiki Activity

Merge branch 'backstage:master' into master

Browse Source
This commit is contained in:
djamaile
2021-06-08 11:38:58 +02:00
parent 66c6bfebd5 e4b6c46666
commit 8b06de3258
6 changed files with 93 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.changeset/eight-doors-melt.md
+41
View File
@@ -0,0 +1,41 @@
---
'@backstage/create-app': patch
---
Updated the `@gitbeaker/node` dependency past the broken one without a `dist` folder.
See [this issue](https://github.com/jdalrymple/gitbeaker/issues/1861) for more details.
If you get build errors that look like the following in your Backstage instance, you may want to also bump all of your `@gitbeaker/*` dependencies to at least `^30.2.0`.
```
node:internal/modules/cjs/loader:356
throw err;
^
Error: Cannot find module '/path/to/project/node_modules/@gitbeaker/node/dist/index.js'. Please verify that the package.json has a valid "main" entry
at tryPackage (node:internal/modules/cjs/loader:348:19)
at Function.Module._findPath (node:internal/modules/cjs/loader:561:18)
at Function.Module._resolveFilename (node:internal/modules/cjs/loader:926:27)
at Function.Module._load (node:internal/modules/cjs/loader:773:27)
at Module.require (node:internal/modules/cjs/loader:1012:19)
at require (node:internal/modules/cjs/helpers:93:18)
at Object.<anonymous> (/path/to/project/test.js:4:18)
at Module._compile (node:internal/modules/cjs/loader:1108:14)
at Object.Module._extensions..js (node:internal/modules/cjs/loader:1137:10)
at Module.load (node:internal/modules/cjs/loader:988:32) {
code: 'MODULE_NOT_FOUND',
path: '/path/to/project/node_modules/@gitbeaker/node/package.json',
requestPath: '@gitbeaker/node'
}
```
you could also consider pinning the version to an older one in your `package.json`, before the breakage occurred.
```json
"resolutions": {
"@gitbeaker/node": "29.2.4",
"@gitbeaker/core": "29.2.4",
"@gitbeaker/requester-utils": "29.2.4"
}
```
.changeset/tricky-goats-boil.md
+5
View File
@@ -0,0 +1,5 @@
---
'@backstage/plugin-scaffolder-backend': patch
---
Update gitbeaker past the broken version without a dist folder
packages/backend/package.json
+1 -1
View File
@@ -46,7 +46,7 @@
"@backstage/plugin-search-backend-node": "^0.1.3",
"@backstage/plugin-techdocs-backend": "^0.8.2",
"@backstage/plugin-todo-backend": "^0.1.6",
"@gitbeaker/node": "^29.2.0",
"@gitbeaker/node": "^30.2.0",
"@octokit/rest": "^18.5.3",
"azure-devops-node-api": "^10.1.1",
"dockerode": "^3.2.1",
packages/create-app/templates/default-app/packages/backend/package.json.hbs
+1 -1
View File
@@ -28,7 +28,7 @@
"@backstage/plugin-proxy-backend": "^{{version '@backstage/plugin-proxy-backend'}}",
"@backstage/plugin-scaffolder-backend": "^{{version '@backstage/plugin-scaffolder-backend'}}",
"@backstage/plugin-techdocs-backend": "^{{version '@backstage/plugin-techdocs-backend'}}",
"@gitbeaker/node": "^29.2.0",
"@gitbeaker/node": "^30.2.0",
"@octokit/rest": "^18.5.3",
"dockerode": "^3.2.1",
"express": "^4.17.1",
plugins/scaffolder-backend/package.json
+2 -2
View File
@@ -35,8 +35,8 @@
"@backstage/config": "^0.1.5",
"@backstage/errors": "^0.1.1",
"@backstage/integration": "^0.5.5",
"@gitbeaker/core": "^29.2.0",
"@gitbeaker/node": "^29.2.0",
"@gitbeaker/core": "^30.2.0",
"@gitbeaker/node": "^30.2.0",
"@octokit/rest": "^18.5.3",
"@types/express": "^4.17.6",
"@types/git-url-parse": "^9.0.0",
yarn.lock
+43 -45
View File
@@ -2184,30 +2184,31 @@
dependencies:
yaml-ast-parser "0.0.43"
"@gitbeaker/core@^29.2.0":
version "29.2.0"
resolved "https://registry.npmjs.org/@gitbeaker/core/-/core-29.2.0.tgz#d1ad60e47e03fe9dcc05ce73099cbd506865ec77"
integrity sha512-VvJMzAquoOAjHX/MGfFuXJkWtxOlDeY7Q18gHYQRL6ON9a1+L8aYRIzoCAWCemAKuMdP1lAU/29Aw7ehfwJAsg==
"@gitbeaker/core@^30.2.0":
version "30.2.0"
resolved "https://registry.npmjs.org/@gitbeaker/core/-/core-30.2.0.tgz#662f3c5b011d51d06ac990ff9b08fc59cd771f1f"
integrity sha512-W3pPSS0siaL/cOqxxsS9D6J4sdEtdiKBaEp/C9QRkLoF56V7UyRKMzzapFqXFwbpDR33z5mweGrkK/yLMXmaUg==
dependencies:
"@gitbeaker/requester-utils" "^29.2.0"
"@gitbeaker/requester-utils" "^30.2.0"
form-data "^4.0.0"
li "^1.3.0"
xcase "^2.0.1"
"@gitbeaker/node@^29.2.0":
version "29.2.0"
resolved "https://registry.npmjs.org/@gitbeaker/node/-/node-29.2.0.tgz#62e32df1f404b87c70bb8b8bda77f8ac5ea4cfcb"
integrity sha512-WnFJs5aCUfBZEOUa2tbzq4Swh8KGyy7IlNn3KVsRpSi+IIkzGNIjJW585GOqT1nUxYN8mNZil5Q3TjQyhaRisA==
"@gitbeaker/node@^30.2.0":
version "30.2.0"
resolved "https://registry.npmjs.org/@gitbeaker/node/-/node-30.2.0.tgz#3fc9fe22d45b59d05996ee0bb04e88f8ac6af142"
integrity sha512-IEBMeLPUb2opXyyRSYkzbdl65aypYARcH7r6Vgl5ypWwjw3QzGti2IoCsZCM7rBcC4LNdQfiu+Bckozui2CoUw==
dependencies:
"@gitbeaker/core" "^29.2.0"
"@gitbeaker/requester-utils" "^29.2.0"
"@gitbeaker/core" "^30.2.0"
"@gitbeaker/requester-utils" "^30.2.0"
delay "^5.0.0"
got "^11.8.2"
xcase "^2.0.1"
"@gitbeaker/requester-utils@^29.2.0":
version "29.2.0"
resolved "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-29.2.0.tgz#8b69da14dcf4c719e4a476167fcc47173ba44460"
integrity sha512-B/xrNmcgCVFUPAA6EjGZ39o//VAVUCaI15tDRl3LCx0hLxce2JOAZNaKKlTqe+4F6xNYIkcuRl28IQS9BPcaAg==
"@gitbeaker/requester-utils@^30.2.0":
version "30.2.0"
resolved "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-30.2.0.tgz#0d8633707d0fe2eb6d1e37bbc2da90f43ceea100"
integrity sha512-orXTa5TgVkPZTsnqdflz2uWne857jrwk79/6WGbcjxaVbdlG5hFa1efsJVwpbZcNjXrIzkOdE+gVrCFvPQ3SDw==
dependencies:
form-data "^4.0.0"
query-string "^7.0.0"
@@ -11601,6 +11602,11 @@ del@^5.1.0:
rimraf "^3.0.0"
slash "^3.0.0"
delay@^5.0.0:
version "5.0.0"
resolved "https://registry.npmjs.org/delay/-/delay-5.0.0.tgz#137045ef1b96e5071060dd5be60bf9334436bd1d"
integrity sha512-ReEBKkIfe4ya47wlPYf/gu5ib6yUG0/Aez0JQZQz94kiWtRQvZIQbTiehsnwHvLSWJnQdhVeqYue7Id1dKr0qw==
delayed-stream@~1.0.0:
version "1.0.0"
resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
@@ -16927,15 +16933,7 @@ js-tokens@^3.0.2:
resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.14.0, js-yaml@^3.6.1, js-yaml@^3.8.3:
version "3.14.0"
resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482"
integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==
dependencies:
argparse "^1.0.7"
esprima "^4.0.0"
js-yaml@^3.7.0:
js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.14.0, js-yaml@^3.6.1, js-yaml@^3.7.0, js-yaml@^3.8.3:
version "3.14.1"
resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
@@ -16944,9 +16942,9 @@ js-yaml@^3.7.0:
esprima "^4.0.0"
js-yaml@^4.0.0:
version "4.0.0"
resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f"
integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==
version "4.1.0"
resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
dependencies:
argparse "^2.0.1"
@@ -18608,9 +18606,9 @@ meow@^8.0.0:
yargs-parser "^20.2.3"
merge-deep@^3.0.2:
version "3.0.2"
resolved "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.2.tgz#f39fa100a4f1bd34ff29f7d2bf4508fbb8d83ad2"
integrity sha512-T7qC8kg4Zoti1cFd8Cr0M+qaZfOwjlPDEdZIIPPB2JZctjaPM4fX+i7HOId69tAti2fvO6X5ldfYUONDODsrkA==
version "3.0.3"
resolved "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.3.tgz#1a2b2ae926da8b2ae93a0ac15d90cd1922766003"
integrity sha512-qtmzAS6t6grwEkNrunqTBdn0qKwFgNWvlxUbAV8es9M7Ot1EbyApytCnvE0jALPa46ZpKDUo527kKiaWplmlFA==
dependencies:
arr-union "^3.1.0"
clone-deep "^0.2.4"
@@ -20801,7 +20799,7 @@ pg-connection-string@2.4.0:
resolved "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.4.0.tgz#c979922eb47832999a204da5dbe1ebf2341b6a10"
integrity sha512-3iBXuv7XKvxeMrIgym7njT+HlZkwZqqGX4Bu9cci8xHZNT+Um1gWKqCsAzcC0d95rcKMU5WBg6YRUcHyV0HZKQ==
pg-connection-string@^2.3.0, pg-connection-string@^2.4.0:
pg-connection-string@^2.3.0, pg-connection-string@^2.5.0:
version "2.5.0"
resolved "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.5.0.tgz#538cadd0f7e603fc09a12590f3b8a452c2c0cf34"
integrity sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ==
@@ -20819,15 +20817,15 @@ pg-pool@1.*:
generic-pool "2.4.3"
object-assign "4.1.0"
pg-pool@^3.2.2:
version "3.2.2"
resolved "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.2.tgz#a560e433443ed4ad946b84d774b3f22452694dff"
integrity sha512-ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA==
pg-pool@^3.3.0:
version "3.3.0"
resolved "https://registry.npmjs.org/pg-pool/-/pg-pool-3.3.0.tgz#12d5c7f65ea18a6e99ca9811bd18129071e562fc"
integrity sha512-0O5huCql8/D6PIRFAlmccjphLYWC+JIzvUhSzXSpGaf+tjTZc4nn+Lr7mLXBbFJfvwbP0ywDv73EiaBsxn7zdg==
pg-protocol@^1.4.0:
version "1.4.0"
resolved "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.4.0.tgz#43a71a92f6fe3ac559952555aa3335c8cb4908be"
integrity sha512-El+aXWcwG/8wuFICMQjM5ZSAm6OWiJicFdNYo+VY3QP+8vI4SvLIWVe51PppTzMhikUJR+PsyIFKqfdXPz/yxA==
pg-protocol@^1.5.0:
version "1.5.0"
resolved "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.5.0.tgz#b5dd452257314565e2d54ab3c132adc46565a6a0"
integrity sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ==
pg-types@1.*:
version "1.13.0"
@@ -20866,15 +20864,15 @@ pg@^6.1.0:
semver "4.3.2"
pg@^8.3.0:
version "8.5.1"
resolved "https://registry.npmjs.org/pg/-/pg-8.5.1.tgz#34dcb15f6db4a29c702bf5031ef2e1e25a06a120"
integrity sha512-9wm3yX9lCfjvA98ybCyw2pADUivyNWT/yIP4ZcDVpMN0og70BUWYEGXPCTAQdGTAqnytfRADb7NERrY1qxhIqw==
version "8.6.0"
resolved "https://registry.npmjs.org/pg/-/pg-8.6.0.tgz#e222296b0b079b280cce106ea991703335487db2"
integrity sha512-qNS9u61lqljTDFvmk/N66EeGq3n6Ujzj0FFyNMGQr6XuEv4tgNTXvJQTfJdcvGit5p5/DWPu+wj920hAJFI+QQ==
dependencies:
buffer-writer "2.0.0"
packet-reader "1.0.0"
pg-connection-string "^2.4.0"
pg-pool "^3.2.2"
pg-protocol "^1.4.0"
pg-connection-string "^2.5.0"
pg-pool "^3.3.0"
pg-protocol "^1.5.0"
pg-types "^2.1.0"
pgpass "1.x"