Skip to content
This repository was archived by the owner on Jan 28, 2025. It is now read-only.

Commit 8928948

Browse files
dphangdphang
authored
chore(deps): revert globby (#1458)
1 parent b0e9287 commit 8928948

File tree

6 files changed

+29
-86
lines changed

6 files changed

+29
-86
lines changed

‎.github/dependabot.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ updates:
2323
# FIXME: some issue with fs-extra for some users? https://github.com/serverless-nextjs/serverless-next.js/issues/1240
2424
- dependency-name: "fs-extra"
2525
- dependency-name: "sharp" # This is manually built for Lambda Node.js 14.x runtime
26+
- dependency-name: "globby" # 12.0.0 has breaking changes
2627
open-pull-requests-limit: 10
2728

2829
- package-ecosystem: "github-actions"

‎packages/serverless-components/aws-lambda/package.json‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,12 @@
4141
"archiver": "^5.3.0",
4242
"aws-sdk": "^2.935.0",
4343
"fs-extra": "^9.1.0",
44-
"globby": "^12.0.0",
44+
"globby": "^11.0.4",
4545
"lodash": "^4.17.21",
4646
"ramda": "^0.27.0"
4747
},
4848
"peerDependencies": {
4949
"@serverless/core": "^1.1.2",
5050
"aws-sdk": "^2.935.0"
51-
},
52-
"jest": {
53-
"preset": "ts-jest",
54-
"testEnvironment": "node"
5551
}
5652
}

‎packages/serverless-components/aws-lambda/src/component.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class AwsLambda extends Component {
4949
state: any;
5050
save: () => void;
5151
load: (name: string) => any;
52+
init: () => void;
5253

5354
async default(inputs: Record<string, unknown> = {}) {
5455
this.context.status(`Deploying`);

‎packages/serverless-components/aws-lambda/src/utils.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { tmpdir } from "os";
22
import * as path from "path";
33
import * as archiver from "archiver";
4-
import { globby } from "globby";
4+
import * as globby from "globby";
55
import { contains, isNil, last, split, equals, not, pick } from "ramda";
66
import { readFile, createReadStream, createWriteStream } from "fs-extra";
77
import { utils } from "@serverless/core";
@@ -29,7 +29,9 @@ const packDir = async (
2929
exclude.forEach((excludedItem) => patterns.push(`!${excludedItem}`));
3030
}
3131

32-
const files = (await globby(patterns, { cwd: inputDirPath, dot: true }))
32+
const files = (
33+
await globby.default(patterns, { cwd: inputDirPath, dot: true })
34+
)
3335
.sort() // we must sort to ensure correct hash
3436
.map((file) => ({
3537
input: path.join(inputDirPath, file),

‎packages/serverless-components/aws-lambda/yarn.lock‎

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -883,10 +883,10 @@ array-union@^1.0.2:
883883
dependencies:
884884
array-uniq "^1.0.1"
885885

886-
array-union@^3.0.1:
887-
version "3.0.1"
888-
resolved "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz#da52630d327f8b88cfbfb57728e2af5cd9b6b975"
889-
integrity sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==
886+
array-union@^2.1.0:
887+
version "2.1.0"
888+
resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
889+
integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
890890

891891
array-uniq@^1.0.1:
892892
version "1.0.3"
@@ -1681,7 +1681,7 @@ fast-glob@^2.2.6:
16811681
merge2 "^1.2.3"
16821682
micromatch "^3.1.10"
16831683

1684-
fast-glob@^3.2.7:
1684+
fast-glob@^3.1.1:
16851685
version "3.2.7"
16861686
resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"
16871687
integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==
@@ -1877,17 +1877,17 @@ globals@^11.1.0:
18771877
resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
18781878
integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
18791879

1880-
globby@^12.0.0:
1881-
version "12.0.0"
1882-
resolved "https://registry.npmjs.org/globby/-/globby-12.0.0.tgz#b8bbb8e9d48f8a3c9abf5624030f1f9e1cfbe3ed"
1883-
integrity sha512-3mOIUduqSMHm6gNjIw9E641TZ93NB8lFVt+6MKIw6vUaIS5aSsw/6cl0gT86z1IoKlaL90BiOQlA593GUMlzEA==
1880+
globby@^11.0.4:
1881+
version "11.0.4"
1882+
resolved "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"
1883+
integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==
18841884
dependencies:
1885-
array-union "^3.0.1"
1885+
array-union "^2.1.0"
18861886
dir-glob "^3.0.1"
1887-
fast-glob "^3.2.7"
1888-
ignore "^5.1.8"
1889-
merge2 "^1.4.1"
1890-
slash "^4.0.0"
1887+
fast-glob "^3.1.1"
1888+
ignore "^5.1.4"
1889+
merge2 "^1.3.0"
1890+
slash "^3.0.0"
18911891

18921892
globby@^9.2.0:
18931893
version "9.2.0"
@@ -2034,7 +2034,7 @@ ignore@^4.0.3:
20342034
resolved "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
20352035
integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
20362036

2037-
ignore@^5.1.8:
2037+
ignore@^5.1.4:
20382038
version "5.1.8"
20392039
resolved "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
20402040
integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
@@ -2919,7 +2919,7 @@ merge-stream@^2.0.0:
29192919
resolved "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
29202920
integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
29212921

2922-
merge2@^1.2.3, merge2@^1.3.0, merge2@^1.4.1:
2922+
merge2@^1.2.3, merge2@^1.3.0:
29232923
version "1.4.1"
29242924
resolved "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
29252925
integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
@@ -3567,11 +3567,6 @@ slash@^3.0.0:
35673567
resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
35683568
integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
35693569

3570-
slash@^4.0.0:
3571-
version "4.0.0"
3572-
resolved "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7"
3573-
integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==
3574-
35753570
snapdragon-node@^2.0.1:
35763571
version "2.1.1"
35773572
resolved "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"

‎yarn.lock‎

Lines changed: 6 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -3278,34 +3278,16 @@
32783278
"@sinonjs/commons" "^1.7.0"
32793279

32803280
"@sls-next/core@link:packages/libs/core":
3281-
version "3.2.0-alpha.17"
3282-
dependencies:
3283-
"@hapi/accept" "^5.0.1"
3284-
cookie "^0.4.1"
3285-
jsonwebtoken "^8.5.1"
3286-
path-to-regexp "^6.1.0"
3287-
regex-parser "^2.2.10"
3281+
version "0.0.0"
3282+
uid ""
32883283

32893284
"@sls-next/lambda-at-edge@link:./packages/libs/lambda-at-edge":
3290-
version "3.2.0-alpha.20"
3291-
dependencies:
3292-
"@aws-sdk/client-s3" "^3.19.0"
3293-
"@aws-sdk/client-sqs" "^3.19.0"
3294-
"@hapi/accept" "^5.0.2"
3295-
"@sls-next/core" "link:packages/libs/core"
3296-
"@vercel/nft" "^0.13.1"
3297-
execa "^5.0.1"
3298-
fresh "^0.5.2"
3299-
fs-extra "^9.1.0"
3300-
get-stream "^6.0.0"
3301-
is-animated "^2.0.1"
3302-
klaw "^3.0.0"
3303-
node-fetch "^2.6.1"
3304-
path-to-regexp "^6.1.0"
3305-
send "^0.17.1"
3285+
version "0.0.0"
3286+
uid ""
33063287

33073288
"@sls-next/next-aws-cloudfront@link:./packages/compat-layers/lambda-at-edge-compat":
3308-
version "3.2.0-alpha.17"
3289+
version "0.0.0"
3290+
uid ""
33093291

33103292
"@szmarczak/http-timer@^1.1.2":
33113293
version "1.1.2"
@@ -3672,14 +3654,6 @@
36723654
"@typescript-eslint/typescript-estree" "4.28.5"
36733655
debug "^4.3.1"
36743656

3675-
"@typescript-eslint/[email protected]":
3676-
version "4.28.4"
3677-
resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.4.tgz#bdbce9b6a644e34f767bd68bc17bb14353b9fe7f"
3678-
integrity sha512-ZJBNs4usViOmlyFMt9X9l+X0WAFcDH7EdSArGqpldXu7aeZxDAuAzHiMAeI+JpSefY2INHrXeqnha39FVqXb8w==
3679-
dependencies:
3680-
"@typescript-eslint/types" "4.28.4"
3681-
"@typescript-eslint/visitor-keys" "4.28.4"
3682-
36833657
"@typescript-eslint/[email protected]":
36843658
version "4.28.5"
36853659
resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.5.tgz#3a1b70c50c1535ac33322786ea99ebe403d3b923"
@@ -3688,29 +3662,11 @@
36883662
"@typescript-eslint/types" "4.28.5"
36893663
"@typescript-eslint/visitor-keys" "4.28.5"
36903664

3691-
"@typescript-eslint/[email protected]":
3692-
version "4.28.4"
3693-
resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.4.tgz#41acbd79b5816b7c0dd7530a43d97d020d3aeb42"
3694-
integrity sha512-3eap4QWxGqkYuEmVebUGULMskR6Cuoc/Wii0oSOddleP4EGx1tjLnZQ0ZP33YRoMDCs5O3j56RBV4g14T4jvww==
3695-
36963665
"@typescript-eslint/[email protected]":
36973666
version "4.28.5"
36983667
resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.5.tgz#d33edf8e429f0c0930a7c3d44e9b010354c422e9"
36993668
integrity sha512-MruOu4ZaDOLOhw4f/6iudyks/obuvvZUAHBDSW80Trnc5+ovmViLT2ZMDXhUV66ozcl6z0LJfKs1Usldgi/WCA==
37003669

3701-
"@typescript-eslint/[email protected]":
3702-
version "4.28.4"
3703-
resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.4.tgz#252e6863278dc0727244be9e371eb35241c46d00"
3704-
integrity sha512-z7d8HK8XvCRyN2SNp+OXC2iZaF+O2BTquGhEYLKLx5k6p0r05ureUtgEfo5f6anLkhCxdHtCf6rPM1p4efHYDQ==
3705-
dependencies:
3706-
"@typescript-eslint/types" "4.28.4"
3707-
"@typescript-eslint/visitor-keys" "4.28.4"
3708-
debug "^4.3.1"
3709-
globby "^11.0.3"
3710-
is-glob "^4.0.1"
3711-
semver "^7.3.5"
3712-
tsutils "^3.21.0"
3713-
37143670
"@typescript-eslint/[email protected]":
37153671
version "4.28.5"
37163672
resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.5.tgz#4906d343de693cf3d8dcc301383ed638e0441cd1"
@@ -3724,14 +3680,6 @@
37243680
semver "^7.3.5"
37253681
tsutils "^3.21.0"
37263682

3727-
"@typescript-eslint/[email protected]":
3728-
version "4.28.4"
3729-
resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.4.tgz#92dacfefccd6751cbb0a964f06683bfd72d0c4d3"
3730-
integrity sha512-NIAXAdbz1XdOuzqkJHjNKXKj8QQ4cv5cxR/g0uQhCYf/6//XrmfpaYsM7PnBcNbfvTDLUkqQ5TPNm1sozDdTWg==
3731-
dependencies:
3732-
"@typescript-eslint/types" "4.28.4"
3733-
eslint-visitor-keys "^2.0.0"
3734-
37353683
"@typescript-eslint/[email protected]":
37363684
version "4.28.5"
37373685
resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.5.tgz#ffee2c602762ed6893405ee7c1144d9cc0a29675"

0 commit comments

Comments
 (0)