From c7b1308448fd0ce9a3f2483936ccad560737729b Mon Sep 17 00:00:00 2001 From: Josh Rose Date: Tue, 27 Feb 2024 12:29:21 +0100 Subject: [PATCH 1/6] feat: add ci --- .github/workflows/ci.yml | 25 +++++++++++++++++++++++++ .nvmrc | 1 + 2 files changed, 26 insertions(+) create mode 100644 .github/workflows/ci.yml create mode 100644 .nvmrc diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..e2b4d4a --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,25 @@ +--- +name: CI +on: + pull_request: + branches: + - main +permissions: + contents: read +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Install Node + uses: actions/setup-node@v4 + with: + node-version-file: .nvmrc + - name: Install dependencies + run: npm ci + - name: Build + run: npm run build \ No newline at end of file diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 0000000..726a201 --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +20.11.1 \ No newline at end of file From 8ee67d214c4287a486ed86f35ce2efabe6a65e91 Mon Sep 17 00:00:00 2001 From: Josh Rose Date: Tue, 27 Feb 2024 12:29:30 +0100 Subject: [PATCH 2/6] feat: add deploys --- .github/workflows/deploy.yml | 39 ++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .github/workflows/deploy.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..01c9d70 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,39 @@ +--- +name: Deploy to Pages +on: + push: + branches: ["main"] + workflow_dispatch: +permissions: + contents: read + pages: write + id-token: write +concurrency: + group: "pages" + cancel-in-progress: false +jobs: + deploy: + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Install Node + uses: actions/setup-node@v4 + with: + node-version-file: .nvmrc + - name: Install dependencies + run: npm ci + - name: Build + run: npm run build + - name: Setup Pages + uses: actions/configure-pages@v4 + - name: Upload artifact + uses: actions/upload-pages-artifact@v3 + with: + path: './dist' + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v4 From b0b54f09684c8361bc16d024eb83b543139f8e26 Mon Sep 17 00:00:00 2001 From: Josh Rose Date: Tue, 27 Feb 2024 12:58:40 +0100 Subject: [PATCH 3/6] fix: upgrade diamond ui to fix css issue --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 36fe42b..cf9a906 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "@etchteam/diamond-ui": "1.25.2" + "@etchteam/diamond-ui": "^1.27.1" }, "devDependencies": { "@parcel/packager-raw-url": "2.11.0", @@ -180,9 +180,9 @@ } }, "node_modules/@etchteam/diamond-ui": { - "version": "1.25.2", - "resolved": "https://registry.npmjs.org/@etchteam/diamond-ui/-/diamond-ui-1.25.2.tgz", - "integrity": "sha512-575rD3HGv66HWiZyU+xjXpKDYFdP5ZFl3qUf6vHsaeGffvey0nxyL1SAOfiIi6ifxh9DRyGg2XIXVHSxQ/FuHA==", + "version": "1.27.1", + "resolved": "https://registry.npmjs.org/@etchteam/diamond-ui/-/diamond-ui-1.27.1.tgz", + "integrity": "sha512-jUu7LqqXcQPhalYR2dd+UreGqaX6BHzcQ3DWYIDVlvGPTra4RsdHxfcHH0U3BqHPcauLt50dcT4brRLpRoc/Tg==", "dependencies": { "lit": "^3.1.0", "modern-normalize": "2.0.0" diff --git a/package.json b/package.json index cd6edcf..c52d4ff 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,6 @@ "parcel": "2.11.0" }, "dependencies": { - "@etchteam/diamond-ui": "1.25.2" + "@etchteam/diamond-ui": "^1.27.1" } } From 896455bad112442849041290f44f113b75fa42f0 Mon Sep 17 00:00:00 2001 From: Josh Rose Date: Tue, 27 Feb 2024 13:02:57 +0100 Subject: [PATCH 4/6] style: add newlines --- .github/workflows/ci.yml | 2 +- .nvmrc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e2b4d4a..5cd5784 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,4 +22,4 @@ jobs: - name: Install dependencies run: npm ci - name: Build - run: npm run build \ No newline at end of file + run: npm run build diff --git a/.nvmrc b/.nvmrc index 726a201..2dbbe00 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -20.11.1 \ No newline at end of file +20.11.1 From 0c063bc1448e359f48db56e9016d20a514219851 Mon Sep 17 00:00:00 2001 From: Josh Rose Date: Tue, 27 Feb 2024 14:37:40 +0100 Subject: [PATCH 5/6] fix: upgrade diamond-ui to fix another invalid selector --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index cf9a906..6be26d0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "@etchteam/diamond-ui": "^1.27.1" + "@etchteam/diamond-ui": "^1.27.2" }, "devDependencies": { "@parcel/packager-raw-url": "2.11.0", @@ -180,9 +180,9 @@ } }, "node_modules/@etchteam/diamond-ui": { - "version": "1.27.1", - "resolved": "https://registry.npmjs.org/@etchteam/diamond-ui/-/diamond-ui-1.27.1.tgz", - "integrity": "sha512-jUu7LqqXcQPhalYR2dd+UreGqaX6BHzcQ3DWYIDVlvGPTra4RsdHxfcHH0U3BqHPcauLt50dcT4brRLpRoc/Tg==", + "version": "1.27.2", + "resolved": "https://registry.npmjs.org/@etchteam/diamond-ui/-/diamond-ui-1.27.2.tgz", + "integrity": "sha512-PvI5J2Rsg+On+gfW12bNhVmB8FyRSk6OvYlGfQOZ/ZlrWlZp2fqu0bE0upX7UUDggysOGsJjfhCBJa9iiMPlLg==", "dependencies": { "lit": "^3.1.0", "modern-normalize": "2.0.0" diff --git a/package.json b/package.json index c52d4ff..490ba0e 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,6 @@ "parcel": "2.11.0" }, "dependencies": { - "@etchteam/diamond-ui": "^1.27.1" + "@etchteam/diamond-ui": "^1.27.2" } } From 0fa517adefb793b41ec42700b91073e5a44dec39 Mon Sep 17 00:00:00 2001 From: Josh Rose Date: Tue, 27 Feb 2024 14:38:19 +0100 Subject: [PATCH 6/6] fix: temporarily disable css optimisation --- .parcelrc | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .parcelrc diff --git a/.parcelrc b/.parcelrc new file mode 100644 index 0000000..40540d0 --- /dev/null +++ b/.parcelrc @@ -0,0 +1,6 @@ +{ + "extends": ["@parcel/config-default"], + "optimizers": { + "*.css": [] + } +} \ No newline at end of file