Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make running with Plug'n Play possible on node 13 #7650

Merged
merged 6 commits into from Nov 7, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
47 changes: 45 additions & 2 deletions .circleci/config.yml
Expand Up @@ -7,7 +7,7 @@ docker_defaults: &docker_defaults

macos_defaults: &macos_defaults
macos:
xcode: "9.0"
xcode: "11.0"
working_directory: ~/project/yarn

attach_workspace: &attach_workspace
Expand Down Expand Up @@ -122,6 +122,16 @@ jobs:
root: ~/project
paths:
- yarn
test-pkg-tests-linux-node13:
<<: *docker_defaults
docker:
- image: node:13
<<: *pkg_tests
test-pkg-tests-linux-node12:
<<: *docker_defaults
docker:
- image: node:12
<<: *pkg_tests
test-pkg-tests-linux-node10:
<<: *docker_defaults
docker:
Expand All @@ -130,8 +140,20 @@ jobs:
test-pkg-tests-linux-node8:
<<: *docker_defaults
<<: *pkg_tests
test-linux-node13:
<<: *docker_defaults
docker:
- image: node:13
<<: *test_steps
test-linux-node12:
<<: *docker_defaults
docker:
- image: node:12
<<: *test_steps
test-linux-node10:
<<: *docker_defaults
docker:
- image: node:10
<<: *test_steps
test-linux-node8:
<<: *docker_defaults
Expand All @@ -155,7 +177,6 @@ jobs:
name: Install Node 10
command: |
brew uninstall --ignore-dependencies node
brew update
HOMEBREW_NO_AUTO_UPDATE=1 brew install node@10
brew link --overwrite --force node@10
[[ $(node --version) =~ ^v10\. ]]
Expand All @@ -177,6 +198,8 @@ jobs:
- *test_run
test-macos-node6:
<<: *macos_defaults
macos:
xcode: "9.0"
steps:
- run:
name: Install Node 6
Expand Down Expand Up @@ -248,6 +271,14 @@ workflows:
filters: *default_filters
requires:
- install
- test-pkg-tests-linux-node13:
filters: *default_filters
requires:
- install
- test-pkg-tests-linux-node12:
filters: *default_filters
requires:
- install
- test-pkg-tests-linux-node10:
filters: *default_filters
requires:
Expand All @@ -256,6 +287,14 @@ workflows:
filters: *default_filters
requires:
- install
- test-linux-node13:
filters: *default_filters
requires:
- install
- test-linux-node12:
filters: *default_filters
requires:
- install
- test-linux-node10:
filters: *default_filters
requires:
Expand Down Expand Up @@ -294,8 +333,12 @@ workflows:
branches:
ignore: /.*/
requires:
- test-pkg-tests-linux-node13
- test-pkg-tests-linux-node12
- test-pkg-tests-linux-node10
- test-pkg-tests-linux-node8
- test-linux-node13
- test-linux-node12
- test-linux-node10
- test-linux-node8
- test-linux-node6
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Expand Up @@ -4,10 +4,15 @@ Please add one entry in this file for each change in Yarn's behavior. Use the sa

## Master

- Makes running scripts with Plug'n Play possible on node 13

[#7650](https://github.com/yarnpkg/yarn/pull/7650) - [**Sander Verweij**](https://github.com/sverweij)

- Change run command to check cwd/node_modules/.bin for commands. Fixes run in workspaces.

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


## 1.19.1

**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.
Expand Down
12 changes: 12 additions & 0 deletions azure-pipelines.yml
Expand Up @@ -13,6 +13,10 @@ jobs:
# node_version: 8.x
node_10_x:
node_version: 10.x
node_12_x:
node_version: 12.x
node_13_x:
node_version: 13.x

steps:
- template: scripts/azure-run-tests.yml
Expand All @@ -30,6 +34,10 @@ jobs:
node_version: 8.x
node_10_x:
node_version: 10.x
node_12_x:
node_version: 12.x
node_13_x:
node_version: 13.x

steps:
- template: scripts/azure-run-tests.yml
Expand All @@ -47,6 +55,10 @@ jobs:
node_version: 8.x
node_10_x:
node_version: 10.x
node_12_x:
node_version: 12.x
node_13_x:
node_version: 13.x

steps:
- template: scripts/azure-run-tests.yml
2 changes: 1 addition & 1 deletion src/util/generate-pnp-map-api.tpl.js
Expand Up @@ -714,7 +714,7 @@ exports.setup = function setup() {
return originalFindPath.call(Module, request, paths, isMain);
}

for (const path of paths) {
for (const path of paths || []) {
let resolution;

try {
Expand Down