Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
cars10 committed Sep 11, 2023
2 parents f4c8bc1 + adc02ee commit 0488325
Show file tree
Hide file tree
Showing 48 changed files with 1,194 additions and 427 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ jobs:
platform: [ macos-latest, ubuntu-latest, windows-latest ]
#platform: [ ubuntu-latest ]
runs-on: ${{ matrix.platform }}
env:
TAURI_PRIVATE_KEY: "${{ secrets.TAURI_PRIVATE_KEY }}"
TAURI_KEY_PASSWORD: "${{ secrets.TAURI_KEY_PASSWORD }}"

steps:
- uses: actions/checkout@v3
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ yarn-*.log
# Tests
/test-results/
/playwright-report/
/playwright-report-ci/
/playwright/.cache/
playwright/.auth
tests/*.png
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18
20
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

# 1.0.0-beta-5
* re-adds `json-bigint` to support numbers bigger then `Number.MAX_SAFE_INTEGER`
* add `Hack` font
* update to node 20
* adjust mock data for tests & screenshot scripts

# 1.0.0-beta-4
* fix build issues

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ci: build_docker_ci
docker run --rm elasticvue-ci yarn lint
docker run --rm elasticvue-ci yarn tsc
docker run --rm elasticvue-ci yarn test:unit
docker run --rm -e CI="$(CI)" elasticvue-ci yarn test:e2e:all
docker run --rm -e CI="$(CI)" -v ./playwright-report-ci:/app/playwright-report elasticvue-ci yarn test:e2e:all

build_tauri:
yarn tauri:build
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# elasticvue 1.0.0-beta-1
# elasticvue 1.0.0-beta-5

[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/donate?hosted_button_id=65GDZCZTUBVRL)
[![Chrome web store](https://img.shields.io/chrome-web-store/v/hkedbapjpblbodpgbajblpnlpenaebaa?label=chrome%20extension)](https://chrome.google.com/webstore/detail/elasticvue/hkedbapjpblbodpgbajblpnlpenaebaa)
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18-bookworm AS builder
FROM node:20-bookworm AS builder
RUN mkdir /app
WORKDIR /app

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile_browser_ext
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18-bookworm
FROM node:20-bookworm
RUN mkdir /app
WORKDIR /app

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile_ci
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18-bookworm AS builder
FROM node:20-bookworm AS builder
RUN mkdir /app
WORKDIR /app

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile_multiarch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM node:18-bookworm AS builder
FROM --platform=$BUILDPLATFORM node:20-bookworm AS builder
RUN mkdir /app
WORKDIR /app

Expand Down
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@
"@intlify/unplugin-vue-i18n": "^0.13.0",
"@quasar/extras": "^1.16.6",
"@tauri-apps/api": "^1.4.0",
"@types/json-bigint": "^1.0.1",
"ace-builds": "^1.24.1",
"idb": "^7.1.1",
"json-bigint": "^1.0.0",
"pinia": "^2.1.6",
"pinia-plugin-persistedstate": "^3.2.0",
"pretty-bytes": "^6.1.1",
Expand Down
10 changes: 4 additions & 6 deletions scripts/chrome_ext_screenshots.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
const { chromium } = require('@playwright/test');
const { chromium } = require('@playwright/test')
const { mock } = require('./mock');

(async () => {
const browser = await chromium.launch()
const page = await browser.newPage()
await page.setViewportSize({ width: 1280, height: 800 })
await mock(page)

await page.goto('http://localhost:5173')
await connectWithServer(page)

await screenshot(page, 'home')

await page.locator('#change_theme').click()
await navAndScreenshot(page, '#shards', 'shards')
await navAndScreenshot(page, '#indices', 'indices')
Expand All @@ -23,7 +26,6 @@ const { chromium } = require('@playwright/test');

const connectWithServer = async page => {
await page.locator('#add_cluster').click()
await page.locator('input[name="uri"]').fill('http://localhost:9507')
await page.locator('#connect').click()
await page.waitForURL('http://localhost:5173/cluster/0')
}
Expand All @@ -33,10 +35,6 @@ const navAndScreenshot = async (page, selector, name) => {
await screenshot(page, name)
}

const closeSnackbar = async page => {
await page.locator('#close_snackbar').click()
}

let counter = 1
const screenshot = async (page, name) => {
await page.locator('body').click()
Expand Down
Loading

0 comments on commit 0488325

Please sign in to comment.