Skip to content

Commit 6941c60

Browse files
committed
Merge branch 'next' into update-redirect-file
2 parents c998502 + 79ebb64 commit 6941c60

26 files changed

Lines changed: 206 additions & 154 deletions
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@evidence-dev/core-components': patch
3+
---
4+
5+
fixed US map abbreviaabbreviations string handling

.changeset/fuzzy-jokes-know.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@evidence-dev/core-components': patch
3+
---
4+
5+
fixed legend false prop to respect strings
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@evidence-dev/core-components': patch
3+
---
4+
5+
fixed deselection issue for start and end date

.changeset/spicy-grapes-decide.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@evidence-dev/core-components': patch
3+
---
4+
5+
fixed slider delay with large min max value difference

.github/workflows/e2e.yml

Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,11 @@ on:
55
branches: [main, next]
66

77
jobs:
8-
find-e2e-test-projects:
9-
name: Find E2E Test Projects
10-
runs-on: ubuntu-latest
11-
outputs:
12-
e2e-test-projects: ${{ steps.e2e-test-projects.outputs.e2e-test-projects }}
13-
steps:
14-
- uses: actions/checkout@v4
15-
16-
- id: e2e-test-projects
17-
run: echo "e2e-test-projects=$(find e2e -maxdepth 1 -type d -printf "%f\n" | jq --raw-input --slurp --compact-output 'split("\n")[1:-1]')" >> ${GITHUB_OUTPUT}
18-
198
run-tests:
20-
needs:
21-
- find-e2e-test-projects
229
timeout-minutes: 60
2310
strategy:
2411
fail-fast: false
2512
matrix:
26-
project: ${{ fromJson(needs.find-e2e-test-projects.outputs.e2e-test-projects) }}
2713
os: [ubuntu-latest, macOS-latest, windows-latest]
2814
node-version: [18.13.0, 20, 22]
2915

@@ -34,7 +20,7 @@ jobs:
3420
- isMain: false
3521
node-version: 20
3622

37-
name: e2e/${{ matrix.project }}/${{ matrix.os }}/node-${{ matrix.node-version}}
23+
name: e2e/${{ matrix.os }}/node-${{ matrix.node-version}}
3824
runs-on: ${{ matrix.os }}
3925

4026
steps:
@@ -60,28 +46,23 @@ jobs:
6046
run: pnpm playwright install --with-deps
6147

6248
- name: Run setup
63-
working-directory: ./e2e/${{ matrix.project }}
64-
run: pnpm run --if-present setup
49+
run: pnpm --filter "./e2e/*" run --if-present setup
6550

6651
- name: Run sources
67-
working-directory: ./e2e/${{ matrix.project }}
68-
run: pnpm run sources
52+
run: pnpm --filter "./e2e/*" run sources
6953

7054
- name: Run dev mode tests
71-
working-directory: ./e2e/${{ matrix.project }}
72-
run: pnpm run test:dev
55+
run: pnpm --filter "./e2e/*" --sequential run test:dev
7356

7457
- name: Build
75-
working-directory: ./e2e/${{ matrix.project }}
76-
run: pnpm run build
58+
run: pnpm --filter "./e2e/*" run build
7759

7860
- name: Run preview mode tests
79-
working-directory: ./e2e/${{ matrix.project }}
80-
run: pnpm run test:preview
61+
run: pnpm --filter "./e2e/*" --sequential run test:preview
8162

8263
- name: Upload Playwright reports
8364
if: always()
8465
uses: actions/upload-artifact@v4
8566
with:
86-
name: playwright-report__e2e_${{ matrix.project }}_${{ matrix.os }}_node-${{ matrix.node-version }}
87-
path: e2e/${{ matrix.project }}/playwright-report
67+
name: playwright-report__e2e_${{ matrix.os }}_node-${{ matrix.node-version }}
68+
path: e2e/**/playwright-report

e2e/dev-server-startup/tests/tests.spec.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ test(`Should be timed appropriately`, async ({ page }) => {
2525
await fs.rm(`test.log`, { force: true });
2626

2727
const procStartTime = performance.now();
28-
const devServerProcess = child_process.spawn('npm', ['run', 'dev'], {
28+
const devServerProcess = child_process.spawn('npm', ['run', 'dev', '--', '--port', '18000'], {
2929
stdio: 'pipe',
3030
shell: true,
3131
env: {
@@ -67,7 +67,7 @@ test(`Should be timed appropriately`, async ({ page }) => {
6767
// await new Promise((r) => setTimeout(r, 20000));
6868
await fs.rm(`./.evidence/template/.evidence-queries`, { recursive: true, force: true });
6969
const reqStartTime = performance.now();
70-
await await fetch('http://localhost:3000?tag=the-real-request', {
70+
await await fetch('http://localhost:18000?tag=the-real-request', {
7171
headers: {
7272
'User-Agent': 'Birds ARE real :)'
7373
}
@@ -77,7 +77,7 @@ test(`Should be timed appropriately`, async ({ page }) => {
7777
const firstRequestDur = reqFinishTime - reqStartTime;
7878

7979
const loadStartTime = performance.now();
80-
await page.goto('http://localhost:3000');
80+
await page.goto('http://localhost:18000');
8181
await waitForPageToLoad(page);
8282
await expect(page.getByText('Magic Text 🪄')).toBeVisible();
8383
const lostFinishTime = performance.now();
@@ -118,6 +118,8 @@ test(`Should be timed appropriately`, async ({ page }) => {
118118
devServerProcess.kill();
119119
}
120120
});
121+
}).finally(() => {
122+
if (!devServerProcess.killed) devServerProcess.kill();
121123
});
122124
expect([0, null]).toContain(exitCode);
123125
});

packages/extension/.vscodeignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ template/build/**
88
template/.evidence/template/**
99
data/**
1010
src/**
11+
!src/props_list.json
1112

1213
docs/images/**
1314

packages/extension/README.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
This extension provides language support, Evidence project and dev server shortcut commands, and autocomplete for Evidence Markdown files.
1010

11-
![Evidence Side-by-Side](docs/images/evidence-sidebyside.gif)
11+
![Evidence Side-by-Side](https://raw.githubusercontent.com/evidence-dev/evidence/next/packages/extension/docs/images/evidence-sidebyside.gif)
1212

1313
## Features
1414

@@ -40,7 +40,7 @@ This extension also depends on [Svelte for VS Code](https://marketplace.visualst
4040

4141
You can install the Evidence extension from the [VS Code Marketplace](https://marketplace.visualstudio.com/items?itemName=Evidence.evidence-vscode), or by searching for `Evidence` in the VS Code Extensions tab.
4242

43-
![Evidence Extension Installation](docs/images/evidence-extension-install.png)
43+
![Evidence Extension Installation](https://raw.githubusercontent.com/evidence-dev/evidence/next/packages/extension/docs/images/evidence-extension-install.png)
4444

4545
## Getting Started
4646

@@ -49,21 +49,21 @@ To get started with Evidence using VS Code locally, follow these steps:
4949
1. Open the command palette in VS Code (Cmd/Ctrl + Shift + P)
5050
2. Search for and click `New Evidence Project`
5151
3. Select an **empty** folder to create your Evidence project within<br><br>
52-
![Evidence Project Start](docs/images/evidence-new-project.gif)
52+
![Evidence Project Start](https://raw.githubusercontent.com/evidence-dev/evidence/next/packages/extension/docs/images/evidence-new-project.gif)
5353

5454
4. Click the `Start Evidence` button to install all required dependencies and start the dev server, or use the commands detailed below in the `Commands` section<br><br>
55-
![Evidence Server Start](docs/images/evidence-server-start.gif)
55+
![Evidence Server Start](https://raw.githubusercontent.com/evidence-dev/evidence/next/packages/extension/docs/images/evidence-server-start.gif)
5656
<br><br> **Note:** The initial installation and server start can take up to 2 minutes depending on your computer. If you have issues with the startup time, you can use Codespaces (see next section).<br><br>
5757
At the end of this step, your browser will automatically open to your app preview, which will appear at `localhost:3000`
5858

5959
5. We recommend putting VS Code and your browser side-by-side, like in the screenshot below. This will give you immediate development feedback on your app every time you save a markdown file.<br><br>
60-
![Evidence Side-by-Side](docs/images/evidence-sidebyside.gif)
60+
![Evidence Side-by-Side](https://raw.githubusercontent.com/evidence-dev/evidence/next/packages/extension/docs/images/evidence-sidebyside.gif)
6161

6262
6. Make changes to your markdown files and save the file to see the changes reflected in your app preview
6363

6464
7. Try the "slash commands" included with the extension by typing `/` - you will see a list of available viz and UI components from our library. Select a component to insert by hitting `Tab` or clicking on the component.<br><br>
6565
Once the component code has been inserted, you can hit `Tab` again to move through the inputs for a component and fill them in.<br><br>
66-
![Evidence Slash](docs/images/evidence-slash.gif)
66+
![Evidence Slash](https://raw.githubusercontent.com/evidence-dev/evidence/next/packages/extension/docs/images/evidence-slash.gif)
6767

6868
## Running Evidence in GitHub Codespaces
6969

@@ -73,15 +73,15 @@ You can use the Evidence VS Code extension with [GitHub Codespaces](https://gith
7373
2. The Evidence extension will be installed automatically
7474
3. Click the `Start Evidence` button to install all required dependencies and start the dev server, or use the commands detailed below in the `Commands` section
7575
4. You will get a popup saying `Your application running on port 3000 is available`. Click to open in browser<br><br>
76-
![Running Evidence in GitHub Codespaces](docs/images/evidence-codespaces-server-start.png)
76+
![Running Evidence in GitHub Codespaces](https://raw.githubusercontent.com/evidence-dev/evidence/next/packages/extension/docs/images/evidence-codespaces-server-start.png)
7777

7878
5. Make changes to your markdown files and **save the file** to see the changes reflected in your app preview
7979

8080
6. After making changes to your project, click the `Source Control` icon in the left panel and commit your changes<br><br>
81-
![Make a change in Codespaces](docs/images/codespaces-make-change.png)
81+
![Make a change in Codespaces](https://raw.githubusercontent.com/evidence-dev/evidence/next/packages/extension/docs/images/codespaces-make-change.png)
8282

8383
7. Click `Publish Branch` - this will prompt you to create a private or public repo for your Evidence project<br><br>
84-
![Publish repo in Codespaces](docs/images/codespaces-publish-repo.png)
84+
![Publish repo in Codespaces](https://raw.githubusercontent.com/evidence-dev/evidence/next/packages/extension/docs/images/codespaces-publish-repo.png)
8585

8686
8. From here, you can continue to develop your project in Codespaces, or you can choose to clone your repo locally and work from there
8787

@@ -91,7 +91,7 @@ The Evidence extension provides a number of custom VS Code shortcut commands for
9191

9292
You can access the VS Code shortcut commands from the command palette (`Cmd/Ctrl+Shift+P`) by typing `Evidence` in the command search box:
9393

94-
![Evidence Extension Commands](docs/images/evidence-commands.png)
94+
![Evidence Extension Commands](https://raw.githubusercontent.com/evidence-dev/evidence/next/packages/extension/docs/images/evidence-commands.png)
9595

9696
| VS Code Command | Title | Description | CLI Command |
9797
| --------------------- | -------------------------- | --------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------- |
@@ -113,7 +113,7 @@ Create [User or Workspace Settings](https://code.visualstudio.com/docs/getstarte
113113

114114
Open Evidence extension Settings in VS Code by using the `Evidence: VS Code Extension Settings` command, or navigating to `File -> Preferences -> Settings` (`cmd/ctrl+,`) and searching for `Evidence` in the Settings search box.
115115

116-
![Evidence Extension Settings](docs/images/evidence-extension-settings.png)
116+
![Evidence Extension Settings](https://raw.githubusercontent.com/evidence-dev/evidence/next/packages/extension/docs/images/evidence-extension-settings.png)
117117

118118
### Available Settings
119119

@@ -135,7 +135,7 @@ You can also reconfigure Evidence extension settings in `vscode/settings.json` w
135135

136136
Edit your settings in `./vscode/settings.json` by opening the `Command Palette...` with `cmd/ctrl+shift+p`, searching for and selecting `Preferences: Open Workspace Settings (JSON)` command.
137137

138-
![VS Code Settings JSON](https://raw.githubusercontent.com/evidence-dev/evidence-vscode/main/docs/images/evidence-vscode-settings-json.png?raw=true)
138+
![VS Code Settings JSON](https://raw.githubusercontent.com/evidence-dev/evidence-vscode/main/https://raw.githubusercontent.com/evidence-dev/evidence/next/packages/extension/docs/images/evidence-vscode-settings-json.png?raw=true)
139139

140140
### Evidence Settings
141141

packages/extension/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "evidence-vscode",
33
"displayName": "Evidence",
44
"description": "Build polished data products with SQL and Markdown",
5-
"version": "1.5.7",
5+
"version": "1.5.9",
66
"private": true,
77
"engines": {
88
"vscode": "^1.52.0"

packages/ui/core-components/src/lib/atoms/inputs/date-input/DateInput.svelte

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,14 @@
6363
6464
let currentDate = dateToYYYYMMDD(new Date());
6565
66+
let extraDayEndString;
67+
68+
$: if (endString && range) {
69+
extraDayEndString = new Date(endString);
70+
extraDayEndString.setDate(extraDayEndString.getDate() + 1);
71+
extraDayEndString = formatDateString(extraDayEndString);
72+
}
73+
6674
function onSelectedDateInputChange(selectedDateInput) {
6775
if (selectedDateInput && (selectedDateInput.start || selectedDateInput.end) && range) {
6876
$inputs[name] = {
@@ -103,6 +111,7 @@
103111
{onSelectedDateInputChange}
104112
start={startString}
105113
end={endString}
114+
{extraDayEndString}
106115
loaded={loaded?.ready ?? true}
107116
{presetRanges}
108117
{defaultValue}

0 commit comments

Comments
 (0)