Skip to content

Commit f7cc91f

Browse files
tudddorrrtudddorrr
authored
Merge pull request #246 from TaloDev/develop
Release 0.27.0
2 parents 8fb9e14 + 4b4b82a commit f7cc91f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+9990
-5918
lines changed

.eslintrc.js renamed to .eslintrc.cjs

File renamed without changes.

‎.github/workflows/ci.yml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,40 +7,40 @@ jobs:
77
runs-on: ubuntu-latest
88

99
steps:
10-
- uses: actions/checkout@v3
11-
- uses: actions/setup-node@v3
10+
- uses: actions/checkout@v4
11+
- uses: actions/setup-node@v4
1212
with:
1313
node-version: 20
1414

15-
- uses: actions/cache@v3
15+
- uses: actions/cache@v4
1616
with:
1717
path: '**/node_modules'
18-
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
18+
key: ${{ runner.os }}-modules-${{ hashFiles('**/package-lock.json') }}
1919

2020
- name: Install deps
21-
run: yarn --prefer-offline
21+
run: npm ci --prefer-offline
2222

23-
- run: yarn test --silent --coverage
23+
- run: npm test -- --silent --coverage
2424

25-
- uses: codecov/codecov-action@v3
25+
- uses: codecov/codecov-action@v4
2626
with:
2727
token: ${{ secrets.CODECOV_TOKEN }}
2828

2929
e2e-tests:
3030
runs-on: ubuntu-latest
3131

3232
steps:
33-
- uses: actions/checkout@v3
34-
- uses: actions/setup-node@v3
33+
- uses: actions/checkout@v4
34+
- uses: actions/setup-node@v4
3535
with:
3636
node-version: 20
3737

3838
- name: Run Cypress
39-
uses: cypress-io/github-action@v5
39+
uses: cypress-io/github-action@v6
4040
with:
41-
cache-key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
42-
install-command: yarn --prefer-offline
43-
start: yarn dev:e2e
41+
cache-key: ${{ runner.os }}-modules-${{ hashFiles('**/package-lock.json') }}
42+
install-command: npm ci --prefer-offline
43+
start: npm run dev:e2e
4444
wait-on: 'http://127.0.0.1:8080'
4545
env:
4646
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -49,38 +49,38 @@ jobs:
4949
runs-on: ubuntu-latest
5050

5151
steps:
52-
- uses: actions/checkout@v3
53-
- uses: actions/setup-node@v3
52+
- uses: actions/checkout@v4
53+
- uses: actions/setup-node@v4
5454
with:
5555
node-version: 20
5656

57-
- uses: actions/cache@v3
57+
- uses: actions/cache@v4
5858
with:
5959
path: '**/node_modules'
60-
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
60+
key: ${{ runner.os }}-modules-${{ hashFiles('**/package-lock.json') }}
6161

6262
- name: Install deps
63-
run: yarn --prefer-offline
63+
run: npm ci --prefer-offline
6464

6565
- name: Build
66-
run: yarn build
66+
run: npm run build
6767

6868
lint:
6969
runs-on: ubuntu-latest
7070

7171
steps:
72-
- uses: actions/checkout@v3
73-
- uses: actions/setup-node@v3
72+
- uses: actions/checkout@v4
73+
- uses: actions/setup-node@v4
7474
with:
7575
node-version: 20
7676

77-
- uses: actions/cache@v3
77+
- uses: actions/cache@v4
7878
with:
7979
path: '**/node_modules'
80-
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
80+
key: ${{ runner.os }}-modules-${{ hashFiles('**/package-lock.json') }}
8181

8282
- name: Install deps
83-
run: yarn --prefer-offline
83+
run: npm ci --prefer-offline
8484

8585
- name: Lint
86-
run: yarn eslint
86+
run: npx eslint

‎.github/workflows/create-release.yml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
name: Release
32

43
on:
@@ -8,29 +7,29 @@ jobs:
87
release:
98
runs-on: ubuntu-latest
109
steps:
11-
- uses: actions/checkout@v3
10+
- uses: actions/checkout@v4
1211
with:
1312
fetch-depth: 0
1413

15-
- uses: actions/setup-node@v3
14+
- uses: actions/setup-node@v4
1615
with:
1716
node-version: 20
1817

19-
- uses: actions/cache@v3
18+
- uses: actions/cache@v4
2019
with:
2120
path: '**/node_modules'
22-
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
21+
key: ${{ runner.os }}-modules-${{ hashFiles('**/package-lock.json') }}
2322

2423
- name: Install deps
25-
run: yarn --prefer-offline
24+
run: npm ci --prefer-offline
2625

2726
- name: Build
2827
env:
2928
ENABLE_SOURCEMAPS: true
30-
run: yarn build
29+
run: npm run build
3130

3231
- name: Create GitHub release
33-
uses: softprops/action-gh-release@v1
32+
uses: softprops/action-gh-release@v2
3433
if: "!contains(github.event.head_commit.message, '--no-release')"
3534
with:
3635
generate_release_notes: true

‎.github/workflows/docker.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@ jobs:
1010
- run: echo "TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
1111

1212
- name: Set up QEMU
13-
uses: docker/setup-qemu-action@v2
13+
uses: docker/setup-qemu-action@v3
1414

1515
- name: Set up Docker Buildx
16-
uses: docker/setup-buildx-action@v2
16+
uses: docker/setup-buildx-action@v3
1717

1818
- name: Login to DockerHub
19-
uses: docker/login-action@v2
19+
uses: docker/login-action@v3
2020
with:
2121
registry: ghcr.io
2222
username: ${{ github.actor }}
2323
password: ${{ secrets.GITHUB_TOKEN }}
2424

2525
- name: Build and push
2626
id: docker_build
27-
uses: docker/build-push-action@v4
27+
uses: docker/build-push-action@v5
2828
with:
2929
push: true
3030
tags: |

‎.github/workflows/tag.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
tag:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v4
1212

1313
- name: Check version change
1414
id: check
@@ -23,7 +23,7 @@ jobs:
2323

2424
- name: Trigger Docker workflow
2525
if: steps.check.outputs.changed == 'true'
26-
uses: actions/github-script@v6
26+
uses: actions/github-script@v7
2727
with:
2828
script: |
2929
github.rest.actions.createWorkflowDispatch({
@@ -35,7 +35,7 @@ jobs:
3535
3636
- name: Trigger Release workflow
3737
if: steps.check.outputs.changed == 'true'
38-
uses: actions/github-script@v6
38+
uses: actions/github-script@v7
3939
with:
4040
script: |
4141
github.rest.actions.createWorkflowDispatch({

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
FROM node:20-alpine AS build
22
WORKDIR /usr/frontend
33
COPY . .
4-
RUN yarn
5-
RUN yarn build
4+
RUN npm install
5+
RUN npm run build
66

77
FROM nginx:stable-alpine
88
COPY --from=build /usr/frontend/dist /bin/www

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ For help and support, [join our Discord](https://discord.gg/2RWwxXVY3v).
2727

2828
## Installing, building & running
2929

30-
Run `yarn` or `npm install` to install the dependencies.
30+
Run `npm install` to install the dependencies.
3131

32-
### yarn dev
32+
### npm run dev
3333

3434
Runs the app in the development mode.
3535
Open http://localhost:8080 to view it in the browser.
3636

37-
### yarn build
37+
### npm run build
3838

3939
Builds a static copy of the site to the `dist/` folder.
4040

‎cypress.config.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
const { defineConfig } = require('cypress')
1+
import { defineConfig } from 'cypress'
22

3-
// eslint-disable-next-line no-undef
4-
module.exports = defineConfig({
3+
export default defineConfig({
54
e2e: {
65
baseUrl: 'http://localhost:8080',
76
setupNodeEvents(on, config) {

‎cypress/e2e/pages/AcceptInvite.spec.cy.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ describe('AcceptInvite', () => {
3737
cy.findByText('Superstatic dashboard').should('exist')
3838
})
3939

40-
it('should let users accept an invite', () => {
40+
it('should handle missing invites', () => {
4141
cy.intercept('GET', /http:\/\/talo\.api\/public\/invites\/(.*)/, {
4242
statusCode: 404,
4343
body: {

‎cypress/e2e/pages/Billing.spec.cy.js‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,15 @@ describe('Billing', () => {
3232
cy.intercept('POST', 'http://talo.api/billing/portal-session', {
3333
statusCode: 200,
3434
body: {
35-
redirect: 'https://trytalo.com'
35+
redirect: '/portal-session-page'
3636
}
3737
}).as('portalSession')
3838

3939
cy.login('owner', '/billing')
4040
cy.findByText('Billing Portal').click()
4141

4242
cy.wait('@portalSession').then(() => {
43-
cy.on('url:changed', (newUrl) => {
44-
expect(newUrl).to.eq('https://trytalo.com')
45-
})
43+
cy.url().should('include', 'portal-session-page')
4644
})
4745
})
4846

@@ -52,17 +50,15 @@ describe('Billing', () => {
5250
cy.intercept('POST', 'http://talo.api/billing/checkout-session', {
5351
statusCode: 200,
5452
body: {
55-
redirect: 'https://trytalo.com'
53+
redirect: '/checkout-session-page'
5654
}
5755
}).as('checkoutSession')
5856

5957
cy.login('owner', '/billing')
6058
cy.findAllByText('Upgrade').spread((button) => button.click())
6159

6260
cy.wait('@checkoutSession').then(() => {
63-
cy.on('url:changed', (newUrl) => {
64-
expect(newUrl).to.eq('https://trytalo.com')
65-
})
61+
cy.url().should('include', 'checkout-session-page')
6662
})
6763
})
6864

0 commit comments

Comments
 (0)