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

Move vue packages up to be directly contained in packages folder; smaller deps improvements #2162

Merged
merged 4 commits into from
Sep 1, 2023
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- windows-latest
name: Run on ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Setup node
uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Create Changelog
id: create_changelog
uses: mikepenz/release-changelog-builder-action@v2
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ In this case, you can try to clean the repository with `git clean -dfx`. Beware
- Run React Vanilla examples: `cd packages/vanilla && pnpm run dev`
- Run React Material examples: `cd packages/material && pnpm run dev`
- Run Angular Material examples: `cd packages/angular-material && pnpm run dev`
- Run Vue Vanilla dev setup: `cd packages/vue/vue-vanilla && pnpm run serve`
- Run Vue Vanilla dev setup: `cd packages/vue-vanilla && pnpm run serve`

### Dependency & Release management

Expand Down
4 changes: 2 additions & 2 deletions packages/angular-material/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
"karma-jasmine": "^2.0.1",
"karma-jasmine-html-reporter": "^1.7.0",
"karma-sourcemap-loader": "^0.3.8",
"karma-webpack": "^3.0.5",
"karma-webpack": "^4.0.2",
"null-loader": "^0.1.1",
"nyc": "^15.1.0",
"prettier": "^2.8.4",
Expand All @@ -136,7 +136,7 @@
"rollup": "^2.78.0",
"rollup-plugin-cleanup": "^3.2.1",
"rollup-plugin-copy": "^3.4.0",
"rollup-plugin-import-css": "^3.1.0",
"rollup-plugin-import-css": "^3.3.1",
"rollup-plugin-typescript2": "^0.34.1",
"rollup-plugin-visualizer": "^5.4.1",
"rxjs": "^6.5.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/angular-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"karma-coverage-istanbul-reporter": "^2.1.1",
"karma-jasmine": "^2.0.1",
"karma-sourcemap-loader": "^0.3.8",
"karma-webpack": "^3.0.5",
"karma-webpack": "^4.0.2",
"prettier": "^2.8.4",
"tslib": "^2.5.0",
"typescript": "4.2.3"
Expand Down
2 changes: 1 addition & 1 deletion packages/examples-app/prepare-examples-app.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const examples = {
'react-vanilla': join(packagesDir, 'vanilla-renderers', 'example', 'dist'),
'react-material': join(packagesDir, 'material-renderers', 'example', 'dist'),
'angular-material': join(packagesDir, 'angular-material', 'example', 'dist'),
'vue-vanilla': join(packagesDir, 'vue', 'vue-vanilla', 'example', 'dist'),
'vue-vanilla': join(packagesDir, 'vue-vanilla', 'example', 'dist'),
};

// Clean and recreate dist dir
Expand Down
2 changes: 1 addition & 1 deletion packages/material-renderers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
"rollup": "^2.78.0",
"rollup-plugin-cleanup": "^3.2.1",
"rollup-plugin-copy": "^3.4.0",
"rollup-plugin-import-css": "^3.1.0",
"rollup-plugin-import-css": "^3.3.1",
"rollup-plugin-typescript2": "^0.34.1",
"rollup-plugin-visualizer": "^5.4.1",
"source-map-loader": "^0.2.4",
Expand Down
4 changes: 3 additions & 1 deletion packages/material-renderers/rollup.example.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ const config = {
nodeResolve({ browser: true }),
// Transform mixed because some JsonForms modules use import and require
commonjs({ transformMixedEsModules: true }),
css(),
css({
output: 'bundle.css',
}),
json(),
typescript({
tsconfigOverride: {
Expand Down
2 changes: 1 addition & 1 deletion packages/vanilla-renderers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"rollup": "^2.78.0",
"rollup-plugin-cleanup": "^3.2.1",
"rollup-plugin-copy": "^3.4.0",
"rollup-plugin-import-css": "^3.1.0",
"rollup-plugin-import-css": "^3.3.1",
"rollup-plugin-typescript2": "^0.34.1",
"rollup-plugin-visualizer": "^5.4.1",
"source-map-loader": "^0.2.4",
Expand Down
4 changes: 3 additions & 1 deletion packages/vanilla-renderers/rollup.example.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ const config = {
nodeResolve({ browser: true }),
// Transform mixed because some JsonForms modules use import and require
commonjs({ transformMixedEsModules: true }),
css(),
css({
output: 'bundle.css',
}),
json(),
typescript({
tsconfigOverride: {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,15 @@ export default defineComponent({
By default the Vanilla Renderers don't apply any CSS at all.
For a quick start you can use `@jsonforms/vue-vanilla/vanilla.css`.

For more information on how JSON Forms can be configured, please see the [README of `@jsonforms/vue`](https://github.com/eclipsesource/jsonforms/blob/master/packages/vue/vue/README.md).
For more information on how JSON Forms can be configured, please see the [README of `@jsonforms/vue`](https://github.com/eclipsesource/jsonforms/blob/master/packages/vue/README.md).

### Styling

Each rendered HTML element specifies a CSS class which can be used to style it.
This process can also be customized so that each element declares user-specified CSS classes.
Therefore JSON Forms Vue Vanilla can be integrated with any CSS-only UI framework quite easily.

You can find the default CSS classes in `[defaultStyles.ts](https://github.com/eclipsesource/jsonforms/blob/master/packages/vue/vue-vanilla/src/styles/defaultStyles.ts).
You can find the default CSS classes in `[defaultStyles.ts](https://github.com/eclipsesource/jsonforms/blob/master/packages/vue-vanilla/src/styles/defaultStyles.ts).

To render your own classes simply `provide` them as `styles`.
These `styles` replace the `defaultStyles`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import '../../vanilla.css';
import { JsonFormsI18nState } from '@jsonforms/core';
import { ErrorObject } from 'ajv';
import { getExamples } from '../../../../examples';
import { getExamples } from '../../../examples';
import get from 'lodash/get';
// mergeStyles combines all classes from both styles definitions into one
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,7 @@
],
"scripts": {
"serve": "vue-cli-service serve dev/serve.ts",
"build:pre": "rimraf ../vue/node_modules/@jsonforms/core",
"build:do": "cross-env NODE_ENV=production rollup --config rollup.config.js",
"build": "run-s --continue-on-error build:pre build:do build:after",
"build:after": "symlink-dir ../../core ../vue/node_modules/@jsonforms/core",
"build": "cross-env NODE_ENV=production rollup --config rollup.config.js",
"build:examples-app": "rollup -c rollup.example.config.js",
"clean": "rimraf lib example/dist",
"lint": "eslint .",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ const config = {
nodeResolve({ browser: true }),
// Transform mixed because some JsonForms modules use import and require
commonjs({ transformMixedEsModules: true }),
css(),
css({
output: 'bundle.css',
}),
json(),
typescript({
tsconfigOverride: {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading