netlify-cli 8.6.21 → 8.8.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.
Files changed (5) hide show
  1. package/npm-shrinkwrap.json +140 -294
  2. package/package.json +4 -4
  3. package/src/lib/functions/config.js +1 -0
  4. package/src/lib/functions/registry.js +11 -2
  5. package/src/utils/detect-server-settings.js +40 -26
package/npm-shrinkwrap.json CHANGED
@@ -1,18 +1,18 @@
1
1
  {
2
2
  "name": "netlify-cli",
3
- "version": "8.6.21",
3
+ "version": "8.8.0",
4
4
  "lockfileVersion": 2,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "netlify-cli",
9
- "version": "8.6.21",
9
+ "version": "8.8.0",
10
10
  "hasInstallScript": true,
11
11
  "license": "MIT",
12
12
  "dependencies": {
13
- "@netlify/build": "^26.1.0",
13
+ "@netlify/build": "^26.1.1",
14
14
  "@netlify/config": "^17.0.3",
15
- "@netlify/framework-info": "^8.0.0",
15
+ "@netlify/framework-info": "^8.0.1",
16
16
  "@netlify/local-functions-proxy": "^1.1.1",
17
17
  "@netlify/plugin-edge-handlers": "^3.0.2",
18
18
  "@netlify/plugins-list": "^6.2.1",
@@ -122,7 +122,7 @@
122
122
  "@babel/preset-react": "^7.12.13",
123
123
  "@commitlint/cli": "^16.0.0",
124
124
  "@commitlint/config-conventional": "^16.0.0",
125
- "@netlify/eslint-config-node": "^4.1.0",
125
+ "@netlify/eslint-config-node": "^4.1.2",
126
126
  "ava": "^3.15.0",
127
127
  "c8": "^7.11.0",
128
128
  "eslint-plugin-sort-destructure-keys": "^1.3.5",
@@ -2357,17 +2357,17 @@
2357
2357
  }
2358
2358
  },
2359
2359
  "node_modules/@netlify/build": {
2360
- "version": "26.1.0",
2361
- "resolved": "https://registry.npmjs.org/@netlify/build/-/build-26.1.0.tgz",
2362
- "integrity": "sha512-BZEC/8jUizGkZboc7RGGTC23KcFUH9MawpfH5ecFVM30gzL3LEdAOFZS/xvgffC3s5s2vsnZenslICowUpJueA==",
2360
+ "version": "26.1.1",
2361
+ "resolved": "https://registry.npmjs.org/@netlify/build/-/build-26.1.1.tgz",
2362
+ "integrity": "sha512-bFVNUXElPPkKOMn3/d4mxmsaxpe4QJC376yuXqZIhKMn37JCDPAfE2sBkFgMK9TjsWNqYKfsIhUtUnjFB6y2gA==",
2363
2363
  "dependencies": {
2364
2364
  "@bugsnag/js": "^7.0.0",
2365
2365
  "@netlify/cache-utils": "^4.0.0",
2366
2366
  "@netlify/config": "^17.0.0",
2367
2367
  "@netlify/functions-utils": "^4.0.0",
2368
2368
  "@netlify/git-utils": "^4.0.0",
2369
- "@netlify/plugin-edge-handlers": "^3.0.0",
2370
- "@netlify/plugins-list": "^6.2.0",
2369
+ "@netlify/plugin-edge-handlers": "^3.0.2",
2370
+ "@netlify/plugins-list": "^6.2.1",
2371
2371
  "@netlify/run-utils": "^4.0.0",
2372
2372
  "@netlify/zip-it-and-ship-it": "^5.4.0",
2373
2373
  "@sindresorhus/slugify": "^1.1.0",
@@ -2384,7 +2384,6 @@
2384
2384
  "keep-func-props": "^3.0.0",
2385
2385
  "locate-path": "^6.0.0",
2386
2386
  "log-process-errors": "^6.0.0",
2387
- "make-dir": "^3.0.2",
2388
2387
  "map-obj": "^4.0.0",
2389
2388
  "memoize-one": "^6.0.0",
2390
2389
  "os-name": "^4.0.1",
@@ -2480,6 +2479,16 @@
2480
2479
  "node": ">=6"
2481
2480
  }
2482
2481
  },
2482
+ "node_modules/@netlify/build/node_modules/cliui": {
2483
+ "version": "6.0.0",
2484
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
2485
+ "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
2486
+ "dependencies": {
2487
+ "string-width": "^4.2.0",
2488
+ "strip-ansi": "^6.0.0",
2489
+ "wrap-ansi": "^6.2.0"
2490
+ }
2491
+ },
2483
2492
  "node_modules/@netlify/build/node_modules/color-convert": {
2484
2493
  "version": "2.0.1",
2485
2494
  "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -2507,6 +2516,40 @@
2507
2516
  "node": ">=10"
2508
2517
  }
2509
2518
  },
2519
+ "node_modules/@netlify/build/node_modules/find-up": {
2520
+ "version": "4.1.0",
2521
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
2522
+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
2523
+ "dependencies": {
2524
+ "locate-path": "^5.0.0",
2525
+ "path-exists": "^4.0.0"
2526
+ },
2527
+ "engines": {
2528
+ "node": ">=8"
2529
+ }
2530
+ },
2531
+ "node_modules/@netlify/build/node_modules/find-up/node_modules/locate-path": {
2532
+ "version": "5.0.0",
2533
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
2534
+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
2535
+ "dependencies": {
2536
+ "p-locate": "^4.1.0"
2537
+ },
2538
+ "engines": {
2539
+ "node": ">=8"
2540
+ }
2541
+ },
2542
+ "node_modules/@netlify/build/node_modules/find-up/node_modules/p-locate": {
2543
+ "version": "4.1.0",
2544
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
2545
+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
2546
+ "dependencies": {
2547
+ "p-limit": "^2.2.0"
2548
+ },
2549
+ "engines": {
2550
+ "node": ">=8"
2551
+ }
2552
+ },
2510
2553
  "node_modules/@netlify/build/node_modules/get-caller-file": {
2511
2554
  "version": "2.0.5",
2512
2555
  "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
@@ -2629,6 +2672,11 @@
2629
2672
  "node": ">=8"
2630
2673
  }
2631
2674
  },
2675
+ "node_modules/@netlify/build/node_modules/y18n": {
2676
+ "version": "4.0.3",
2677
+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
2678
+ "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
2679
+ },
2632
2680
  "node_modules/@netlify/build/node_modules/yargs": {
2633
2681
  "version": "15.4.1",
2634
2682
  "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
@@ -2650,56 +2698,7 @@
2650
2698
  "node": ">=8"
2651
2699
  }
2652
2700
  },
2653
- "node_modules/@netlify/build/node_modules/yargs/node_modules/cliui": {
2654
- "version": "6.0.0",
2655
- "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
2656
- "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
2657
- "dependencies": {
2658
- "string-width": "^4.2.0",
2659
- "strip-ansi": "^6.0.0",
2660
- "wrap-ansi": "^6.2.0"
2661
- }
2662
- },
2663
- "node_modules/@netlify/build/node_modules/yargs/node_modules/find-up": {
2664
- "version": "4.1.0",
2665
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
2666
- "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
2667
- "dependencies": {
2668
- "locate-path": "^5.0.0",
2669
- "path-exists": "^4.0.0"
2670
- },
2671
- "engines": {
2672
- "node": ">=8"
2673
- }
2674
- },
2675
- "node_modules/@netlify/build/node_modules/yargs/node_modules/locate-path": {
2676
- "version": "5.0.0",
2677
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
2678
- "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
2679
- "dependencies": {
2680
- "p-locate": "^4.1.0"
2681
- },
2682
- "engines": {
2683
- "node": ">=8"
2684
- }
2685
- },
2686
- "node_modules/@netlify/build/node_modules/yargs/node_modules/p-locate": {
2687
- "version": "4.1.0",
2688
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
2689
- "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
2690
- "dependencies": {
2691
- "p-limit": "^2.2.0"
2692
- },
2693
- "engines": {
2694
- "node": ">=8"
2695
- }
2696
- },
2697
- "node_modules/@netlify/build/node_modules/yargs/node_modules/y18n": {
2698
- "version": "4.0.3",
2699
- "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
2700
- "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
2701
- },
2702
- "node_modules/@netlify/build/node_modules/yargs/node_modules/yargs-parser": {
2701
+ "node_modules/@netlify/build/node_modules/yargs-parser": {
2703
2702
  "version": "18.1.3",
2704
2703
  "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
2705
2704
  "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
@@ -2992,9 +2991,9 @@
2992
2991
  }
2993
2992
  },
2994
2993
  "node_modules/@netlify/eslint-config-node": {
2995
- "version": "4.1.0",
2996
- "resolved": "https://registry.npmjs.org/@netlify/eslint-config-node/-/eslint-config-node-4.1.0.tgz",
2997
- "integrity": "sha512-7I+5Eli0IbLj+3flcxuOX5PyrApXicGAKohWKD7KCx/wSv2buN21kC0c1+Du8Uj5ykVCbHxfpwR59MnDNsZGBw==",
2994
+ "version": "4.1.2",
2995
+ "resolved": "https://registry.npmjs.org/@netlify/eslint-config-node/-/eslint-config-node-4.1.2.tgz",
2996
+ "integrity": "sha512-QAxFDj88ENOmT7K2HhpP3OVsaadBDgTZYaivo3Mbj/1O8PWkLRZJ12Bftw21d+rbfrF/OmcUrqN8AX8yl30Fng==",
2998
2997
  "dev": true,
2999
2998
  "dependencies": {
3000
2999
  "@babel/core": "^7.13.8",
@@ -3022,7 +3021,7 @@
3022
3021
  "eslint-plugin-unicorn": "^40.0.0",
3023
3022
  "eslint-plugin-you-dont-need-lodash-underscore": "^6.10.0",
3024
3023
  "execa": "^5.0.0",
3025
- "husky": "^4.3.0",
3024
+ "husky": "^7.0.4",
3026
3025
  "is-ci": "^3.0.0",
3027
3026
  "npm-run-all": "^4.1.5",
3028
3027
  "prettier": "^2.1.2",
@@ -3038,9 +3037,9 @@
3038
3037
  }
3039
3038
  },
3040
3039
  "node_modules/@netlify/framework-info": {
3041
- "version": "8.0.0",
3042
- "resolved": "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-8.0.0.tgz",
3043
- "integrity": "sha512-8kU0+1civXPehsOcHY9DzAAFWmovkPQFt4W+Z2J86MojER5BXk6PTXhEHNcmgPSYoTejcA7vQ0nAPFErzt5gkA==",
3040
+ "version": "8.0.1",
3041
+ "resolved": "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-8.0.1.tgz",
3042
+ "integrity": "sha512-fEvnNMPTFrjHui43UVsljopAmkB4TdY3ewtL1oKhBeiIW+QjN9EexrmkosFJznjLPb/SzS9i3hkd24ae1lVPEg==",
3044
3043
  "dependencies": {
3045
3044
  "ajv": "^8.0.0",
3046
3045
  "filter-obj": "^2.0.1",
@@ -6081,12 +6080,6 @@
6081
6080
  "node": ">=8"
6082
6081
  }
6083
6082
  },
6084
- "node_modules/compare-versions": {
6085
- "version": "3.6.0",
6086
- "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz",
6087
- "integrity": "sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==",
6088
- "dev": true
6089
- },
6090
6083
  "node_modules/component-emitter": {
6091
6084
  "version": "1.3.0",
6092
6085
  "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
@@ -10030,21 +10023,6 @@
10030
10023
  "url": "https://github.com/sponsors/sindresorhus"
10031
10024
  }
10032
10025
  },
10033
- "node_modules/find-versions": {
10034
- "version": "4.0.0",
10035
- "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-4.0.0.tgz",
10036
- "integrity": "sha512-wgpWy002tA+wgmO27buH/9KzyEOQnKsG/R0yrcjPT9BOFm0zRBVQbZ95nRGXWMywS8YR5knRbpohio0bcJABxQ==",
10037
- "dev": true,
10038
- "dependencies": {
10039
- "semver-regex": "^3.1.2"
10040
- },
10041
- "engines": {
10042
- "node": ">=10"
10043
- },
10044
- "funding": {
10045
- "url": "https://github.com/sponsors/sindresorhus"
10046
- }
10047
- },
10048
10026
  "node_modules/flat-cache": {
10049
10027
  "version": "3.0.4",
10050
10028
  "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
@@ -10957,41 +10935,20 @@
10957
10935
  }
10958
10936
  },
10959
10937
  "node_modules/husky": {
10960
- "version": "4.3.8",
10961
- "resolved": "https://registry.npmjs.org/husky/-/husky-4.3.8.tgz",
10962
- "integrity": "sha512-LCqqsB0PzJQ/AlCgfrfzRe3e3+NvmefAdKQhRYpxS4u6clblBoDdzzvHi8fmxKRzvMxPY/1WZWzomPZww0Anow==",
10938
+ "version": "7.0.4",
10939
+ "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.4.tgz",
10940
+ "integrity": "sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==",
10963
10941
  "dev": true,
10964
- "hasInstallScript": true,
10965
- "dependencies": {
10966
- "chalk": "^4.0.0",
10967
- "ci-info": "^2.0.0",
10968
- "compare-versions": "^3.6.0",
10969
- "cosmiconfig": "^7.0.0",
10970
- "find-versions": "^4.0.0",
10971
- "opencollective-postinstall": "^2.0.2",
10972
- "pkg-dir": "^5.0.0",
10973
- "please-upgrade-node": "^3.2.0",
10974
- "slash": "^3.0.0",
10975
- "which-pm-runs": "^1.0.0"
10976
- },
10977
10942
  "bin": {
10978
- "husky-run": "bin/run.js",
10979
- "husky-upgrade": "lib/upgrader/bin.js"
10943
+ "husky": "lib/bin.js"
10980
10944
  },
10981
10945
  "engines": {
10982
- "node": ">=10"
10946
+ "node": ">=12"
10983
10947
  },
10984
10948
  "funding": {
10985
- "type": "opencollective",
10986
- "url": "https://opencollective.com/husky"
10949
+ "url": "https://github.com/sponsors/typicode"
10987
10950
  }
10988
10951
  },
10989
- "node_modules/husky/node_modules/ci-info": {
10990
- "version": "2.0.0",
10991
- "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
10992
- "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
10993
- "dev": true
10994
- },
10995
10952
  "node_modules/iconv-lite": {
10996
10953
  "version": "0.4.24",
10997
10954
  "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -15368,15 +15325,6 @@
15368
15325
  "url": "https://github.com/sponsors/sindresorhus"
15369
15326
  }
15370
15327
  },
15371
- "node_modules/opencollective-postinstall": {
15372
- "version": "2.0.3",
15373
- "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz",
15374
- "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==",
15375
- "dev": true,
15376
- "bin": {
15377
- "opencollective-postinstall": "index.js"
15378
- }
15379
- },
15380
15328
  "node_modules/opn": {
15381
15329
  "version": "5.5.0",
15382
15330
  "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
@@ -16165,15 +16113,6 @@
16165
16113
  "node": ">=10"
16166
16114
  }
16167
16115
  },
16168
- "node_modules/please-upgrade-node": {
16169
- "version": "3.2.0",
16170
- "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz",
16171
- "integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==",
16172
- "dev": true,
16173
- "dependencies": {
16174
- "semver-compare": "^1.0.0"
16175
- }
16176
- },
16177
16116
  "node_modules/plur": {
16178
16117
  "version": "4.0.0",
16179
16118
  "resolved": "https://registry.npmjs.org/plur/-/plur-4.0.0.tgz",
@@ -17293,12 +17232,6 @@
17293
17232
  "node": ">=10"
17294
17233
  }
17295
17234
  },
17296
- "node_modules/semver-compare": {
17297
- "version": "1.0.0",
17298
- "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
17299
- "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=",
17300
- "dev": true
17301
- },
17302
17235
  "node_modules/semver-diff": {
17303
17236
  "version": "3.1.1",
17304
17237
  "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz",
@@ -17318,18 +17251,6 @@
17318
17251
  "semver": "bin/semver.js"
17319
17252
  }
17320
17253
  },
17321
- "node_modules/semver-regex": {
17322
- "version": "3.1.3",
17323
- "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-3.1.3.tgz",
17324
- "integrity": "sha512-Aqi54Mk9uYTjVexLnR67rTyBusmwd04cLkHy9hNvk3+G3nT2Oyg7E0l4XVbOaNwIvQ3hHeYxGcyEy+mKreyBFQ==",
17325
- "dev": true,
17326
- "engines": {
17327
- "node": ">=8"
17328
- },
17329
- "funding": {
17330
- "url": "https://github.com/sponsors/sindresorhus"
17331
- }
17332
- },
17333
17254
  "node_modules/send": {
17334
17255
  "version": "0.17.2",
17335
17256
  "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz",
@@ -19781,12 +19702,6 @@
19781
19702
  "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
19782
19703
  "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
19783
19704
  },
19784
- "node_modules/which-pm-runs": {
19785
- "version": "1.0.0",
19786
- "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz",
19787
- "integrity": "sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=",
19788
- "dev": true
19789
- },
19790
19705
  "node_modules/wide-align": {
19791
19706
  "version": "1.1.5",
19792
19707
  "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
@@ -21658,17 +21573,17 @@
21658
21573
  }
21659
21574
  },
21660
21575
  "@netlify/build": {
21661
- "version": "26.1.0",
21662
- "resolved": "https://registry.npmjs.org/@netlify/build/-/build-26.1.0.tgz",
21663
- "integrity": "sha512-BZEC/8jUizGkZboc7RGGTC23KcFUH9MawpfH5ecFVM30gzL3LEdAOFZS/xvgffC3s5s2vsnZenslICowUpJueA==",
21576
+ "version": "26.1.1",
21577
+ "resolved": "https://registry.npmjs.org/@netlify/build/-/build-26.1.1.tgz",
21578
+ "integrity": "sha512-bFVNUXElPPkKOMn3/d4mxmsaxpe4QJC376yuXqZIhKMn37JCDPAfE2sBkFgMK9TjsWNqYKfsIhUtUnjFB6y2gA==",
21664
21579
  "requires": {
21665
21580
  "@bugsnag/js": "^7.0.0",
21666
21581
  "@netlify/cache-utils": "^4.0.0",
21667
21582
  "@netlify/config": "^17.0.0",
21668
21583
  "@netlify/functions-utils": "^4.0.0",
21669
21584
  "@netlify/git-utils": "^4.0.0",
21670
- "@netlify/plugin-edge-handlers": "^3.0.0",
21671
- "@netlify/plugins-list": "^6.2.0",
21585
+ "@netlify/plugin-edge-handlers": "^3.0.2",
21586
+ "@netlify/plugins-list": "^6.2.1",
21672
21587
  "@netlify/run-utils": "^4.0.0",
21673
21588
  "@netlify/zip-it-and-ship-it": "^5.4.0",
21674
21589
  "@sindresorhus/slugify": "^1.1.0",
@@ -21685,7 +21600,6 @@
21685
21600
  "keep-func-props": "^3.0.0",
21686
21601
  "locate-path": "^6.0.0",
21687
21602
  "log-process-errors": "^6.0.0",
21688
- "make-dir": "^3.0.2",
21689
21603
  "map-obj": "^4.0.0",
21690
21604
  "memoize-one": "^6.0.0",
21691
21605
  "os-name": "^4.0.1",
@@ -21751,6 +21665,16 @@
21751
21665
  "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
21752
21666
  "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
21753
21667
  },
21668
+ "cliui": {
21669
+ "version": "6.0.0",
21670
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
21671
+ "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
21672
+ "requires": {
21673
+ "string-width": "^4.2.0",
21674
+ "strip-ansi": "^6.0.0",
21675
+ "wrap-ansi": "^6.2.0"
21676
+ }
21677
+ },
21754
21678
  "color-convert": {
21755
21679
  "version": "2.0.1",
21756
21680
  "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -21772,6 +21696,33 @@
21772
21696
  "mimic-response": "^2.0.0"
21773
21697
  }
21774
21698
  },
21699
+ "find-up": {
21700
+ "version": "4.1.0",
21701
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
21702
+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
21703
+ "requires": {
21704
+ "locate-path": "^5.0.0",
21705
+ "path-exists": "^4.0.0"
21706
+ },
21707
+ "dependencies": {
21708
+ "locate-path": {
21709
+ "version": "5.0.0",
21710
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
21711
+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
21712
+ "requires": {
21713
+ "p-locate": "^4.1.0"
21714
+ }
21715
+ },
21716
+ "p-locate": {
21717
+ "version": "4.1.0",
21718
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
21719
+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
21720
+ "requires": {
21721
+ "p-limit": "^2.2.0"
21722
+ }
21723
+ }
21724
+ }
21725
+ },
21775
21726
  "get-caller-file": {
21776
21727
  "version": "2.0.5",
21777
21728
  "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
@@ -21851,6 +21802,11 @@
21851
21802
  "strip-ansi": "^6.0.0"
21852
21803
  }
21853
21804
  },
21805
+ "y18n": {
21806
+ "version": "4.0.3",
21807
+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
21808
+ "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
21809
+ },
21854
21810
  "yargs": {
21855
21811
  "version": "15.4.1",
21856
21812
  "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
@@ -21867,57 +21823,15 @@
21867
21823
  "which-module": "^2.0.0",
21868
21824
  "y18n": "^4.0.0",
21869
21825
  "yargs-parser": "^18.1.2"
21870
- },
21871
- "dependencies": {
21872
- "cliui": {
21873
- "version": "6.0.0",
21874
- "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
21875
- "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
21876
- "requires": {
21877
- "string-width": "^4.2.0",
21878
- "strip-ansi": "^6.0.0",
21879
- "wrap-ansi": "^6.2.0"
21880
- }
21881
- },
21882
- "find-up": {
21883
- "version": "4.1.0",
21884
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
21885
- "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
21886
- "requires": {
21887
- "locate-path": "^5.0.0",
21888
- "path-exists": "^4.0.0"
21889
- }
21890
- },
21891
- "locate-path": {
21892
- "version": "5.0.0",
21893
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
21894
- "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
21895
- "requires": {
21896
- "p-locate": "^4.1.0"
21897
- }
21898
- },
21899
- "p-locate": {
21900
- "version": "4.1.0",
21901
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
21902
- "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
21903
- "requires": {
21904
- "p-limit": "^2.2.0"
21905
- }
21906
- },
21907
- "y18n": {
21908
- "version": "4.0.3",
21909
- "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
21910
- "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
21911
- },
21912
- "yargs-parser": {
21913
- "version": "18.1.3",
21914
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
21915
- "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
21916
- "requires": {
21917
- "camelcase": "^5.0.0",
21918
- "decamelize": "^1.2.0"
21919
- }
21920
- }
21826
+ }
21827
+ },
21828
+ "yargs-parser": {
21829
+ "version": "18.1.3",
21830
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
21831
+ "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
21832
+ "requires": {
21833
+ "camelcase": "^5.0.0",
21834
+ "decamelize": "^1.2.0"
21921
21835
  }
21922
21836
  }
21923
21837
  }
@@ -22149,9 +22063,9 @@
22149
22063
  "integrity": "sha512-tiKmDcHM2riSVN79c0mJY/67EBDafXQAMitHuLiCDAMdtz3kfv+NqdVG5krgf5lWR8Uf8AeZrUW5Q9RP25REvw=="
22150
22064
  },
22151
22065
  "@netlify/eslint-config-node": {
22152
- "version": "4.1.0",
22153
- "resolved": "https://registry.npmjs.org/@netlify/eslint-config-node/-/eslint-config-node-4.1.0.tgz",
22154
- "integrity": "sha512-7I+5Eli0IbLj+3flcxuOX5PyrApXicGAKohWKD7KCx/wSv2buN21kC0c1+Du8Uj5ykVCbHxfpwR59MnDNsZGBw==",
22066
+ "version": "4.1.2",
22067
+ "resolved": "https://registry.npmjs.org/@netlify/eslint-config-node/-/eslint-config-node-4.1.2.tgz",
22068
+ "integrity": "sha512-QAxFDj88ENOmT7K2HhpP3OVsaadBDgTZYaivo3Mbj/1O8PWkLRZJ12Bftw21d+rbfrF/OmcUrqN8AX8yl30Fng==",
22155
22069
  "dev": true,
22156
22070
  "requires": {
22157
22071
  "@babel/core": "^7.13.8",
@@ -22179,7 +22093,7 @@
22179
22093
  "eslint-plugin-unicorn": "^40.0.0",
22180
22094
  "eslint-plugin-you-dont-need-lodash-underscore": "^6.10.0",
22181
22095
  "execa": "^5.0.0",
22182
- "husky": "^4.3.0",
22096
+ "husky": "^7.0.4",
22183
22097
  "is-ci": "^3.0.0",
22184
22098
  "npm-run-all": "^4.1.5",
22185
22099
  "prettier": "^2.1.2",
@@ -22187,9 +22101,9 @@
22187
22101
  }
22188
22102
  },
22189
22103
  "@netlify/framework-info": {
22190
- "version": "8.0.0",
22191
- "resolved": "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-8.0.0.tgz",
22192
- "integrity": "sha512-8kU0+1civXPehsOcHY9DzAAFWmovkPQFt4W+Z2J86MojER5BXk6PTXhEHNcmgPSYoTejcA7vQ0nAPFErzt5gkA==",
22104
+ "version": "8.0.1",
22105
+ "resolved": "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-8.0.1.tgz",
22106
+ "integrity": "sha512-fEvnNMPTFrjHui43UVsljopAmkB4TdY3ewtL1oKhBeiIW+QjN9EexrmkosFJznjLPb/SzS9i3hkd24ae1lVPEg==",
22193
22107
  "requires": {
22194
22108
  "ajv": "^8.0.0",
22195
22109
  "filter-obj": "^2.0.1",
@@ -24473,12 +24387,6 @@
24473
24387
  }
24474
24388
  }
24475
24389
  },
24476
- "compare-versions": {
24477
- "version": "3.6.0",
24478
- "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz",
24479
- "integrity": "sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==",
24480
- "dev": true
24481
- },
24482
24390
  "component-emitter": {
24483
24391
  "version": "1.3.0",
24484
24392
  "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
@@ -27472,15 +27380,6 @@
27472
27380
  "path-exists": "^4.0.0"
27473
27381
  }
27474
27382
  },
27475
- "find-versions": {
27476
- "version": "4.0.0",
27477
- "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-4.0.0.tgz",
27478
- "integrity": "sha512-wgpWy002tA+wgmO27buH/9KzyEOQnKsG/R0yrcjPT9BOFm0zRBVQbZ95nRGXWMywS8YR5knRbpohio0bcJABxQ==",
27479
- "dev": true,
27480
- "requires": {
27481
- "semver-regex": "^3.1.2"
27482
- }
27483
- },
27484
27383
  "flat-cache": {
27485
27384
  "version": "3.0.4",
27486
27385
  "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
@@ -28170,30 +28069,10 @@
28170
28069
  "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="
28171
28070
  },
28172
28071
  "husky": {
28173
- "version": "4.3.8",
28174
- "resolved": "https://registry.npmjs.org/husky/-/husky-4.3.8.tgz",
28175
- "integrity": "sha512-LCqqsB0PzJQ/AlCgfrfzRe3e3+NvmefAdKQhRYpxS4u6clblBoDdzzvHi8fmxKRzvMxPY/1WZWzomPZww0Anow==",
28176
- "dev": true,
28177
- "requires": {
28178
- "chalk": "^4.0.0",
28179
- "ci-info": "^2.0.0",
28180
- "compare-versions": "^3.6.0",
28181
- "cosmiconfig": "^7.0.0",
28182
- "find-versions": "^4.0.0",
28183
- "opencollective-postinstall": "^2.0.2",
28184
- "pkg-dir": "^5.0.0",
28185
- "please-upgrade-node": "^3.2.0",
28186
- "slash": "^3.0.0",
28187
- "which-pm-runs": "^1.0.0"
28188
- },
28189
- "dependencies": {
28190
- "ci-info": {
28191
- "version": "2.0.0",
28192
- "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
28193
- "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
28194
- "dev": true
28195
- }
28196
- }
28072
+ "version": "7.0.4",
28073
+ "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.4.tgz",
28074
+ "integrity": "sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==",
28075
+ "dev": true
28197
28076
  },
28198
28077
  "iconv-lite": {
28199
28078
  "version": "0.4.24",
@@ -31474,12 +31353,6 @@
31474
31353
  "is-wsl": "^2.2.0"
31475
31354
  }
31476
31355
  },
31477
- "opencollective-postinstall": {
31478
- "version": "2.0.3",
31479
- "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz",
31480
- "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==",
31481
- "dev": true
31482
- },
31483
31356
  "opn": {
31484
31357
  "version": "5.5.0",
31485
31358
  "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
@@ -32063,15 +31936,6 @@
32063
31936
  "find-up": "^5.0.0"
32064
31937
  }
32065
31938
  },
32066
- "please-upgrade-node": {
32067
- "version": "3.2.0",
32068
- "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz",
32069
- "integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==",
32070
- "dev": true,
32071
- "requires": {
32072
- "semver-compare": "^1.0.0"
32073
- }
32074
- },
32075
31939
  "plur": {
32076
31940
  "version": "4.0.0",
32077
31941
  "resolved": "https://registry.npmjs.org/plur/-/plur-4.0.0.tgz",
@@ -32916,12 +32780,6 @@
32916
32780
  "lru-cache": "^6.0.0"
32917
32781
  }
32918
32782
  },
32919
- "semver-compare": {
32920
- "version": "1.0.0",
32921
- "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
32922
- "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=",
32923
- "dev": true
32924
- },
32925
32783
  "semver-diff": {
32926
32784
  "version": "3.1.1",
32927
32785
  "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz",
@@ -32937,12 +32795,6 @@
32937
32795
  }
32938
32796
  }
32939
32797
  },
32940
- "semver-regex": {
32941
- "version": "3.1.3",
32942
- "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-3.1.3.tgz",
32943
- "integrity": "sha512-Aqi54Mk9uYTjVexLnR67rTyBusmwd04cLkHy9hNvk3+G3nT2Oyg7E0l4XVbOaNwIvQ3hHeYxGcyEy+mKreyBFQ==",
32944
- "dev": true
32945
- },
32946
32798
  "send": {
32947
32799
  "version": "0.17.2",
32948
32800
  "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz",
@@ -34872,12 +34724,6 @@
34872
34724
  "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
34873
34725
  "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
34874
34726
  },
34875
- "which-pm-runs": {
34876
- "version": "1.0.0",
34877
- "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz",
34878
- "integrity": "sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=",
34879
- "dev": true
34880
- },
34881
34727
  "wide-align": {
34882
34728
  "version": "1.1.5",
34883
34729
  "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "netlify-cli",
3
3
  "description": "Netlify command line tool",
4
- "version": "8.6.21",
4
+ "version": "8.8.0",
5
5
  "author": "Netlify Inc.",
6
6
  "contributors": [
7
7
  "Mathias Biilmann <matt@netlify.com> (https://twitter.com/biilmann)",
@@ -78,9 +78,9 @@
78
78
  "prettier": "--ignore-path .gitignore --loglevel=warn \"{src,tools,scripts,site,tests,.github}/**/*.{js,md,yml,json,html}\" \"*.{js,yml,json,html}\" \".*.{js,yml,json,html}\" \"!CHANGELOG.md\" \"!npm-shrinkwrap.json\" \"!.github/**/*.md\""
79
79
  },
80
80
  "dependencies": {
81
- "@netlify/build": "^26.1.0",
81
+ "@netlify/build": "^26.1.1",
82
82
  "@netlify/config": "^17.0.3",
83
- "@netlify/framework-info": "^8.0.0",
83
+ "@netlify/framework-info": "^8.0.1",
84
84
  "@netlify/local-functions-proxy": "^1.1.1",
85
85
  "@netlify/plugin-edge-handlers": "^3.0.2",
86
86
  "@netlify/plugins-list": "^6.2.1",
@@ -186,7 +186,7 @@
186
186
  "@babel/preset-react": "^7.12.13",
187
187
  "@commitlint/cli": "^16.0.0",
188
188
  "@commitlint/config-conventional": "^16.0.0",
189
- "@netlify/eslint-config-node": "^4.1.0",
189
+ "@netlify/eslint-config-node": "^4.1.2",
190
190
  "ava": "^3.15.0",
191
191
  "c8": "^7.11.0",
192
192
  "eslint-plugin-sort-destructure-keys": "^1.3.5",
package/src/lib/functions/config.js CHANGED
@@ -12,6 +12,7 @@ const normalizeFunctionsConfig = ({ functionsConfig = {}, projectRoot }) =>
12
12
  ignoredNodeModules: config.ignored_node_modules,
13
13
  nodeBundler: config.node_bundler === 'esbuild' ? 'esbuild_zisi' : config.node_bundler,
14
14
  processDynamicNodeImports: true,
15
+ schedule: config.schedule,
15
16
  },
16
17
  }),
17
18
  {},
package/src/lib/functions/registry.js CHANGED
@@ -1,17 +1,19 @@
1
1
  // @ts-check
2
2
  const { mkdir } = require('fs').promises
3
- const { isAbsolute, join } = require('path')
3
+ const { extname, isAbsolute, join } = require('path')
4
4
  const { env } = require('process')
5
5
 
6
6
  const terminalLink = require('terminal-link')
7
7
 
8
- const { NETLIFYDEVERR, NETLIFYDEVLOG, chalk, log, warn } = require('../../utils')
8
+ const { NETLIFYDEVERR, NETLIFYDEVLOG, NETLIFYDEVWARN, chalk, log, warn } = require('../../utils')
9
9
  const { getLogMessage } = require('../log')
10
10
 
11
11
  const { NetlifyFunction } = require('./netlify-function')
12
12
  const runtimes = require('./runtimes')
13
13
  const { watchDebounced } = require('./watcher')
14
14
 
15
+ const ZIP_EXTENSION = '.zip'
16
+
15
17
  class FunctionsRegistry {
16
18
  constructor({ capabilities, config, isConnected = false, projectRoot, settings, timeouts }) {
17
19
  this.capabilities = capabilities
@@ -141,6 +143,13 @@ class FunctionsRegistry {
141
143
  )
142
144
  }
143
145
 
146
+ // This fixes the bug described here https://github.com/netlify/zip-it-and-ship-it/issues/637
147
+ // If the current function's file is a zip bundle, we ignore it and log a helpful message.
148
+ if (extname(func.mainFile) === ZIP_EXTENSION) {
149
+ log(`${NETLIFYDEVWARN} Skipped bundled function ${chalk.yellow(name)}. Unzip the archive to load it from source.`)
150
+ return
151
+ }
152
+
144
153
  this.functions.set(name, func)
145
154
  this.buildFunctionAndWatchFiles(func)
146
155
 
package/src/utils/detect-server-settings.js CHANGED
@@ -100,6 +100,16 @@ const getDefaultDist = () => {
100
100
  return process.cwd()
101
101
  }
102
102
 
103
+ const getStaticServerPort = async ({ devConfig }) => {
104
+ const port = await acquirePort({
105
+ configuredPort: devConfig.staticServerPort,
106
+ defaultPort: DEFAULT_STATIC_PORT,
107
+ errorMessage: 'Could not acquire configured static server port',
108
+ })
109
+
110
+ return port
111
+ }
112
+
103
113
  /**
104
114
  *
105
115
  * @param {object} param0
@@ -132,11 +142,7 @@ const handleStaticServer = async ({ devConfig, options, projectDir }) => {
132
142
  const dist = options.dir || devConfig.publish || getDefaultDist()
133
143
  log(`${NETLIFYDEVWARN} Running static server from "${path.relative(path.dirname(projectDir), dist)}"`)
134
144
 
135
- const frameworkPort = await acquirePort({
136
- configuredPort: devConfig.staticServerPort,
137
- defaultPort: DEFAULT_STATIC_PORT,
138
- errorMessage: 'Could not acquire configured static server port',
139
- })
145
+ const frameworkPort = await getStaticServerPort({ devConfig })
140
146
  return {
141
147
  ...(devConfig.command && { command: devConfig.command }),
142
148
  useStaticServer: true,
@@ -156,7 +162,7 @@ const getSettingsFromFramework = (framework) => {
156
162
  dev: {
157
163
  commands: [command],
158
164
  port: frameworkPort,
159
- pollingStrategies,
165
+ pollingStrategies = [],
160
166
  },
161
167
  name: frameworkName,
162
168
  staticAssetsDirectory: staticDir,
@@ -238,6 +244,31 @@ const handleCustomFramework = ({ devConfig }) => {
238
244
  }
239
245
  }
240
246
 
247
+ const mergeSettings = async ({ devConfig, frameworkSettings = {} }) => {
248
+ const {
249
+ command: frameworkCommand,
250
+ frameworkPort: frameworkDetectedPort,
251
+ dist,
252
+ framework,
253
+ env,
254
+ pollingStrategies = [],
255
+ } = frameworkSettings
256
+
257
+ const command = devConfig.command || frameworkCommand
258
+ const frameworkPort = devConfig.targetPort || frameworkDetectedPort
259
+ // if the framework doesn't start a server, we use a static one
260
+ const useStaticServer = !(command && frameworkPort)
261
+ return {
262
+ command,
263
+ frameworkPort: useStaticServer ? await getStaticServerPort({ devConfig }) : frameworkPort,
264
+ dist: devConfig.publish || dist || getDefaultDist(),
265
+ framework,
266
+ env,
267
+ pollingStrategies,
268
+ useStaticServer,
269
+ }
270
+ }
271
+
241
272
  /**
242
273
  * Handles a forced framework and retrieves the settings for it
243
274
  * @param {*} param0
@@ -245,17 +276,8 @@ const handleCustomFramework = ({ devConfig }) => {
245
276
  */
246
277
  const handleForcedFramework = async ({ devConfig, projectDir }) => {
247
278
  // this throws if `devConfig.framework` is not a supported framework
248
- const { command, dist, env, framework, frameworkPort, pollingStrategies } = getSettingsFromFramework(
249
- await getFramework(devConfig.framework, { projectDir }),
250
- )
251
- return {
252
- command: devConfig.command || command,
253
- frameworkPort: devConfig.targetPort || frameworkPort,
254
- dist: devConfig.publish || dist,
255
- framework,
256
- env,
257
- pollingStrategies,
258
- }
279
+ const frameworkSettings = getSettingsFromFramework(await getFramework(devConfig.framework, { projectDir }))
280
+ return mergeSettings({ devConfig, frameworkSettings })
259
281
  }
260
282
 
261
283
  /**
@@ -285,15 +307,7 @@ const detectServerSettings = async (devConfig, options, projectDir) => {
285
307
  settings = await handleStaticServer({ options, devConfig, projectDir })
286
308
  } else {
287
309
  validateFrameworkConfig({ devConfig })
288
- const { command, frameworkPort, dist, framework, env, pollingStrategies = [] } = frameworkSettings || {}
289
- settings = {
290
- command: devConfig.command || command,
291
- frameworkPort: devConfig.targetPort || frameworkPort,
292
- dist: devConfig.publish || dist || getDefaultDist(),
293
- framework,
294
- env,
295
- pollingStrategies,
296
- }
310
+ settings = await mergeSettings({ devConfig, frameworkSettings })
297
311
  }
298
312
  } else if (devConfig.framework === '#custom') {
299
313
  validateFrameworkConfig({ devConfig })