Skip to content

Commit 9a495c3

Browse files
committed
Resolve merge conflict by incorporating both suggestions
2 parents 9c80732 + af6dda5 commit 9a495c3

File tree

2,672 files changed

+121738
-122461
lines changed

Some content is hidden

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

2,672 files changed

+121738
-122461
lines changed

.eslintignore

Lines changed: 0 additions & 14 deletions
This file was deleted.

.eslintrc

Lines changed: 0 additions & 233 deletions
This file was deleted.

.github/actions/git-diff-on-components/README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@ This action takes care of all components with dependencies that were modified bu
1515
### `all_files`
1616

1717
**Required** List of all files comming from `changed_files` step in `check_version` job github action workflow. It is necessary to set the action `Ana06/[email protected]` output in json format like
18+
1819
```
1920
...
2021
with:
2122
format: json
2223
```
24+
2325
in that way `steps.changed_files.outputs.all` will be converted in array of strings
2426

2527
## Example usage
@@ -34,8 +36,10 @@ in that way `steps.changed_files.outputs.all` will be converted in array of stri
3436
```
3537
3638
## Build
39+
3740
You need to push all files generated in `dist` folder once you are finished with the build to test the new version of the github action in case you want to make modifications.
41+
3842
```
3943
$ cd .github/actions/git-diff-on-components/
40-
$ npm i && npm run build
41-
```
44+
$ pnpm i && pnpm run build
45+
```

.github/actions/git-diff-on-components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"main": "dist/index.js",
66
"scripts": {
77
"clean": "rm -rf ./dist",
8-
"build": "npm run clean && ncc build src/index.js --license licenses.txt"
8+
"build": "pnpm run clean && ncc build src/index.js --license licenses.txt"
99
},
1010
"keywords": [],
1111
"author": "pipedream",

.github/workflows/components-pr.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
uses: actions/[email protected]
5252
- uses: pnpm/[email protected]
5353
with:
54-
version: 7.33.6
54+
version: 9.14.2
5555
- name: Get pnpm store directory
5656
id: pnpm-cache
5757
run: |
@@ -73,7 +73,7 @@ jobs:
7373
run: pnpm install -r
7474
- name: Compile TypeScript
7575
id: compile
76-
run: npm run build > files.txt
76+
run: pnpm run build > files.txt
7777
- name: Get Changed Files
7878
id: files
7979
uses: Ana06/[email protected]
@@ -140,7 +140,7 @@ jobs:
140140
uses: actions/[email protected]
141141
- uses: pnpm/[email protected]
142142
with:
143-
version: 7.33.6
143+
version: 9.14.2
144144
- name: Get pnpm store directory
145145
id: pnpm-cache
146146
run: |
@@ -162,7 +162,7 @@ jobs:
162162
run: pnpm install -r
163163
- name: Compile TypeScript
164164
id: compile
165-
run: npm run build > files.txt
165+
run: pnpm run build > files.txt
166166
- name: Get Changed Files
167167
id: files
168168
uses: Ana06/[email protected]

.github/workflows/docs-pr.yaml

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: Validate MDX Links
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- 'docs-v2/pages/**/*.mdx'
7+
push:
8+
branches:
9+
- main
10+
paths:
11+
- 'docs-v2/pages/**/*.mdx'
12+
13+
jobs:
14+
validate-links:
15+
runs-on: ubuntu-latest
16+
defaults:
17+
run:
18+
working-directory: docs-v2
19+
20+
steps:
21+
- name: Checkout Code
22+
uses: actions/[email protected]
23+
with:
24+
# Fetch full history for checking diffs
25+
fetch-depth: 0
26+
27+
- uses: pnpm/[email protected]
28+
with:
29+
version: 9.14.2
30+
31+
- name: Get pnpm store directory
32+
id: pnpm-cache
33+
run: |
34+
echo "pnpm_cache_dir=$(pnpm store path)" >> $GITHUB_OUTPUT
35+
36+
- uses: actions/cache@v4
37+
name: Setup pnpm cache
38+
with:
39+
path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
40+
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
41+
restore-keys: |
42+
${{ runner.os }}-pnpm-store-
43+
44+
- name: Setup Node Env
45+
uses: actions/[email protected]
46+
with:
47+
node-version: 18
48+
registry-url: https://registry.npmjs.org/
49+
cache: 'pnpm'
50+
51+
- name: Install dependencies
52+
run: pnpm install -r
53+
54+
- name: Run link validator
55+
run: node validate-mdx-links.mjs
56+
env:
57+
DEBUG: ${{ vars.DEBUG }}

0 commit comments

Comments
 (0)