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

deps: Use latest vue 3.4.21 & upgrade further dependencies #2318

Merged
merged 2 commits into from
Apr 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 0 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
"@types/lodash": "^4.14.149",
"ajv": "^8.6.1",
"ajv-formats": "^2.1.0",
"ava": "~2.4.0",
"babel-loader": "^8.0.6",
"core-js": "^3.9.1",
"coveralls": "^3.0.9",
Expand All @@ -41,19 +40,12 @@
"nyc": "^15.1.0",
"prettier": "^2.8.4",
"source-map-loader": "^0.2.4",
"source-map-support": "0.5.16",
"style-loader": "^1.0.1",
"ts-loader": "^9.5.1",
"ts-node": "^10.4.0",
"tslib": "^2.5.0",
"typescript": "~4.9.5",
"webpack": "^5.78.0",
"webpack-merge": "^5.10.0"
},
"pnpm": {
"overrides": {
"vue": "~3.3.13",
"@vue/compiler-sfc": "~3.3.13"
}
}
}
4 changes: 2 additions & 2 deletions packages/angular-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
"eslint-plugin-prettier": "^4.2.1",
"jasmine": "^3.99.0",
"jasmine-spec-reporter": "^4.2.1",
"karma": "^3.1.4",
"karma": "^6.4.1",
"karma-chrome-launcher": "^3.2.0",
"karma-coverage-istanbul-reporter": "^2.1.1",
"karma-jasmine": "^2.0.1",
"karma-sourcemap-loader": "^0.3.8",
"karma-webpack": "^4.0.2",
"karma-webpack": "^5.0.0",
"prettier": "^2.8.4",
"tslib": "^2.3.0",
"typescript": "~4.9.5"
Expand Down
7 changes: 7 additions & 0 deletions packages/angular/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,12 @@ module.exports = {
caughtErrorsIgnorePattern: '^_',
},
],
'import/no-unresolved': [
'error',
{
// Ignore ava import because it is incorrectly reported as unresolved despite working as expected.
ignore: ['^ava$'],
},
],
},
};
6 changes: 3 additions & 3 deletions packages/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,12 @@
"files": [
"test/**/*"
],
"compileEnhancements": false,
"extensions": [
"ts"
],
"require": [
"./test-config/ts-node.config.js",
"source-map-support/register"
"source-map-support/register.js"
]
},
"dependencies": {
Expand All @@ -85,7 +84,7 @@
"@jsonforms/core": "workspace:*",
"@typescript-eslint/eslint-plugin": "^5.54.1",
"@typescript-eslint/parser": "^5.54.1",
"ava": "~2.4.0",
"ava": "^6.1.2",
"copy-webpack-plugin": "^5.0.5",
"eslint": "^8.56.0",
"eslint-config-prettier": "^8.7.0",
Expand All @@ -96,6 +95,7 @@
"prettier": "^2.8.4",
"rimraf": "^3.0.2",
"rxjs": "^6.6.0",
"source-map-support": "^0.5.21",
"tslib": "^2.3.0",
"typedoc": "~0.25.3",
"typescript": "~4.9.5"
Expand Down
7 changes: 7 additions & 0 deletions packages/core/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,12 @@ module.exports = {
caughtErrorsIgnorePattern: '^_',
},
],
'import/no-unresolved': [
'error',
{
// Ignore ava import because it is incorrectly reported as unresolved despite working as expected.
ignore: ['^ava$'],
},
],
},
};
7 changes: 3 additions & 4 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,12 @@
"files": [
"test/**/*"
],
"compileEnhancements": false,
"extensions": [
"ts"
],
"require": [
"./test-config/ts-node.config.js",
"source-map-support/register"
"source-map-support/register.js"
]
},
"nyc": {
Expand All @@ -76,7 +75,7 @@
"@types/redux-mock-store": "^1.0.1",
"@typescript-eslint/eslint-plugin": "^5.54.1",
"@typescript-eslint/parser": "^5.54.1",
"ava": "~2.4.0",
"ava": "^6.1.2",
"document-register-element": "^1.14.3",
"eslint": "^8.56.0",
"eslint-config-prettier": "^8.7.0",
Expand All @@ -93,7 +92,7 @@
"rollup-plugin-cleanup": "^3.2.1",
"rollup-plugin-typescript2": "^0.34.1",
"rollup-plugin-visualizer": "^5.4.1",
"source-map-support": "0.5.16",
"source-map-support": "^0.5.21",
"ts-node": "^10.4.0",
"tslib": "^2.5.0",
"typedoc": "~0.25.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/core/test/testers.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
import anyTest, { TestInterface } from 'ava';
import anyTest, { TestFn } from 'ava';
import {
and,
formatIs,
Expand Down Expand Up @@ -57,7 +57,7 @@ import {
hasOption,
} from '../src';

const test = anyTest as TestInterface<{ uischema: ControlElement }>;
const test = anyTest as TestFn<{ uischema: ControlElement }>;

const createTesterContext = (
rootSchema: JsonSchema,
Expand Down
4 changes: 2 additions & 2 deletions packages/core/test/util/array.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { moveDown, moveUp } from '../../src/util/';
import anyTest, { TestInterface } from 'ava';
import anyTest, { TestFn } from 'ava';

const test = anyTest as TestInterface<{ array: number[] }>;
const test = anyTest as TestFn<{ array: number[] }>;

test.beforeEach((t) => {
t.context.array = [1, 2, 3, 4, 5];
Expand Down
2 changes: 1 addition & 1 deletion packages/core/test/util/derivetype.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ test('derive type with type - union', (t) => {
type: ['string', 'number'],
};
t.is(deriveTypes(schema).length, 2);
t.is(deriveTypes(schema), schema.type);
t.is(deriveTypes(schema), schema.type as string[]);
});

test('derive type with type - allOf first has type', (t) => {
Expand Down
7 changes: 7 additions & 0 deletions packages/vanilla-renderers/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,12 @@ module.exports = {
caughtErrorsIgnorePattern: '^_',
},
],
'import/no-unresolved': [
'error',
{
// Ignore ava import because it is incorrectly reported as unresolved despite working as expected.
ignore: ['^ava$'],
},
],
},
};
1 change: 0 additions & 1 deletion packages/vanilla-renderers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@
"rollup-plugin-typescript2": "^0.34.1",
"rollup-plugin-visualizer": "^5.4.1",
"source-map-loader": "^0.2.4",
"source-map-support": "0.5.16",
"ts-jest": "^27.1.4",
"ts-loader": "^9.5.1",
"ts-node": "^10.4.0",
Expand Down
13 changes: 6 additions & 7 deletions packages/vue-vanilla/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,12 @@
"@types/node": "^18.19.4",
"@typescript-eslint/eslint-plugin": "^5.54.1",
"@typescript-eslint/parser": "^5.54.1",
"@vue/cli-plugin-babel": "~4.5.19",
"@vue/cli-plugin-typescript": "~4.5.19",
"@vue/cli-plugin-unit-mocha": "~4.5.19",
"@vue/cli-service": "~4.5.19",
"@vue/compiler-sfc": "^3.2.26",
"@vue/cli-plugin-babel": "~5.0.8",
"@vue/cli-plugin-typescript": "~5.0.8",
"@vue/cli-plugin-unit-mocha": "~5.0.8",
"@vue/cli-service": "~5.0.8",
"@vue/eslint-config-typescript": "^11.0.2",
"@vue/test-utils": "^2.0.2",
"@vue/test-utils": "^2.4.5",
"chai": "^4.1.2",
"cross-env": "^7.0.2",
"eslint": "^8.56.0",
Expand All @@ -90,7 +89,7 @@
"tslib": "^2.5.0",
"typedoc": "~0.25.3",
"typescript": "~4.9.5",
"vue": "^3.2.26",
"vue": "^3.4.21",
lucas-koehler marked this conversation as resolved.
Show resolved Hide resolved
"vue-jest": "^5.0.0-0"
},
"peerDependencies": {
Expand Down
3 changes: 3 additions & 0 deletions packages/vue-vanilla/tests/unit/util/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,8 @@ export const mountJsonForms = (
) => {
return mount(TestComponent, {
props: { initialData: data, schema, uischema, config },
// Attach mounted component to document. Without this, some events are not triggered as expected.
// E.g. a click on a checkbox input would not result in a change event.
attachTo: document.body,
});
};
11 changes: 5 additions & 6 deletions packages/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,11 @@
"@types/node": "^18.19.4",
"@typescript-eslint/eslint-plugin": "^5.54.1",
"@typescript-eslint/parser": "^5.54.1",
"@vue/cli-plugin-babel": "~4.5.19",
"@vue/cli-plugin-typescript": "~4.5.19",
"@vue/cli-service": "~4.5.19",
"@vue/compiler-sfc": "^3.2.26",
"@vue/cli-plugin-babel": "~5.0.8",
"@vue/cli-plugin-typescript": "~5.0.8",
"@vue/cli-service": "~5.0.8",
"@vue/eslint-config-typescript": "^11.0.2",
"@vue/test-utils": "^2.0.2",
"@vue/test-utils": "^2.4.5",
"@vue/vue3-jest": "^27.0.0",
"core-js": "^3.9.1",
"cross-env": "^7.0.2",
Expand All @@ -83,7 +82,7 @@
"tslib": "^2.5.0",
"typedoc": "~0.25.3",
"typescript": "~4.9.5",
"vue": "^3.2.26"
"vue": "^3.4.21"
},
"peerDependencies": {
"@jsonforms/core": "3.3.0-alpha.0",
Expand Down