From 33b01bb0e358202b074ad9865c5d3aa22e80f4ce Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Wed, 27 Feb 2019 15:55:56 -0500
Subject: [PATCH 1/4] Use PnP aware Yarn in CI.

---
 .travis.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 151eef6..e9964df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,3 +10,8 @@ node_js:
 
 cache:
   yarn: true
+
+before_install:
+  - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.13.0
+  - export PATH="$HOME/.yarn/bin:$PATH"
+  - yarn --version

From 616def5bc994be3b606ee9a52ca667aebbf8e4fd Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Wed, 27 Feb 2019 16:05:30 -0500
Subject: [PATCH 2/4] Fix PnP test

---
 tests/index-tests.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/index-tests.js b/tests/index-tests.js
index cbc1b46..8f55e54 100644
--- a/tests/index-tests.js
+++ b/tests/index-tests.js
@@ -67,7 +67,7 @@ describe('resolve-package-path', function() {
           app.pkg.private = true;
           app.pkg.name
           app.pkg.scripts = {
-            test: "node -e 'require(\"resolve-package-path\")(\"ember-source-channel-url\", __dirname)'"
+            test: "node -r ./.pnp.js -e 'require(\"resolve-package-path\")(\"ember-source-channel-url\", __dirname)'"
           };
           app.pkg.installConfig = {
             pnp: true

From cb9c0a41d7f7f5d097d95f372486984d6e0790e9 Mon Sep 17 00:00:00 2001
From: Stefan Penner <stefan.penner@gmail.com>
Date: Wed, 27 Feb 2019 14:49:20 -0800
Subject: [PATCH 3/4] Force latest yarn

---
 appveyor.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/appveyor.yml b/appveyor.yml
index 4f47099..e50c567 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,6 +12,7 @@ environment:
 
 install:
   - ps: Install-Product node $env:nodejs_version
+  - choco install yarn --version=1.13.0
   - appveyor-retry yarn
   - appveyor-retry yarn add mocha-appveyor-reporter # must be installed locally.
 

From 9d9417424db952761dd301e44eb4bfb4929c9efd Mon Sep 17 00:00:00 2001
From: Stefan Penner <stefan.penner@gmail.com>
Date: Wed, 27 Feb 2019 14:56:18 -0800
Subject: [PATCH 4/4] =?UTF-8?q?Extract=20PNP=20test=20from=20inline=20scri?=
 =?UTF-8?q?pt=20to=20it=E2=80=99s=20own=20file=20to=20avoid=20cross=20plat?=
 =?UTF-8?q?form=20escaping=20issues?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/index-tests.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/index-tests.js b/tests/index-tests.js
index 8f55e54..d9a55d5 100644
--- a/tests/index-tests.js
+++ b/tests/index-tests.js
@@ -67,13 +67,16 @@ describe('resolve-package-path', function() {
           app.pkg.private = true;
           app.pkg.name
           app.pkg.scripts = {
-            test: "node -r ./.pnp.js -e 'require(\"resolve-package-path\")(\"ember-source-channel-url\", __dirname)'"
+            test: "node -r ./.pnp.js ./test.js"
           };
           app.pkg.installConfig = {
             pnp: true
           };
           app.addDependency('ember-source-channel-url', '1.1.0');
           app.addDependency('resolve-package-path', 'link:' + path.join(__dirname, '..'));
+          app.files = {
+            'test.js': 'require("resolve-package-path")("ember-source-channel-url", __dirname)'
+          };
         });
 
         app.writeSync();