Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes for 5.x renderer #5609

Closed
wants to merge 104 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
fa7bf41
wip: add linting jsdoc etc
brendanbond Apr 19, 2024
6867afc
Upgraded dependencies.
travist Apr 23, 2024
d5654b8
Updated build.
travist Apr 23, 2024
8111e54
Merge branch 'master' of github.com:formio/formio.js into dev.tt
travist Apr 23, 2024
c337566
Updated package.
travist Apr 23, 2024
8914266
Updated version.
travist Apr 23, 2024
fbeae9a
Exporting sdk as FormioCore so it can be imported and properly tree-s…
travist Apr 23, 2024
33febf2
Properly export the Evaluator.
travist Apr 23, 2024
0c43678
Re-export methods from @formio/core for the utils functions.
travist Apr 23, 2024
7de4a8c
Update templates.
travist Apr 23, 2024
b0b7763
Re-adding findComponents.
travist Apr 23, 2024
be3876b
Version bump.
travist Apr 23, 2024
eef5b02
merge master and fix conflicts
brendanbond Apr 25, 2024
8d20d51
Adding more jsdocs.
travist Apr 25, 2024
a7039a2
replace esdoc with jsdoc
brendanbond Apr 25, 2024
06404e8
remove esdoc config file
brendanbond Apr 25, 2024
1d1efe4
lint a bunch of files and add lint yarn script
brendanbond Apr 25, 2024
b2bb269
Adding esdocs to src/Element.js
travist Apr 25, 2024
5cff9ad
jsdoc for Providers.js
Apr 25, 2024
167d9b9
update webform jsdoc types
brendanbond Apr 25, 2024
ace3ef0
minor
brendanbond Apr 25, 2024
b4777bf
fix linting errors
brendanbond Apr 25, 2024
b33f306
update types for nested component
brendanbond Apr 25, 2024
913986b
breadCrumbSettings -> breadcrumbSettings at line 142
ryanformio Apr 25, 2024
24e2e10
breadCrumbSettings -> breadcrumbSettings at line 142, resolve conflicts
ryanformio Apr 25, 2024
002fbc3
update formio.form.js jsdoc
brendanbond Apr 25, 2024
d099ec7
Merge branch 'devex/jsdoc-migration' of github.com:formio/formio.js i…
brendanbond Apr 25, 2024
e94e31e
Adding some jsdocs to src/components/_classes/component/Component.js
travist Apr 25, 2024
3f81d9b
jsdoc for address provider base class and azure address
Apr 25, 2024
24298a6
Merge branch 'devex/jsdoc-migration' of https://github.com/formio/for…
Apr 25, 2024
a158cb8
one warning left at line 16, did not want to alter constructor logic …
ryanformio Apr 25, 2024
942c165
Merge branch 'devex/jsdoc-migration' of github.com:formio/formio.js i…
ryanformio Apr 25, 2024
285eb05
Merge branch 'master' of github.com:formio/formio.js into dev.tt
travist Apr 26, 2024
9f35324
Version bump.
travist Apr 27, 2024
818de22
address provider jsdoc
May 2, 2024
b3e19b6
Adding component class docs.
travist May 2, 2024
b8d7303
Merge branch 'devex/jsdoc-migration' of github.com:formio/formio.js i…
travist May 2, 2024
8d515f8
Working on utils eslint.
travist May 2, 2024
308aa2a
WIP: update jsdoc
brendanbond May 3, 2024
78662f4
Merge branch 'master' of github.com:formio/formio.js into dev.tt
travist May 3, 2024
8c19e92
Updated build.
travist May 3, 2024
2a36250
update types to parent Form class; add builder options type
brendanbond May 6, 2024
3487ef6
Merge branch 'devex/jsdoc-migration' into dev.tt
travist May 7, 2024
1b5b070
minor update
brendanbond May 7, 2024
86ebb29
Fixed exported utils method signature.
travist May 7, 2024
3982848
merge conflicts
brendanbond May 9, 2024
5522764
Updated version.
travist May 9, 2024
2c840c4
Re-export methods from @formio/core for the utils functions.
travist Apr 23, 2024
fcaf8bd
Re-adding findComponents.
travist Apr 23, 2024
f45dbd4
Merge remote-tracking branch 'refs/remotes/origin/devex/jsdoc-migrati…
brendanbond May 9, 2024
3e0998c
JSDoc: Field.js
edwinanciani May 9, 2024
17ce188
update formbuilder options; type listcomponent and child classes
brendanbond May 9, 2024
85da5ab
Merge remote-tracking branch 'refs/remotes/origin/devex/jsdoc-migrati…
brendanbond May 9, 2024
b7cf90f
type definitions for file providers
May 9, 2024
1cc96c1
Merge branch 'devex/jsdoc-migration' of https://github.com/formio/for…
May 9, 2024
c83a783
resolve FormBuilder eslint warnings
brendanbond May 9, 2024
2dc946e
Merge remote-tracking branch 'refs/remotes/origin/devex/jsdoc-migrati…
brendanbond May 9, 2024
fd4b5e0
fix password strength linting warnings and fileProcessor lints
brendanbond May 9, 2024
3e6a8fa
whoopsie - minor typo
brendanbond May 9, 2024
ee5fe59
Updated utils docs.
travist May 9, 2024
6f7c968
Merge branch 'devex/jsdoc-migration' of github.com:formio/formio.js i…
travist May 9, 2024
ded3f65
cleaned up lint errors
May 9, 2024
f6bc550
Merge branch 'devex/jsdoc-migration' of https://github.com/formio/for…
May 9, 2024
6358b85
jsDoc added to Multvalue.js
ryanformio May 9, 2024
688c6b5
JSDoc-Update: NestedComponent.js
edwinanciani May 9, 2024
8530c59
fix linter warnings for Input, ListComponent, and Multivalue
brendanbond May 9, 2024
124fa12
fix merge conflicts
brendanbond May 9, 2024
f6e9d26
Merge branch 'devex/jsdoc-migration' of github.com:formio/formio.js i…
travist May 16, 2024
0c8518c
Updated build.
travist May 16, 2024
39dcf41
Updated version.
travist May 16, 2024
80696a1
Adding better exports.
travist May 16, 2024
51c69c0
lint fixes for Form, CalendarWidget, ListComponent.form.js
brendanbond May 16, 2024
5622ef9
jsdoc updates for Well.form and ListComponent.form
brendanbond May 16, 2024
3d5120d
updates to edit forms for list, time, unknown, url, and well
brendanbond May 16, 2024
f48befa
Adding types to utils.
travist May 16, 2024
83e85fe
jsdoc updates to textfield and textfield.form
brendanbond May 16, 2024
4f5bde9
Fixing typedocs on edit forms.
travist May 16, 2024
a3cd395
use generic edit form function definition
brendanbond May 16, 2024
ee500d9
Merge branch 'devex/jsdoc-migration' of github.com:formio/formio.js i…
travist May 16, 2024
e406d73
Merge branch 'devex/jsdoc-migration' of github.com:formio/formio.js i…
travist May 16, 2024
b4b6cee
jsdoc updates to Tabs and TextArea
brendanbond May 16, 2024
a21a907
Merge remote-tracking branch 'refs/remotes/origin/devex/jsdoc-migrati…
brendanbond May 16, 2024
3dc0ec3
jsdoc updates to SelectBoxes, Select, Number, Hidden
brendanbond May 16, 2024
b39cc90
Adding lint for Form.
travist May 16, 2024
032580a
jsdoc updates to day and editgrid
brendanbond May 16, 2024
a3d2bbc
jsdoc updates to DataGrid
brendanbond May 16, 2024
a7285e3
Fixing lint for pdf, wizard, and webform builder.
travist May 16, 2024
c6ccf8f
Merge remote-tracking branch 'refs/remotes/origin/devex/jsdoc-migrati…
brendanbond May 16, 2024
a336380
Merge remote-tracking branch 'refs/remotes/origin/devex/jsdoc-migrati…
brendanbond May 16, 2024
2553eb8
address through currency
Dmeeks512 May 16, 2024
9bad491
Adding docs to edit forms in _classes.
travist May 16, 2024
0f43e6f
Updated componments.
travist May 16, 2024
28b4d38
jsdoc updates to nested form
brendanbond May 16, 2024
7923c4c
Merge remote-tracking branch 'refs/remotes/origin/devex/jsdoc-migrati…
brendanbond May 16, 2024
d9a09b1
Merge remote-tracking branch 'refs/remotes/origin/devex/jsdoc-migrati…
Dmeeks512 May 16, 2024
060c2cc
Merge remote-tracking branch 'refs/remotes/origin/devex/jsdoc-migrati…
Dmeeks512 May 16, 2024
4b4e59f
fix merge conflicts
brendanbond May 16, 2024
725be6c
delete accidental addition
brendanbond May 16, 2024
5548477
update package json script and lockfile
brendanbond May 16, 2024
0b71c4b
Merge branch 'master' of github.com:formio/formio.js into dev.tt
travist May 16, 2024
0749b1f
Fixing merge conflicts.
travist May 16, 2024
4a3651f
Squashed commit of the following:
travist May 21, 2024
0c0c866
Merge branch 'devex/jsdoc-migration' of github.com:formio/formio.js i…
travist May 21, 2024
c305cc4
Merge branch 'dev.tt' of github.com:formio/formio.js into 5x-renderer…
travist May 21, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .esdoc.json

This file was deleted.

10 changes: 10 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
node_modules
lib
dist
app
test
types
*.spec.js
*.unit.js
_site
docs
17 changes: 17 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
module.exports = {
"env": {
"browser": true,
"es2021": true,
"node": true
},
"extends": ["eslint:recommended", "plugin:jsdoc/recommended-typescript-flavor"],
"parserOptions": {
"ecmaVersion": "latest",
"sourceType": "module"
},
"plugins": ["jsdoc"],
"rules": {
"no-prototype-builtins": "off",
"no-unused-vars": ["error", { "argsIgnorePattern": "^_" }],
}
}
38 changes: 0 additions & 38 deletions .eslintrc.json

This file was deleted.

2 changes: 1 addition & 1 deletion embed.d.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export * from './types/Embed';
export * from './lib/cjs/InlineEmbed';
1 change: 1 addition & 0 deletions form.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './lib/cjs/formio.form';
9 changes: 0 additions & 9 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ const concat = require('gulp-concat');
const replace = require('gulp-replace');
const rename = require('gulp-rename');
const cleanCSS = require('gulp-clean-css');
const eslint = require('gulp-eslint');
const clean = require('gulp-clean');

// Clean lib folder.
Expand All @@ -18,14 +17,6 @@ gulp.task('clean:lib', () => {
});
gulp.task('clean', gulp.parallel('clean:dist', 'clean:lib'));

// ESLint
gulp.task('eslint', function eslintTask() {
return gulp.src(['./src/**/*.js', '!./src/**/*.spec.js'])
.pipe(eslint())
.pipe(eslint.format())
.pipe(eslint.failAfterError());
});

// Move font-awesome fonts into dist folder.
gulp.task('builder-fonts', function builderFonts() {
return gulp.src('./node_modules/bootstrap-icons/font/fonts/*').pipe(gulp.dest('dist/fonts'));
Expand Down
44 changes: 22 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@formio/js",
"version": "5.0.0-rc.43",
"version": "5.0.0-rc.54",
"description": "JavaScript powered Forms with JSON Form Builder",
"main": "lib/cjs/index.js",
"exports": {
Expand All @@ -21,21 +21,25 @@
"require": "./lib/cjs/formio.form.js"
},
"./embed": {
"import": "./lib/cjs/Embed.js",
"require": "./lib/cjs/Embed.js"
"import": "./lib/cjs/InlineEmbed.js",
"require": "./lib/cjs/InlineEmbed.js"
},
"./dist/*": "./dist/*"
},
"files": [
"dist",
"lib"
"lib",
"embed.d.ts",
"form.d.ts",
"sdk.d.ts",
"utils.d.ts"
],
"pre-commit": [
"lint"
],
"scripts": {
"build": "yarn doc && yarn lib && yarn dist",
"doc": "esdoc",
"doc": "typedoc",
"dist": "gulp clean:dist && webpack --config webpack.config.js && webpack --config webpack.prod.js && gulp build",
"lib": "gulp clean:lib && tsc --project tsconfig.cjs.json && tsc --project tsconfig.mjs.json && yarn lib:package",
"lib:package": "node ./libpackage.js",
Expand All @@ -50,7 +54,7 @@
"release": "yarn build-app && yarn deploy-s3",
"tag": "VERSION=$(yarn version);git add -A; git commit -m \"Build $Version\";git push origin master;git tag v$VERSION;git push origin --tags;",
"dopublish": "npm run build && npm run tag && npm publish",
"lint": "gulp eslint",
"lint": "eslint ./src --fix",
"serve": "jekyll serve --config _config.yml,_config.dev.yml",
"test": "mocha 'src/**/*.unit.js'",
"test:updateRenders": "npm run lib && TZ=UTC node --require jsdom-global/register test/updateRenders.js",
Expand All @@ -75,9 +79,9 @@
},
"homepage": "https://github.com/formio/formio.js#readme",
"dependencies": {
"@formio/bootstrap": "^3.0.0-rc.22",
"@formio/bootstrap": "^3.0.0-rc.24",
"@formio/choices.js": "^10.2.1",
"@formio/core": "^2.1.0-dev.tt.2",
"@formio/core": "^2.1.0-dev.tt.10",
"@formio/text-mask-addons": "^3.8.0-formio.2",
"@formio/vanilla-text-mask": "^5.1.1-formio.1",
"abortcontroller-polyfill": "^1.7.5",
Expand All @@ -86,10 +90,10 @@
"browser-cookies": "^1.2.0",
"browser-md5-file": "^1.1.1",
"compare-versions": "^6.0.0-rc.2",
"core-js": "^3.37.0",
"core-js": "^3.37.1",
"dialog-polyfill": "^0.5.6",
"dom-autoscroller": "^2.3.4",
"dompurify": "^3.1.0",
"dompurify": "^3.1.3",
"downloadjs": "^1.4.7",
"dragula": "^3.7.3",
"eventemitter3": "^5.0.1",
Expand All @@ -105,17 +109,17 @@
"lodash": "^4.17.21",
"moment": "^2.29.4",
"moment-timezone": "^0.5.44",
"quill": "^2.0.0-rc.4",
"quill": "^2.0.2",
"signature_pad": "^4.2.0",
"string-hash": "^1.1.3",
"tippy.js": "^6.3.7",
"uuid": "^9.0.0",
"vanilla-picker": "^2.12.3"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^7.6.0",
"@typescript-eslint/parser": "^7.6.0",
"ace-builds": "1.33.0",
"@typescript-eslint/eslint-plugin": "^7.9.0",
"@typescript-eslint/parser": "^7.9.0",
"ace-builds": "1.33.2",
"async-limiter": "^2.0.0",
"bootstrap-icons": "^1.10.5",
"bootswatch": "^5.3.3",
Expand All @@ -124,11 +128,8 @@
"chance": "^1.1.9",
"ejs-loader": "^0.5.0",
"escape-string-regexp": "^5.0.0",
"esdoc": "^1.1.0",
"esdoc-ecmascript-proposal-plugin": "^1.0.0",
"esdoc-standard-plugin": "^1.0.0",
"eslint": "^8.57.0",
"eslint-config-formio": "^1.1.4",
"eslint-plugin-jsdoc": "^48.2.5",
"fetch-mock": "^9.11.0",
"file-loader": "^6.2.0",
"flatpickr": "^4.6.13",
Expand All @@ -137,7 +138,6 @@
"gulp-clean": "^0.4.0",
"gulp-clean-css": "^4.3.0",
"gulp-concat": "^2.6.1",
"gulp-eslint": "^6.0.0",
"gulp-filter": "^7.0.0",
"gulp-rename": "^2.0.0",
"gulp-replace": "^1.1.3",
Expand All @@ -161,19 +161,19 @@
"pretty": "^2.0.0",
"pygments-css": "^1.0.0",
"raw-loader": "^4.0.2",
"sass": "^1.74.1",
"sass": "^1.77.1",
"shortcut-buttons-flatpickr": "^0.4.0",
"sinon": "^17.0.1",
"string-replace-loader": "^3.1.0",
"ts-loader": "^9.4.4",
"ts-node": "^10.9.1",
"tsc": "^2.0.4",
"typedoc": "^0.25.13",
"typescript": "5.3.2",
"webpack": "^5.90.3",
"webpack-bundle-analyzer": "^4.10.2",
"webpack-cli": "^5.1.1",
"webpack-node-externals": "^3.0.0",
"webpack-stream": "^7.0.0",
"written-number": "^0.11.1"
"webpack-stream": "^7.0.0"
}
}
1 change: 1 addition & 0 deletions sdk.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './lib/cjs/Formio';
Loading
Loading