Skip to content

Commit 1ec3190

Browse files
sverweijarcanis
authored andcommitted
make running with Plug'n Play possible on node 13 (#7650)
* ci(circleci): prevent timeout on circle-ci macos node10 build The circle ci job for macOS on node 10 currently fails because it takes too long (both PR's #7649 and #7650 don't green because of that). A big chunk of the time is taken by updating homebrew - which in this macOS (the one connected to xcode 9 => macOS 10.12) does not contain node 10 by default. This change: - sets the required xcode version to 11.0 -> this gets us a more up to date macOS version (except for node 6, which isn't available in the homebrew associated with xcode 11) - removes the brew update from the macOS node 10 job * fix(generate-pnp-map-api.tpl.js): make running with Plug'n Play possible on node 13 On node 13 Module._findPath (which the setup() of this module redefines) also gets called with null for the path parameter (by lib/internal/bootstrap/pre_execution.js in the (new) function resolveMainPath). This fix ensures the patched _findPath also handles that situation. * ci(azure-pipelines): add node 13 (and 12) to the azure-pipeline matrix #7642 * ci(circleci): add node 13 (and 12) to the build matrix (linux) * docs(CHANGELOG.md): adds PR #7650 to the change log
1 parent 730d390 commit 1ec3190

File tree

4 files changed

+60
-1
lines changed

4 files changed

+60
-1
lines changed

.circleci/config.yml

+42
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,16 @@ jobs:
122122
root: ~/project
123123
paths:
124124
- yarn
125+
test-pkg-tests-linux-node13:
126+
<<: *docker_defaults
127+
docker:
128+
- image: node:13
129+
<<: *pkg_tests
130+
test-pkg-tests-linux-node12:
131+
<<: *docker_defaults
132+
docker:
133+
- image: node:12
134+
<<: *pkg_tests
125135
test-pkg-tests-linux-node10:
126136
<<: *docker_defaults
127137
docker:
@@ -130,8 +140,20 @@ jobs:
130140
test-pkg-tests-linux-node8:
131141
<<: *docker_defaults
132142
<<: *pkg_tests
143+
test-linux-node13:
144+
<<: *docker_defaults
145+
docker:
146+
- image: node:13
147+
<<: *test_steps
148+
test-linux-node12:
149+
<<: *docker_defaults
150+
docker:
151+
- image: node:12
152+
<<: *test_steps
133153
test-linux-node10:
134154
<<: *docker_defaults
155+
docker:
156+
- image: node:10
135157
<<: *test_steps
136158
test-linux-node8:
137159
<<: *docker_defaults
@@ -249,6 +271,14 @@ workflows:
249271
filters: *default_filters
250272
requires:
251273
- install
274+
- test-pkg-tests-linux-node13:
275+
filters: *default_filters
276+
requires:
277+
- install
278+
- test-pkg-tests-linux-node12:
279+
filters: *default_filters
280+
requires:
281+
- install
252282
- test-pkg-tests-linux-node10:
253283
filters: *default_filters
254284
requires:
@@ -257,6 +287,14 @@ workflows:
257287
filters: *default_filters
258288
requires:
259289
- install
290+
- test-linux-node13:
291+
filters: *default_filters
292+
requires:
293+
- install
294+
- test-linux-node12:
295+
filters: *default_filters
296+
requires:
297+
- install
260298
- test-linux-node10:
261299
filters: *default_filters
262300
requires:
@@ -295,8 +333,12 @@ workflows:
295333
branches:
296334
ignore: /.*/
297335
requires:
336+
- test-pkg-tests-linux-node13
337+
- test-pkg-tests-linux-node12
298338
- test-pkg-tests-linux-node10
299339
- test-pkg-tests-linux-node8
340+
- test-linux-node13
341+
- test-linux-node12
300342
- test-linux-node10
301343
- test-linux-node8
302344
- test-linux-node6

CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,15 @@ Please add one entry in this file for each change in Yarn's behavior. Use the sa
44

55
## Master
66

7+
- Makes running scripts with Plug'n Play possible on node 13
8+
9+
[#7650](https://github.com/yarnpkg/yarn/pull/7650) - [**Sander Verweij**](https://github.com/sverweij)
10+
711
- Change run command to check cwd/node_modules/.bin for commands. Fixes run in workspaces.
812

913
[#7151](https://github.com/yarnpkg/yarn/pull/7151) - [**Jeff Valore**](https://twitter.com/codingwithspike)
1014

15+
1116
## 1.19.1
1217

1318
**Important:** This release contains a cache bump. It will cause the very first install following the upgrade to take slightly more time, especially if you don't use the [Offline Mirror](https://yarnpkg.com/blog/2016/11/24/offline-mirror/) feature. After that everything will be back to normal.

azure-pipelines.yml

+12
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ jobs:
1313
# node_version: 8.x
1414
node_10_x:
1515
node_version: 10.x
16+
node_12_x:
17+
node_version: 12.x
18+
node_13_x:
19+
node_version: 13.x
1620

1721
steps:
1822
- template: scripts/azure-run-tests.yml
@@ -30,6 +34,10 @@ jobs:
3034
node_version: 8.x
3135
node_10_x:
3236
node_version: 10.x
37+
node_12_x:
38+
node_version: 12.x
39+
node_13_x:
40+
node_version: 13.x
3341

3442
steps:
3543
- template: scripts/azure-run-tests.yml
@@ -47,6 +55,10 @@ jobs:
4755
node_version: 8.x
4856
node_10_x:
4957
node_version: 10.x
58+
node_12_x:
59+
node_version: 12.x
60+
node_13_x:
61+
node_version: 13.x
5062

5163
steps:
5264
- template: scripts/azure-run-tests.yml

src/util/generate-pnp-map-api.tpl.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,7 @@ exports.setup = function setup() {
714714
return originalFindPath.call(Module, request, paths, isMain);
715715
}
716716

717-
for (const path of paths) {
717+
for (const path of paths || []) {
718718
let resolution;
719719

720720
try {

0 commit comments

Comments
 (0)