Skip to content

Commit e10cae4

Browse files
brendanbondbrendanbond
committed
Merge branch 'master' into fio-9618
2 parents 6e62a7a + d063bd5 commit e10cae4

105 files changed

Lines changed: 2480 additions & 6202 deletions

File tree

Some content is hidden

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

‎.github/workflows/sync-monorepo.mjs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
2+
import { syncFromGithubAction } from 'monorepo-sync';
3+
4+
syncFromGithubAction()
5+
.then(() => {
6+
console.log('Sync completed successfully');
7+
process.exit(0);
8+
})
9+
.catch((error) => {
10+
console.error('Error during sync:', error);
11+
process.exit(1);
12+
13+
});

‎.github/workflows/sync-pr-to-monorepo.yml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Sync Merged PR to Monorepo
2+
3+
on:
4+
pull_request:
5+
types: [closed]
6+
branches:
7+
- main
8+
- master
9+
10+
jobs:
11+
sync-to-monorepo:
12+
if: github.event.pull_request.merged == true
13+
runs-on: ubuntu-latest
14+
env:
15+
GH_TOKEN: ${{ secrets.MONOREPO_SYNC_TOKEN }}
16+
PR_NUMBER: ${{ github.event.pull_request.number }}
17+
PR_TITLE: ${{ github.event.pull_request.title }}
18+
PR_AUTHOR: ${{ github.event.pull_request.user.login }}
19+
SOURCE_REPO_NAME: ${{ github.event.repository.name }}
20+
MONOREPO_PACKAGE_LOCATION: packages/formio.js
21+
MONOREPO_PATH: ${{ github.workspace }}/monorepo
22+
23+
steps:
24+
- name: Checkout repository
25+
uses: actions/checkout@v4
26+
with:
27+
fetch-depth: 0
28+
29+
- name: Setup Node.js
30+
uses: actions/setup-node@v4
31+
with:
32+
node-version: '18'
33+
34+
- name: Install dependencies
35+
# Install project dependencies (including dev dependencies)
36+
run: npm install
37+
- name: Install zx
38+
run: npm install zx
39+
40+
- name: Install monorepo-sync package
41+
run: npm install git+https://github.com/formio/monorepo-sync.git
42+
- name: Clone Monorepo
43+
run: |
44+
gh repo clone formio/formio-monorepo monorepo -- --depth=1
45+
46+
- name: Sync to Monorepo
47+
run: |
48+
echo "Syncing PR #${PR_NUMBER}: ${PR_TITLE}"
49+
node .github/workflows/sync-monorepo.mjs

‎Changelog.md‎

Lines changed: 57 additions & 402 deletions
Large diffs are not rendered by default.

‎README.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ This library has a very powerful JSON form builder, and can be used like the fol
5252
<head>
5353
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons/font/bootstrap-icons.css">
5454
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap/dist/css/bootstrap.min.css">
55+
<link rel="stylesheet" href="https://cdn.form.io/js/formio.full.min.css">
5556
<script src='https://cdn.form.io/js/formio.full.min.js'></script>
5657
</head>
5758
<body>
@@ -155,6 +156,8 @@ being set to ```wizard```.
155156
You can also use this library as a JavaScript embedding of the form using a single line of code. For example, to embed the https://examples.form.io/example form within your application you can simply use the following embed code.
156157

157158
```html
159+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons/font/bootstrap-icons.css">
160+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap/dist/css/bootstrap.min.css">
158161
<script src="https://cdn.form.io/js/formio.embed.min.js?src=https://examples.form.io/example&libs=true"></script>
159162
```
160163

@@ -169,6 +172,8 @@ In addition to having a Form Renderer within this application, you can also use
169172
```html
170173
<html>
171174
<head>
175+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons/font/bootstrap-icons.css">
176+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap/dist/css/bootstrap.min.css">
172177
<script src='https://cdn.form.io/js/formio.min.js'></script>
173178
<script type='text/javascript'>
174179
var formio = new Formio('https://examples.form.io/example');
@@ -214,3 +219,5 @@ For more complete documentation over the JavaScript SDK, please take a look at t
214219

215220
### Full Developer API Documentation
216221
To view the full SDK Documentation, go to [Developer SDK Documentation](https://formio.github.io/formio.js/docs/)
222+
223+
test update 1

‎package.json‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,16 @@
8686
"@formio/vanilla-text-mask": "^5.1.1-formio.1",
8787
"abortcontroller-polyfill": "^1.7.5",
8888
"autocompleter": "^8.0.4",
89-
"bootstrap": "^5.3.3",
89+
"bootstrap": "^5.3.4",
9090
"browser-cookies": "^1.2.0",
9191
"browser-md5-file": "^1.1.1",
9292
"choices.js": "^11.0.6",
9393
"compare-versions": "^6.1.1",
9494
"core-js": "^3.37.1",
95+
"dayjs": "^1.11.13",
9596
"dialog-polyfill": "^0.5.6",
9697
"dom-autoscroller": "^2.3.4",
97-
"dompurify": "^3.1.6",
98+
"dompurify": "^3.2.5",
9899
"downloadjs": "^1.4.7",
99100
"dragula": "^3.7.3",
100101
"eventemitter3": "^5.0.1",
@@ -108,7 +109,7 @@
108109
"jwt-decode": "^3.1.2",
109110
"lodash": "^4.17.21",
110111
"moment": "^2.29.4",
111-
"moment-timezone": "^0.5.44",
112+
"moment-timezone": "^0.5.48",
112113
"quill": "^2.0.2",
113114
"signature_pad": "^4.2.0",
114115
"string-hash": "^1.1.3",
@@ -175,7 +176,8 @@
175176
"webpack-bundle-analyzer": "^4.10.2",
176177
"webpack-cli": "^5.1.1",
177178
"webpack-node-externals": "^3.0.0",
178-
"webpack-stream": "^7.0.0"
179+
"webpack-stream": "^7.0.0",
180+
"zx": "^8.5.4"
179181
},
180182
"nyc": {
181183
"check-coverage": true,

0 commit comments

Comments
 (0)