netlify-cli 9.6.9 → 9.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/npm-shrinkwrap.json +127 -39
- package/package.json +4 -4
- package/src/commands/dev/dev-exec.js +2 -2
- package/src/commands/dev/dev.js +1 -1
- package/src/commands/functions/functions-create.js +14 -2
- package/src/commands/functions/functions-serve.js +1 -1
- package/src/utils/dev.js +2 -2
- package/src/utils/dot-env.js +8 -5
package/npm-shrinkwrap.json
CHANGED
|
@@ -1,21 +1,21 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "netlify-cli",
|
|
3
|
-
"version": "9.
|
|
3
|
+
"version": "9.7.0",
|
|
4
4
|
"lockfileVersion": 2,
|
|
5
5
|
"requires": true,
|
|
6
6
|
"packages": {
|
|
7
7
|
"": {
|
|
8
8
|
"name": "netlify-cli",
|
|
9
|
-
"version": "9.
|
|
9
|
+
"version": "9.7.0",
|
|
10
10
|
"hasInstallScript": true,
|
|
11
11
|
"license": "MIT",
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@netlify/build": "^26.3.
|
|
14
|
-
"@netlify/config": "^17.0.
|
|
13
|
+
"@netlify/build": "^26.3.5",
|
|
14
|
+
"@netlify/config": "^17.0.12",
|
|
15
15
|
"@netlify/framework-info": "^9.0.2",
|
|
16
16
|
"@netlify/local-functions-proxy": "^1.1.1",
|
|
17
17
|
"@netlify/plugin-edge-handlers": "^3.0.6",
|
|
18
|
-
"@netlify/plugins-list": "^6.
|
|
18
|
+
"@netlify/plugins-list": "^6.13.1",
|
|
19
19
|
"@netlify/routing-local-proxy": "^0.34.1",
|
|
20
20
|
"@netlify/zip-it-and-ship-it": "^5.8.0",
|
|
21
21
|
"@octokit/rest": "^18.0.0",
|
|
@@ -99,7 +99,7 @@
|
|
|
99
99
|
"path-key": "^3.1.1",
|
|
100
100
|
"prettyjson": "^1.2.1",
|
|
101
101
|
"pump": "^3.0.0",
|
|
102
|
-
"raw-body": "^2.
|
|
102
|
+
"raw-body": "^2.5.0",
|
|
103
103
|
"read-pkg-up": "^7.0.1",
|
|
104
104
|
"semver": "^7.3.5",
|
|
105
105
|
"source-map-support": "^0.5.19",
|
|
@@ -2358,9 +2358,9 @@
|
|
|
2358
2358
|
}
|
|
2359
2359
|
},
|
|
2360
2360
|
"node_modules/@netlify/build": {
|
|
2361
|
-
"version": "26.3.
|
|
2362
|
-
"resolved": "https://registry.npmjs.org/@netlify/build/-/build-26.3.
|
|
2363
|
-
"integrity": "sha512-
|
|
2361
|
+
"version": "26.3.5",
|
|
2362
|
+
"resolved": "https://registry.npmjs.org/@netlify/build/-/build-26.3.5.tgz",
|
|
2363
|
+
"integrity": "sha512-scMxcFn5fRPpwUwiTK5y6cK3TySaGX6aThbfLf/4X2X6Bad+oVOzyT+2ObwGAqBJdyZNelLTcsv60ndGak6iiA==",
|
|
2364
2364
|
"dependencies": {
|
|
2365
2365
|
"@bugsnag/js": "^7.0.0",
|
|
2366
2366
|
"@netlify/cache-utils": "^4.0.0",
|
|
@@ -2368,7 +2368,7 @@
|
|
|
2368
2368
|
"@netlify/functions-utils": "^4.0.0",
|
|
2369
2369
|
"@netlify/git-utils": "^4.0.0",
|
|
2370
2370
|
"@netlify/plugin-edge-handlers": "^3.0.6",
|
|
2371
|
-
"@netlify/plugins-list": "^6.
|
|
2371
|
+
"@netlify/plugins-list": "^6.12.0",
|
|
2372
2372
|
"@netlify/run-utils": "^4.0.0",
|
|
2373
2373
|
"@netlify/zip-it-and-ship-it": "5.8.0",
|
|
2374
2374
|
"@sindresorhus/slugify": "^2.0.0",
|
|
@@ -3110,9 +3110,9 @@
|
|
|
3110
3110
|
}
|
|
3111
3111
|
},
|
|
3112
3112
|
"node_modules/@netlify/config": {
|
|
3113
|
-
"version": "17.0.
|
|
3114
|
-
"resolved": "https://registry.npmjs.org/@netlify/config/-/config-17.0.
|
|
3115
|
-
"integrity": "sha512-
|
|
3113
|
+
"version": "17.0.12",
|
|
3114
|
+
"resolved": "https://registry.npmjs.org/@netlify/config/-/config-17.0.12.tgz",
|
|
3115
|
+
"integrity": "sha512-6z+AamvN2eqSYbMK87yuYkU1HRLiyOpP2GPZXthvuGD0lRb+uyFrHaCHoEinEBjnUGZDan/w/lkQHX8JjI2qiQ==",
|
|
3116
3116
|
"dependencies": {
|
|
3117
3117
|
"chalk": "^5.0.0",
|
|
3118
3118
|
"cron-parser": "^4.1.0",
|
|
@@ -3129,7 +3129,7 @@
|
|
|
3129
3129
|
"map-obj": "^5.0.0",
|
|
3130
3130
|
"netlify": "^11.0.0",
|
|
3131
3131
|
"netlify-headers-parser": "^6.0.2",
|
|
3132
|
-
"netlify-redirect-parser": "
|
|
3132
|
+
"netlify-redirect-parser": "13.0.2",
|
|
3133
3133
|
"omit.js": "^2.0.2",
|
|
3134
3134
|
"p-locate": "^6.0.0",
|
|
3135
3135
|
"path-exists": "^5.0.0",
|
|
@@ -3322,6 +3322,20 @@
|
|
|
3322
3322
|
"url": "https://github.com/sponsors/sindresorhus"
|
|
3323
3323
|
}
|
|
3324
3324
|
},
|
|
3325
|
+
"node_modules/@netlify/config/node_modules/netlify-redirect-parser": {
|
|
3326
|
+
"version": "13.0.2",
|
|
3327
|
+
"resolved": "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-13.0.2.tgz",
|
|
3328
|
+
"integrity": "sha512-mrPx+pSaPv3HCJzCcAsQikNaa1/3gIe6NwOCd7qUAej9g8iiy0P2D4X0AGTPgqbbGz4xZN1azier46S8QIdn+A==",
|
|
3329
|
+
"dependencies": {
|
|
3330
|
+
"filter-obj": "^3.0.0",
|
|
3331
|
+
"is-plain-obj": "^4.0.0",
|
|
3332
|
+
"path-exists": "^5.0.0",
|
|
3333
|
+
"toml": "^3.0.0"
|
|
3334
|
+
},
|
|
3335
|
+
"engines": {
|
|
3336
|
+
"node": "^12.20.0 || ^14.14.0 || >=16.0.0"
|
|
3337
|
+
}
|
|
3338
|
+
},
|
|
3325
3339
|
"node_modules/@netlify/config/node_modules/npm-run-path": {
|
|
3326
3340
|
"version": "5.1.0",
|
|
3327
3341
|
"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz",
|
|
@@ -4328,9 +4342,9 @@
|
|
|
4328
4342
|
}
|
|
4329
4343
|
},
|
|
4330
4344
|
"node_modules/@netlify/plugins-list": {
|
|
4331
|
-
"version": "6.
|
|
4332
|
-
"resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.
|
|
4333
|
-
"integrity": "sha512-
|
|
4345
|
+
"version": "6.13.1",
|
|
4346
|
+
"resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.13.1.tgz",
|
|
4347
|
+
"integrity": "sha512-xduwI/S1GreiDfYV6hALaMIlk31zBgutPfKBEhad8x6ZogJiB8GO2egiAQ4qvAv1APmJaGzPJE5TN2VWr9pGvQ==",
|
|
4334
4348
|
"engines": {
|
|
4335
4349
|
"node": "^12.20.0 || ^14.14.0 || >=16.0.0"
|
|
4336
4350
|
}
|
|
@@ -11959,6 +11973,20 @@
|
|
|
11959
11973
|
"url": "https://github.com/sponsors/ljharb"
|
|
11960
11974
|
}
|
|
11961
11975
|
},
|
|
11976
|
+
"node_modules/express/node_modules/raw-body": {
|
|
11977
|
+
"version": "2.4.3",
|
|
11978
|
+
"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz",
|
|
11979
|
+
"integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==",
|
|
11980
|
+
"dependencies": {
|
|
11981
|
+
"bytes": "3.1.2",
|
|
11982
|
+
"http-errors": "1.8.1",
|
|
11983
|
+
"iconv-lite": "0.4.24",
|
|
11984
|
+
"unpipe": "1.0.0"
|
|
11985
|
+
},
|
|
11986
|
+
"engines": {
|
|
11987
|
+
"node": ">= 0.8"
|
|
11988
|
+
}
|
|
11989
|
+
},
|
|
11962
11990
|
"node_modules/express/node_modules/safe-buffer": {
|
|
11963
11991
|
"version": "5.2.1",
|
|
11964
11992
|
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
|
|
@@ -19924,12 +19952,12 @@
|
|
|
19924
19952
|
}
|
|
19925
19953
|
},
|
|
19926
19954
|
"node_modules/raw-body": {
|
|
19927
|
-
"version": "2.
|
|
19928
|
-
"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.
|
|
19929
|
-
"integrity": "sha512-
|
|
19955
|
+
"version": "2.5.0",
|
|
19956
|
+
"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.0.tgz",
|
|
19957
|
+
"integrity": "sha512-XpyZ6O7PVu3ItMQl0LslfsRoKxMOxi3SzDkrOtxMES5AqLFpYjQCryxI4LGygUN2jL+RgFsPkMPPlG7cg/47+A==",
|
|
19930
19958
|
"dependencies": {
|
|
19931
19959
|
"bytes": "3.1.2",
|
|
19932
|
-
"http-errors": "
|
|
19960
|
+
"http-errors": "2.0.0",
|
|
19933
19961
|
"iconv-lite": "0.4.24",
|
|
19934
19962
|
"unpipe": "1.0.0"
|
|
19935
19963
|
},
|
|
@@ -19945,6 +19973,29 @@
|
|
|
19945
19973
|
"node": ">= 0.8"
|
|
19946
19974
|
}
|
|
19947
19975
|
},
|
|
19976
|
+
"node_modules/raw-body/node_modules/depd": {
|
|
19977
|
+
"version": "2.0.0",
|
|
19978
|
+
"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
|
|
19979
|
+
"integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
|
|
19980
|
+
"engines": {
|
|
19981
|
+
"node": ">= 0.8"
|
|
19982
|
+
}
|
|
19983
|
+
},
|
|
19984
|
+
"node_modules/raw-body/node_modules/http-errors": {
|
|
19985
|
+
"version": "2.0.0",
|
|
19986
|
+
"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
|
|
19987
|
+
"integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
|
|
19988
|
+
"dependencies": {
|
|
19989
|
+
"depd": "2.0.0",
|
|
19990
|
+
"inherits": "2.0.4",
|
|
19991
|
+
"setprototypeof": "1.2.0",
|
|
19992
|
+
"statuses": "2.0.1",
|
|
19993
|
+
"toidentifier": "1.0.1"
|
|
19994
|
+
},
|
|
19995
|
+
"engines": {
|
|
19996
|
+
"node": ">= 0.8"
|
|
19997
|
+
}
|
|
19998
|
+
},
|
|
19948
19999
|
"node_modules/rc": {
|
|
19949
20000
|
"version": "1.2.8",
|
|
19950
20001
|
"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
|
|
@@ -21904,7 +21955,6 @@
|
|
|
21904
21955
|
"version": "2.0.1",
|
|
21905
21956
|
"resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
|
|
21906
21957
|
"integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
|
|
21907
|
-
"dev": true,
|
|
21908
21958
|
"engines": {
|
|
21909
21959
|
"node": ">= 0.8"
|
|
21910
21960
|
}
|
|
@@ -26082,9 +26132,9 @@
|
|
|
26082
26132
|
}
|
|
26083
26133
|
},
|
|
26084
26134
|
"@netlify/build": {
|
|
26085
|
-
"version": "26.3.
|
|
26086
|
-
"resolved": "https://registry.npmjs.org/@netlify/build/-/build-26.3.
|
|
26087
|
-
"integrity": "sha512-
|
|
26135
|
+
"version": "26.3.5",
|
|
26136
|
+
"resolved": "https://registry.npmjs.org/@netlify/build/-/build-26.3.5.tgz",
|
|
26137
|
+
"integrity": "sha512-scMxcFn5fRPpwUwiTK5y6cK3TySaGX6aThbfLf/4X2X6Bad+oVOzyT+2ObwGAqBJdyZNelLTcsv60ndGak6iiA==",
|
|
26088
26138
|
"requires": {
|
|
26089
26139
|
"@bugsnag/js": "^7.0.0",
|
|
26090
26140
|
"@netlify/cache-utils": "^4.0.0",
|
|
@@ -26092,7 +26142,7 @@
|
|
|
26092
26142
|
"@netlify/functions-utils": "^4.0.0",
|
|
26093
26143
|
"@netlify/git-utils": "^4.0.0",
|
|
26094
26144
|
"@netlify/plugin-edge-handlers": "^3.0.6",
|
|
26095
|
-
"@netlify/plugins-list": "^6.
|
|
26145
|
+
"@netlify/plugins-list": "^6.12.0",
|
|
26096
26146
|
"@netlify/run-utils": "^4.0.0",
|
|
26097
26147
|
"@netlify/zip-it-and-ship-it": "5.8.0",
|
|
26098
26148
|
"@sindresorhus/slugify": "^2.0.0",
|
|
@@ -26547,9 +26597,9 @@
|
|
|
26547
26597
|
}
|
|
26548
26598
|
},
|
|
26549
26599
|
"@netlify/config": {
|
|
26550
|
-
"version": "17.0.
|
|
26551
|
-
"resolved": "https://registry.npmjs.org/@netlify/config/-/config-17.0.
|
|
26552
|
-
"integrity": "sha512-
|
|
26600
|
+
"version": "17.0.12",
|
|
26601
|
+
"resolved": "https://registry.npmjs.org/@netlify/config/-/config-17.0.12.tgz",
|
|
26602
|
+
"integrity": "sha512-6z+AamvN2eqSYbMK87yuYkU1HRLiyOpP2GPZXthvuGD0lRb+uyFrHaCHoEinEBjnUGZDan/w/lkQHX8JjI2qiQ==",
|
|
26553
26603
|
"requires": {
|
|
26554
26604
|
"chalk": "^5.0.0",
|
|
26555
26605
|
"cron-parser": "^4.1.0",
|
|
@@ -26566,7 +26616,7 @@
|
|
|
26566
26616
|
"map-obj": "^5.0.0",
|
|
26567
26617
|
"netlify": "^11.0.0",
|
|
26568
26618
|
"netlify-headers-parser": "^6.0.2",
|
|
26569
|
-
"netlify-redirect-parser": "
|
|
26619
|
+
"netlify-redirect-parser": "13.0.2",
|
|
26570
26620
|
"omit.js": "^2.0.2",
|
|
26571
26621
|
"p-locate": "^6.0.0",
|
|
26572
26622
|
"path-exists": "^5.0.0",
|
|
@@ -26672,6 +26722,17 @@
|
|
|
26672
26722
|
"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-5.0.0.tgz",
|
|
26673
26723
|
"integrity": "sha512-2L3MIgJynYrZ3TYMriLDLWocz15okFakV6J12HXvMXDHui2x/zgChzg1u9mFFGbbGWE+GsLpQByt4POb9Or+uA=="
|
|
26674
26724
|
},
|
|
26725
|
+
"netlify-redirect-parser": {
|
|
26726
|
+
"version": "13.0.2",
|
|
26727
|
+
"resolved": "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-13.0.2.tgz",
|
|
26728
|
+
"integrity": "sha512-mrPx+pSaPv3HCJzCcAsQikNaa1/3gIe6NwOCd7qUAej9g8iiy0P2D4X0AGTPgqbbGz4xZN1azier46S8QIdn+A==",
|
|
26729
|
+
"requires": {
|
|
26730
|
+
"filter-obj": "^3.0.0",
|
|
26731
|
+
"is-plain-obj": "^4.0.0",
|
|
26732
|
+
"path-exists": "^5.0.0",
|
|
26733
|
+
"toml": "^3.0.0"
|
|
26734
|
+
}
|
|
26735
|
+
},
|
|
26675
26736
|
"npm-run-path": {
|
|
26676
26737
|
"version": "5.1.0",
|
|
26677
26738
|
"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz",
|
|
@@ -27281,9 +27342,9 @@
|
|
|
27281
27342
|
}
|
|
27282
27343
|
},
|
|
27283
27344
|
"@netlify/plugins-list": {
|
|
27284
|
-
"version": "6.
|
|
27285
|
-
"resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.
|
|
27286
|
-
"integrity": "sha512-
|
|
27345
|
+
"version": "6.13.1",
|
|
27346
|
+
"resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.13.1.tgz",
|
|
27347
|
+
"integrity": "sha512-xduwI/S1GreiDfYV6hALaMIlk31zBgutPfKBEhad8x6ZogJiB8GO2egiAQ4qvAv1APmJaGzPJE5TN2VWr9pGvQ=="
|
|
27287
27348
|
},
|
|
27288
27349
|
"@netlify/routing-local-proxy": {
|
|
27289
27350
|
"version": "0.34.1",
|
|
@@ -33131,6 +33192,17 @@
|
|
|
33131
33192
|
"resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz",
|
|
33132
33193
|
"integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw=="
|
|
33133
33194
|
},
|
|
33195
|
+
"raw-body": {
|
|
33196
|
+
"version": "2.4.3",
|
|
33197
|
+
"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz",
|
|
33198
|
+
"integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==",
|
|
33199
|
+
"requires": {
|
|
33200
|
+
"bytes": "3.1.2",
|
|
33201
|
+
"http-errors": "1.8.1",
|
|
33202
|
+
"iconv-lite": "0.4.24",
|
|
33203
|
+
"unpipe": "1.0.0"
|
|
33204
|
+
}
|
|
33205
|
+
},
|
|
33134
33206
|
"safe-buffer": {
|
|
33135
33207
|
"version": "5.2.1",
|
|
33136
33208
|
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
|
|
@@ -39110,12 +39182,12 @@
|
|
|
39110
39182
|
"integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
|
|
39111
39183
|
},
|
|
39112
39184
|
"raw-body": {
|
|
39113
|
-
"version": "2.
|
|
39114
|
-
"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.
|
|
39115
|
-
"integrity": "sha512-
|
|
39185
|
+
"version": "2.5.0",
|
|
39186
|
+
"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.0.tgz",
|
|
39187
|
+
"integrity": "sha512-XpyZ6O7PVu3ItMQl0LslfsRoKxMOxi3SzDkrOtxMES5AqLFpYjQCryxI4LGygUN2jL+RgFsPkMPPlG7cg/47+A==",
|
|
39116
39188
|
"requires": {
|
|
39117
39189
|
"bytes": "3.1.2",
|
|
39118
|
-
"http-errors": "
|
|
39190
|
+
"http-errors": "2.0.0",
|
|
39119
39191
|
"iconv-lite": "0.4.24",
|
|
39120
39192
|
"unpipe": "1.0.0"
|
|
39121
39193
|
},
|
|
@@ -39124,6 +39196,23 @@
|
|
|
39124
39196
|
"version": "3.1.2",
|
|
39125
39197
|
"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
|
|
39126
39198
|
"integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
|
|
39199
|
+
},
|
|
39200
|
+
"depd": {
|
|
39201
|
+
"version": "2.0.0",
|
|
39202
|
+
"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
|
|
39203
|
+
"integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
|
|
39204
|
+
},
|
|
39205
|
+
"http-errors": {
|
|
39206
|
+
"version": "2.0.0",
|
|
39207
|
+
"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
|
|
39208
|
+
"integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
|
|
39209
|
+
"requires": {
|
|
39210
|
+
"depd": "2.0.0",
|
|
39211
|
+
"inherits": "2.0.4",
|
|
39212
|
+
"setprototypeof": "1.2.0",
|
|
39213
|
+
"statuses": "2.0.1",
|
|
39214
|
+
"toidentifier": "1.0.1"
|
|
39215
|
+
}
|
|
39127
39216
|
}
|
|
39128
39217
|
}
|
|
39129
39218
|
},
|
|
@@ -40679,8 +40768,7 @@
|
|
|
40679
40768
|
"statuses": {
|
|
40680
40769
|
"version": "2.0.1",
|
|
40681
40770
|
"resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
|
|
40682
|
-
"integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
|
|
40683
|
-
"dev": true
|
|
40771
|
+
"integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
|
|
40684
40772
|
},
|
|
40685
40773
|
"stealthy-require": {
|
|
40686
40774
|
"version": "1.1.1",
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "netlify-cli",
|
|
3
3
|
"description": "Netlify command line tool",
|
|
4
|
-
"version": "9.
|
|
4
|
+
"version": "9.7.0",
|
|
5
5
|
"author": "Netlify Inc.",
|
|
6
6
|
"contributors": [
|
|
7
7
|
"Abraham Schilling <AbrahamSchilling@gmail.com> (https://gitlab.com/n4bb12)",
|
|
@@ -200,12 +200,12 @@
|
|
|
200
200
|
"prettier": "--ignore-path .gitignore --loglevel=warn \"{src,tools,scripts,site,tests,.github}/**/*.{mjs,cjs,js,md,yml,json,html}\" \"*.{mjs,cjs,js,yml,json,html}\" \".*.{mjs,cjs,js,yml,json,html}\" \"!CHANGELOG.md\" \"!npm-shrinkwrap.json\" \"!site/package-lock.json\" \"!.github/**/*.md\""
|
|
201
201
|
},
|
|
202
202
|
"dependencies": {
|
|
203
|
-
"@netlify/build": "^26.3.
|
|
204
|
-
"@netlify/config": "^17.0.
|
|
203
|
+
"@netlify/build": "^26.3.5",
|
|
204
|
+
"@netlify/config": "^17.0.12",
|
|
205
205
|
"@netlify/framework-info": "^9.0.2",
|
|
206
206
|
"@netlify/local-functions-proxy": "^1.1.1",
|
|
207
207
|
"@netlify/plugin-edge-handlers": "^3.0.6",
|
|
208
|
-
"@netlify/plugins-list": "^6.
|
|
208
|
+
"@netlify/plugins-list": "^6.13.1",
|
|
209
209
|
"@netlify/routing-local-proxy": "^0.34.1",
|
|
210
210
|
"@netlify/zip-it-and-ship-it": "^5.8.0",
|
|
211
211
|
"@octokit/rest": "^18.0.0",
|
|
@@ -8,8 +8,8 @@ const { injectEnvVariables } = require('../../utils')
|
|
|
8
8
|
* @param {import('../base-command').BaseCommand} command
|
|
9
9
|
*/
|
|
10
10
|
const devExec = async (cmd, options, command) => {
|
|
11
|
-
const { cachedConfig, site } = command.netlify
|
|
12
|
-
await injectEnvVariables({ env: cachedConfig.env, site })
|
|
11
|
+
const { cachedConfig, config, site } = command.netlify
|
|
12
|
+
await injectEnvVariables({ devConfig: { ...config.dev }, env: cachedConfig.env, site })
|
|
13
13
|
|
|
14
14
|
await execa(cmd, command.args.slice(1), {
|
|
15
15
|
stdio: 'inherit',
|
package/src/commands/dev/dev.js
CHANGED
|
@@ -326,7 +326,7 @@ const dev = async (options, command) => {
|
|
|
326
326
|
)
|
|
327
327
|
}
|
|
328
328
|
|
|
329
|
-
await injectEnvVariables({ env: command.netlify.cachedConfig.env, site })
|
|
329
|
+
await injectEnvVariables({ devConfig, env: command.netlify.cachedConfig.env, site })
|
|
330
330
|
|
|
331
331
|
const { addonsUrls, capabilities, siteUrl, timeouts } = await getSiteInformation({
|
|
332
332
|
// inherited from base command --offline
|
|
@@ -477,8 +477,14 @@ const createFunctionAddon = async function ({ addonName, addons, api, siteData,
|
|
|
477
477
|
* @param {(command: import('../base-command').BaseCommand) => any} config.onComplete
|
|
478
478
|
*/
|
|
479
479
|
const handleOnComplete = async ({ command, onComplete }) => {
|
|
480
|
+
const { config } = command.netlify
|
|
481
|
+
|
|
480
482
|
if (onComplete) {
|
|
481
|
-
await injectEnvVariables({
|
|
483
|
+
await injectEnvVariables({
|
|
484
|
+
devConfig: { ...config.dev },
|
|
485
|
+
env: command.netlify.cachedConfig.env,
|
|
486
|
+
site: command.netlify.site,
|
|
487
|
+
})
|
|
482
488
|
await onComplete.call(command)
|
|
483
489
|
}
|
|
484
490
|
}
|
|
@@ -491,6 +497,8 @@ const handleOnComplete = async ({ command, onComplete }) => {
|
|
|
491
497
|
* @param {string} config.fnPath
|
|
492
498
|
*/
|
|
493
499
|
const handleAddonDidInstall = async ({ addonCreated, addonDidInstall, command, fnPath }) => {
|
|
500
|
+
const { config } = command.netlify
|
|
501
|
+
|
|
494
502
|
if (!addonCreated || !addonDidInstall) {
|
|
495
503
|
return
|
|
496
504
|
}
|
|
@@ -508,7 +516,11 @@ const handleAddonDidInstall = async ({ addonCreated, addonDidInstall, command, f
|
|
|
508
516
|
return
|
|
509
517
|
}
|
|
510
518
|
|
|
511
|
-
await injectEnvVariables({
|
|
519
|
+
await injectEnvVariables({
|
|
520
|
+
devConfig: { ...config.dev },
|
|
521
|
+
env: command.netlify.cachedConfig.env,
|
|
522
|
+
site: command.netlify.site,
|
|
523
|
+
})
|
|
512
524
|
addonDidInstall(fnPath)
|
|
513
525
|
}
|
|
514
526
|
|
|
@@ -17,7 +17,7 @@ const functionsServe = async (options, command) => {
|
|
|
17
17
|
|
|
18
18
|
const functionsDir = getFunctionsDir({ options, config }, join('netlify', 'functions'))
|
|
19
19
|
|
|
20
|
-
await injectEnvVariables({ env: command.netlify.cachedConfig.env, site })
|
|
20
|
+
await injectEnvVariables({ devConfig: { ...config.dev }, env: command.netlify.cachedConfig.env, site })
|
|
21
21
|
|
|
22
22
|
const { capabilities, siteUrl, timeouts } = await getSiteInformation({
|
|
23
23
|
offline: options.offline,
|
package/src/utils/dev.js
CHANGED
|
@@ -139,9 +139,9 @@ const getEnvSourceName = (source) => {
|
|
|
139
139
|
|
|
140
140
|
// Takes a set of environment variables in the format provided by @netlify/config, augments it with variables from both
|
|
141
141
|
// dot-env files and the process itself, and injects into `process.env`.
|
|
142
|
-
const injectEnvVariables = async ({ env, site }) => {
|
|
142
|
+
const injectEnvVariables = async ({ devConfig, env, site }) => {
|
|
143
143
|
const environment = new Map(Object.entries(env))
|
|
144
|
-
const dotEnvFiles = await loadDotEnvFiles({ projectDir: site.root })
|
|
144
|
+
const dotEnvFiles = await loadDotEnvFiles({ envFiles: devConfig.envFiles, projectDir: site.root })
|
|
145
145
|
|
|
146
146
|
dotEnvFiles.forEach(({ env: fileEnv, file }) => {
|
|
147
147
|
Object.keys(fileEnv).forEach((key) => {
|
package/src/utils/dot-env.js
CHANGED
|
@@ -8,8 +8,8 @@ const { isFileAsync } = require('../lib/fs')
|
|
|
8
8
|
|
|
9
9
|
const { warn } = require('./command-helpers')
|
|
10
10
|
|
|
11
|
-
const loadDotEnvFiles = async function ({ projectDir }) {
|
|
12
|
-
const response = await tryLoadDotEnvFiles({ projectDir })
|
|
11
|
+
const loadDotEnvFiles = async function ({ envFiles, projectDir }) {
|
|
12
|
+
const response = await tryLoadDotEnvFiles({ projectDir, dotenvFiles: envFiles })
|
|
13
13
|
|
|
14
14
|
const filesWithWarning = response.filter((el) => el.warning)
|
|
15
15
|
filesWithWarning.forEach((el) => {
|
|
@@ -19,8 +19,10 @@ const loadDotEnvFiles = async function ({ projectDir }) {
|
|
|
19
19
|
return response.filter((el) => el.file && el.env)
|
|
20
20
|
}
|
|
21
21
|
|
|
22
|
-
|
|
23
|
-
|
|
22
|
+
// in the user configuration, the order is highest to lowest
|
|
23
|
+
const defaultEnvFiles = ['.env.development', '.env']
|
|
24
|
+
|
|
25
|
+
const tryLoadDotEnvFiles = async ({ projectDir, dotenvFiles = defaultEnvFiles }) => {
|
|
24
26
|
const results = await Promise.all(
|
|
25
27
|
dotenvFiles.map(async (file) => {
|
|
26
28
|
const filepath = path.resolve(projectDir, file)
|
|
@@ -40,7 +42,8 @@ const tryLoadDotEnvFiles = async ({ projectDir }) => {
|
|
|
40
42
|
}),
|
|
41
43
|
)
|
|
42
44
|
|
|
43
|
-
return
|
|
45
|
+
// we return in order of lowest to highest priority
|
|
46
|
+
return results.filter(Boolean).reverse()
|
|
44
47
|
}
|
|
45
48
|
|
|
46
49
|
module.exports = { loadDotEnvFiles, tryLoadDotEnvFiles }
|