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

Fio 9618 #228

Draft
wants to merge 28 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
d37c22f
Updated build
lane-formio Dec 9, 2024
504d87d
FIO-9159: add intentionallyHidden ephemeral state and breaking change…
brendanbond Dec 16, 2024
3849857
Updated build
lane-formio Dec 16, 2024
e02dd07
FIO-9266/FIO-9267/FIO-9268: Fixes an issue where nested form validati…
alexandraRamanenka Dec 12, 2024
aa0336d
Updated build
lane-formio Dec 20, 2024
9eec35c
FIO-9357 fixed calculation based on DataSource component (#202)
HannaKurban Dec 16, 2024
2acd46e
FIO-9465: fix conditionals path for panel component
Dec 20, 2024
cb15871
Updated build
lane-formio Jan 8, 2025
b0f1020
FIO-9467: Fix rendering table component in wizard
mikekotikov Dec 20, 2024
0298e0e
FIO-9467: rename fixture files
mikekotikov Jan 7, 2025
af4a67d
FIO-9467: Fix table component fails to render when inside wizard
mikekotikov Jan 9, 2025
9e75c45
FIO-9467: change test case
mikekotikov Jan 9, 2025
aecd3f5
Updated build
lane-formio Jan 15, 2025
3e9e1f3
FIO-9511: fixed day component min/max validation message
TanyaGashtold Jan 3, 2025
8b5306d
Updated build
lane-formio Jan 29, 2025
c892fa4
1. Small formatting change to calculation/index.ts
brendanbond Jan 10, 2025
c801dad
add tests
brendanbond Jan 10, 2025
de6f91f
Updated build
lane-formio Feb 3, 2025
e97c5de
FIO-9668: Fix custom error messages are not highlighted
mikekotikov Feb 3, 2025
00f49a5
Updated build: @formio/[email protected]
lane-formio Feb 7, 2025
6df9646
Merge pull request #218 from formio/FIO-9649
lane-formio Feb 10, 2025
36681c6
Update Changelog
lane-formio Feb 10, 2025
d645f8d
Updated build: @formio/[email protected]
lane-formio Feb 10, 2025
723abce
Hotfix/fix type aliases (#221)
brendanbond Feb 14, 2025
78a30ad
Update changelog and core-js
lane-formio Feb 14, 2025
5dce22c
Updated build: @formio/[email protected]
lane-formio Feb 21, 2025
f766397
FIO-9618 Move i18n shim from renderer
blakekrammes Mar 10, 2025
3ca4ac2
FIO-9618 Update t() signature to pacify TS
blakekrammes Mar 10, 2025
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
53 changes: 52 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,55 @@
## [Unreleased: 2.4.0-rc.1]
## 2.4.0-rc.10

- Hotfix/fix type aliases

## 2.4.0-rc.9

### Changed

- FIO-9649: update componentMatches fn to not omit layout components; add tests

## 2.4.0-rc.8

### Changed

- FIO-9668: Fix custom error messages are not highlighted

## 2.4.0-rc.7

### Changed

- FIO-9508: includeAll flag now works with nested components

## 2.4.0-rc.6

### Changed

- FIO-9511: fixed day component min/max validation message

## 2.4.0-rc.5

### Changed

- FIO-9467: Fix rendering table component in wizard

## 2.4.0-rc.4

### Changed

- FIO-9465: fix conditionals path for panel component
- FIO-9357 fixed calculation based on DataSource component

## 2.4.0-rc.3

### Changed

- FIO-9266/FIO-9267/FIO-9268: Fixes an issue where nested form validation will be skipped if parent form submits empty data

## 2.4.0-rc.2

- FIO-9159: add intentionallyHidden ephemeral state and breaking change to clearOnHide behavior

## 2.4.0-rc.1

### Changed

Expand Down
26 changes: 6 additions & 20 deletions config/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
module.exports = {
mode: 'development',
entry: {
'formio.core.js': './src/index.ts',
'formio.modules.js': './src/modules/index.ts',
'formio.js': './src/sdk/index.ts',
'formio.utils.js': './src/utils/index.ts',
'formio.process.js': './src/process/index.ts',
'formio.core.js': './lib/index.js',
'formio.modules.js': './lib/modules/index.js',
'formio.js': './lib/sdk/index.js',
'formio.utils.js': './lib/utils/index.js',
'formio.process.js': './lib/process/index.js',
},
output: {
library: {
Expand All @@ -28,20 +28,6 @@ module.exports = {
}),
],
resolve: {
extensions: ['.ts', '.js'],
plugins: [
new TsconfigPathsPlugin({
configFile: path.resolve(__dirname, '..', 'tsconfig.json'),
}),
],
},
module: {
rules: [
{
test: /\.ts$/,
exclude: /\.spec\.ts$/,
loader: 'ts-loader',
},
],
extensions: ['.js'],
},
};
9 changes: 4 additions & 5 deletions config/webpack.prod.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
const path = require('path');
const config = require('./webpack.config');
config.mode = 'production';
config.entry = {
'formio.core.min.js': './src/index.ts',
'formio.modules.min.js': './src/modules/index.ts',
'formio.min.js': './src/sdk/index.ts',
'formio.utils.min.js': './src/utils/index.ts',
'formio.core.min.js': './lib/index.js',
'formio.modules.min.js': './lib/modules/index.js',
'formio.min.js': './lib/sdk/index.js',
'formio.utils.min.js': './lib/utils/index.js',
};
module.exports = config;
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@formio/core",
"version": "2.1.0-dev.tt.13",
"version": "2.4.0-rc.10",
"description": "The core Form.io renderering framework.",
"main": "lib/index.js",
"exports": {
Expand All @@ -15,15 +15,16 @@
},
"scripts": {
"test": "TEST=1 nyc --reporter=lcov --reporter=text --reporter=text-summary mocha -b -r ts-node/register -r tsconfig-paths/register -r mock-local-storage -r jsdom-global/register -t 0 'src/**/__tests__/*.test.ts'",
"lib": "tsc --project tsconfig.json && tsc-alias -p tsconfig.json",
"lib": "tsc --project tsconfig.json",
"alias": "tsc-alias -p tsconfig.json",
"lib:watch": "tsc -w & tsc-alias -w",
"replace": "node -r tsconfig-paths/register -r ts-node/register ./lib/base/array/ArrayComponent.js",
"test:debug": "mocha -r ts-node/register -r tsconfig-paths/register -r mock-local-storage -r jsdom-global/register --debug-brk --inspect '**/*.spec.ts'",
"docs": "./node_modules/typedoc/bin/typedoc --exclude '*.spec.ts' src/*.ts src/**/*.ts src/**/**/*.ts",
"build:dev": "npx webpack --config config/webpack.config.js",
"build:prod": "npx webpack --config config/webpack.prod.js",
"clean": "rm -rf lib && rm -rf dist && rm -rf docs",
"build": "yarn clean && gulp templates && yarn docs && yarn lib && yarn build:dev && yarn build:prod",
"build": "yarn clean && gulp templates && yarn docs && yarn lib && yarn alias && yarn build:dev && yarn build:prod",
"prepublish": "yarn lint && yarn format && yarn build && yarn test",
"show-coverage": "open coverage/lcov-report/index.html",
"lint": "eslint src",
Expand Down
2 changes: 1 addition & 1 deletion src/error/FieldError.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ export class FieldError {
level = 'error',
} = context;
this.ruleName = ruleName;
this.level = level;
if (context.component.validate?.customMessage) {
this.errorKeyOrMessage = context.component.validate.customMessage;
this.context = { ...context, hasLabel: false, field, level };
} else {
this.errorKeyOrMessage = errorKeyOrMessage;
this.context = { ...context, hasLabel, field };
this.level = level;
}
}
}
Expand Down
Loading