From c5ee23e76884c6f3dca1939bd16d9608cd46802f Mon Sep 17 00:00:00 2001
From: Smittyvb <me@smitop.com>
Date: Mon, 11 Jan 2021 12:09:55 -0500
Subject: [PATCH 1/8] Test on Github Actions

---
 .github/workflows/ci.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 .github/workflows/ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..a23e41cd
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,20 @@
+name: CI
+on: [push, pull_request]
+jobs:
+  Tests:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        node-version: [ '8', '10', '12', '14' ]
+        os: [ubuntu-latest, windows-latest, macOS-latest]
+    name: Test on Node v${{ matrix.node-version }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup node
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: npm install
+      - run: npm run all
+        env:
+          CI: true

From e9698d9d8673c4d8d59f4239b83b035ff207e24a Mon Sep 17 00:00:00 2001
From: Smittyvb <me@smitop.com>
Date: Mon, 11 Jan 2021 12:12:14 -0500
Subject: [PATCH 2/8] Include the OS used in the build name

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a23e41cd..58071d73 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ jobs:
       matrix:
         node-version: [ '8', '10', '12', '14' ]
         os: [ubuntu-latest, windows-latest, macOS-latest]
-    name: Test on Node v${{ matrix.node-version }}
+    name: Test on Node v${{ matrix.node-version }} on ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
       - name: Setup node

From bfd49f0ffcaf49f3ff6cbac865902d8b8470af13 Mon Sep 17 00:00:00 2001
From: Smittyvb <me@smitop.com>
Date: Mon, 11 Jan 2021 12:17:23 -0500
Subject: [PATCH 3/8] Don't test on MacOS due to flakyness

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 58071d73..5be55d90 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ jobs:
     strategy:
       matrix:
         node-version: [ '8', '10', '12', '14' ]
-        os: [ubuntu-latest, windows-latest, macOS-latest]
+        os: [ubuntu-latest, windows-latest]
     name: Test on Node v${{ matrix.node-version }} on ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2

From d01b2d94cdad38a2d6036759f57758d3483759be Mon Sep 17 00:00:00 2001
From: Smittyvb <me@smitop.com>
Date: Mon, 11 Jan 2021 12:22:24 -0500
Subject: [PATCH 4/8] Fix tests on Windows

---
 test/loader.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/loader.spec.js b/test/loader.spec.js
index 3195712c..c313242d 100644
--- a/test/loader.spec.js
+++ b/test/loader.spec.js
@@ -9,7 +9,7 @@ chai.use(sinonChai);
 const { expect } = chai;
 
 function d([str]) {
-	return str.replace(/^\t+/gm, '').trim();
+	return str.replace(/^\t+/gm, '').replace(/\r/g, "").trim();
 }
 
 describe('loader', () => {

From 1ed6e941b38253eb98c17d59886d0c94978e4aab Mon Sep 17 00:00:00 2001
From: Smittyvb <me@smitop.com>
Date: Mon, 11 Jan 2021 12:27:54 -0500
Subject: [PATCH 5/8] Ignore newline differences in validation test

---
 test/loader.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/loader.spec.js b/test/loader.spec.js
index c313242d..8204b1c4 100644
--- a/test/loader.spec.js
+++ b/test/loader.spec.js
@@ -88,7 +88,7 @@ describe('loader', () => {
 			) {
 				expect(err).to.exist;
 
-				expect(err.message.trim()).to.eql(d`
+				expect(err.message.trim().replace(/\r/g, "")).to.eql(d`
 					ValidationError: A component cannot have a default export (2:1)
 					1: <script>
 					2:   export default {};

From 24f81e762fa9d514fff9f2fff47f74c97522a919 Mon Sep 17 00:00:00 2001
From: Smittyvb <me@smitop.com>
Date: Mon, 11 Jan 2021 12:31:09 -0500
Subject: [PATCH 6/8] Get rid of Travis config

---
 .travis.yml | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 5cc64626..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-language: node_js
-node_js:
-- '8'
-- '10'
-- '12'
-- '14'
-
-script:
-- npm run all
\ No newline at end of file

From a3abea37fd56f74472bff634043859c72c4bec2a Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Mon, 11 Jan 2021 09:39:11 -0800
Subject: [PATCH 7/8] Update test/loader.spec.js

---
 test/loader.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/loader.spec.js b/test/loader.spec.js
index 8204b1c4..55448a71 100644
--- a/test/loader.spec.js
+++ b/test/loader.spec.js
@@ -9,7 +9,7 @@ chai.use(sinonChai);
 const { expect } = chai;
 
 function d([str]) {
-	return str.replace(/^\t+/gm, '').replace(/\r/g, "").trim();
+	return str.replace(/^\t+/gm, '').replace(/\r/g, '').trim();
 }
 
 describe('loader', () => {

From 6da82d3395e20802df55e9cf92d3277bb30968d8 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Mon, 11 Jan 2021 09:39:31 -0800
Subject: [PATCH 8/8] Update test/loader.spec.js

---
 test/loader.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/loader.spec.js b/test/loader.spec.js
index 55448a71..e5366a9d 100644
--- a/test/loader.spec.js
+++ b/test/loader.spec.js
@@ -88,7 +88,7 @@ describe('loader', () => {
 			) {
 				expect(err).to.exist;
 
-				expect(err.message.trim().replace(/\r/g, "")).to.eql(d`
+				expect(err.message.trim().replace(/\r/g, '')).to.eql(d`
 					ValidationError: A component cannot have a default export (2:1)
 					1: <script>
 					2:   export default {};