Skip to content

Fix compatibility issue with Windows #1680

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.

Sign up for GitHub

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

Merged
sdirix merged 10 commits into from
Apr 30, 2021
Merged

Fix compatibility issue with Windows #1680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1611262
Add devDependencies to single packages and remove bin paths
TheZoker Apr 27, 2021
7e058b7
Add any to every vue renderer
TheZoker Apr 27, 2021
c8d3327
Update package lock
TheZoker Apr 27, 2021
d7b7606
Adjust Github action
sdirix Apr 30, 2021
4794a9c
Revert "Add any to every vue renderer"
sdirix Apr 30, 2021
bca89f4
Adjust Github action again
sdirix Apr 30, 2021
ddd9d7b
Adjust test-cov script
sdirix Apr 30, 2021
27f290a
Add prop types
sdirix Apr 30, 2021
86421c2
try special build
sdirix Apr 30, 2021
c0a9c0c
Adjust build script
sdirix Apr 30, 2021
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
9 changes: 0 additions & 9 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,5 @@ jobs:
npm run bundle
- name: Test
run: |
npm test
npm run test-cov
npm run check-format
#- name: Merge Reports
# if: success()
# run: 'npm run merge-report && cat coverage/lcov.info'
#- name: Upload Report
# if: success()
# uses: coverallsapp/github-action@master
# with:
# github-token: ${{ secrets.coverall_token }}
2,456 changes: 1,506 additions & 950 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,13 @@
"ajv": "^6.10.2",
"ava": "~2.4.0",
"babel-loader": "^8.0.6",
"coveralls": "^3.0.9",
"core-js": "^3.9.1",
"coveralls": "^3.0.9",
"cross-env": "^7.0.2",
"css-loader": "^3.2.0",
"lcov-result-merger": "^3.1.0",
"lerna": "^3.19.0",
"nan": "^2.14.2",
"nyc": "^14.1.1",
"prettier": "^1.19.1",
"source-map-loader": "^0.2.4",
Expand All @@ -36,7 +37,7 @@
"tslint": "^5.20.1",
"tslint-loader": "^3.5.4",
"tslint-react": "^4.1.0",
"typedoc": "^0.15.3",
"typedoc": "^0.19.2",
"typescript": "3.8.3",
"webpack": "^4.41.2",
"webpack-merge": "^4.2.2"
Expand Down
22 changes: 14 additions & 8 deletions packages/angular-material/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@
"main": "./lib/index.js",
"typings": "./lib/index.d.ts",
"scripts": {
"bundle": "../../node_modules/.bin/webpack --config webpack/webpack.build.js --env=production --display-error-details",
"build": "../../node_modules/.bin/ngc",
"dev": "../../node_modules/.bin/webpack --config webpack/webpack.dev.js && webpack-dev-server --config webpack/webpack.dev.js --env=dev --inline",
"clean": "rm -rf lib coverage dist .nyc_output 2> /dev/null",
"lint": "../../node_modules/.bin/tslint --project tsconfig.json --exclude src/models/jsonSchema.ts",
"report": "../../node_modules/.bin/nyc report --reporter=html",
"doc": "../../node_modules/.bin/typedoc --name 'JSON Forms Angular Material Renderers' --mode file --out docs src",
"bundle": "webpack --config webpack/webpack.build.js --env=production --display-error-details",
"build": "ngc",
"dev": "webpack --config webpack/webpack.dev.js && webpack-dev-server --config webpack/webpack.dev.js --env=dev --inline",
"clean": "rimraf lib coverage dist .nyc_output 2> /dev/null",
"lint": "tslint --project tsconfig.json --exclude src/models/jsonSchema.ts",
"report": "nyc report --reporter=html",
"doc": "typedoc --name 'JSON Forms Angular Material Renderers' --mode file --out docs src",
"test": "karma start ./test-config/karma.conf.js --single-run",
"test-ci": "karma start ./test-config/karma.conf.js --single-run",
"test-cov": "node --max_old_space_size=4096 ../../node_modules/.bin/karma start ./test-config/karma.conf.js --coverage --single-run",
"test-cov": "karma start ./test-config/karma.conf.js --coverage --single-run",
"e2e": "npm run e2e-update && npm run e2e-test",
"e2e-test": "protractor ./test-config/protractor.conf.js",
"e2e-update": "webdriver-manager update --standalone false --gecko false"
Expand Down Expand Up @@ -77,6 +77,7 @@
"@angular/cdk": "^9.0.0",
"@angular/common": "^9.0.0",
"@angular/compiler": "^9.0.0",
"@angular/compiler-cli": "^9.0.0",
"@angular/core": "^9.0.0",
"@angular/flex-layout": "^9.0.0-beta.29",
"@angular/forms": "^9.0.0",
Expand Down Expand Up @@ -105,10 +106,15 @@
"karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "^3.0.5",
"null-loader": "^0.1.1",
"nyc": "^14.1.1",
"protractor": "^5.4.1",
"request": "^2.88.0",
"rimraf": "^3.0.2",
"rxjs": "^6.4.0",
"tslint": "^5.20.1",
"ts-loader": "^6.2.1",
"typedoc": "^0.19.2",
"webpack": "^4.41.2",
"webpack-cli": "^3.2.1",
"webpack-dev-server": "^3.9.0",
"zone.js": "^0.10.2"
Expand Down
5 changes: 3 additions & 2 deletions packages/angular-test/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@
"karma-coverage-istanbul-reporter": "^2.0.4",
"karma-jasmine": "^2.0.1",
"karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "^3.0.5"
"karma-webpack": "^3.0.5",
"typescript": "3.8.3"
},
"scripts": {
"build": "../../node_modules/.bin/tsc",
"build": "tsc",
"test": "echo 'Nothing to do'"
}
}
23 changes: 15 additions & 8 deletions packages/angular/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
"main": "./lib/index.js",
"typings": "./lib/index.d.ts",
"scripts": {
"bundle": "../../node_modules/.bin/webpack --config ./webpack.build.js --env=production --display-error-details",
"build": "../../node_modules/.bin/ngc",
"clean": "rm -rf lib coverage dist .nyc_output 2> /dev/null",
"lint": "../../node_modules/.bin/tslint --project tsconfig.json --exclude src/models/jsonSchema.ts",
"report": "../../node_modules/.bin/nyc report --reporter=html",
"test": "../../node_modules/.bin/ava",
"test-cov": "../../node_modules/.bin/nyc ../../node_modules/.bin/ava",
"doc": "../../node_modules/.bin/typedoc --name 'JSON Forms Angular Core' --mode file --out docs src"
"bundle": "webpack --config ./webpack.build.js --env=production --display-error-details",
"build": "ngc",
"clean": "rimraf lib coverage dist .nyc_output 2> /dev/null",
"lint": "tslint --project tsconfig.json --exclude src/models/jsonSchema.ts",
"report": "nyc report --reporter=html",
"test": "ava",
"test-cov": "nyc ava",
"doc": "typedoc --name 'JSON Forms Angular Core' --mode file --out docs src"
},
"nyc": {
"reporter": [
Expand Down Expand Up @@ -72,8 +72,15 @@
"@angular/core": "^9.0.0",
"@angular/forms": "^9.0.0",
"@jsonforms/core": "^2.5.1-beta.0",
"ava": "~2.4.0",
"copy-webpack-plugin": "^5.0.5",
"nyc": "^14.1.1",
"rimraf": "^3.0.2",
"rxjs": "^6.4.0",
"tslint": "^5.20.1",
"typedoc": "^0.19.2",
"webpack": "^4.41.2",
"webpack-cli": "^3.2.1",
"webpack-dev-server": "^3.9.0"
}
}
25 changes: 16 additions & 9 deletions packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
"main": "./lib/index.js",
"typings": "./lib/index.d.ts",
"scripts": {
"bundle": "../../node_modules/.bin/webpack --config ./webpack.build.js --env=production --display-error-details",
"build": "../../node_modules/.bin/tsc",
"clean": "rm -rf lib coverage dist .nyc_output 2> /dev/null",
"lint": "../../node_modules/.bin/tslint --project tsconfig.json --exclude src/models/jsonSchema.ts",
"report": "../../node_modules/.bin/nyc report --reporter=html",
"test": "../../node_modules/.bin/ava",
"test-cov": "../../node_modules/.bin/nyc ../../node_modules/.bin/ava",
"doc": "../../node_modules/.bin/typedoc --name 'JSON Forms Core' --mode file --excludeExternals --theme ../../typedoc-jsonforms --out docs src"
"bundle": "webpack --config ./webpack.build.js --env=production --display-error-details",
"build": "tsc",
"clean": "rimraf -rf lib coverage dist .nyc_output 2> /dev/null",
"lint": "tslint --project tsconfig.json --exclude src/models/jsonSchema.ts",
"report": "nyc report --reporter=html",
"test": "ava",
"test-cov": "nyc ava",
"doc": "typedoc --name 'JSON Forms Core' --mode file --excludeExternals --theme ../../typedoc-jsonforms --out docs src"
},
"ava": {
"files": [
Expand Down Expand Up @@ -75,9 +75,16 @@
"document-register-element": "^1.14.3",
"jsdom": "^15.2.1",
"jsdom-global": "^3.0.2",
"nyc": "^14.1.1",
"redux": "^4.0.4",
"redux-mock-store": "1.5.3",
"rimraf": "^3.0.2",
"source-map-support": "0.5.16",
"ts-node": "^8.5.3"
"ts-node": "^8.5.3",
"tslint": "^5.20.1",
"typedoc": "^0.19.2",
"typescript": "3.8.3",
"webpack": "^4.41.2",
"webpack-cli": "^3.2.1"
}
}
17 changes: 12 additions & 5 deletions packages/examples/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,21 @@
"main": "./lib/index.js",
"typings": "./lib/index.d.ts",
"scripts": {
"build": "../../node_modules/.bin/tsc",
"clean": "rm -rf lib coverage dist .nyc_output 2> /dev/null",
"lint": "../../node_modules/.bin/tslint --project ../../tslint.json --exclude src/models/jsonSchema.ts",
"build": "tsc",
"clean": "rimraf lib coverage dist .nyc_output 2> /dev/null",
"lint": "tslint --project ../../tslint.json --exclude src/models/jsonSchema.ts",
"test": "echo 'Nothing to do for `examples` package'",
"doc": "../../node_modules/.bin/typedoc --name 'JSON Forms Examples' --mode file --excludeExternals --theme ../../typedoc-jsonforms --out docs src"
"doc": "typedoc --name 'JSON Forms Examples' --mode file --excludeExternals --theme ../../typedoc-jsonforms --out docs src"
},
"dependencies": {
"@jsonforms/core": "^2.5.1-beta.0",
"ajv-i18n": "^3.5.0"
"ajv-i18n": "^3.5.0",
"redux": "^4.0.4"
},
"devDependencies": {
"rimraf": "^3.0.2",
"tslint": "^5.20.1",
"typedoc": "^0.19.2",
"typescript": "3.8.3"
}
}
21 changes: 14 additions & 7 deletions packages/material/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@
"main": "lib/index.js",
"typings": "lib/index.d.ts",
"scripts": {
"bundle": "../../node_modules/.bin/webpack --config ./webpack/webpack.build.js --env=production --display-error-details",
"build": "../../node_modules/.bin/tsc",
"dev": "../../node_modules/.bin/webpack --config webpack/webpack.dev.js && webpack-dev-server --config webpack/webpack.dev.js --env=dev --inline",
"clean": "rm -rf lib coverage dist .nyc_output 2> /dev/null",
"lint": "../../node_modules/.bin/tslint --project tsconfig.json --exclude src/models/jsonSchema.ts",
"bundle": "webpack --config ./webpack/webpack.build.js --env=production --display-error-details",
"build": "tsc",
"dev": "webpack --config webpack/webpack.dev.js && webpack-dev-server --config webpack/webpack.dev.js --env=dev --inline",
"clean": "rimraf lib coverage dist .nyc_output 2> /dev/null",
"lint": "tslint --project tsconfig.json --exclude src/models/jsonSchema.ts",
"test": "jest --no-cache",
"test-cov": "jest --no-cache --coverage",
"report": "../../node_modules/.bin/nyc report --reporter=html",
"doc": "../../node_modules/.bin/typedoc --name 'JSON Forms React Material Renderers' --mode file --excludeExternals --theme ../../typedoc-jsonforms --out docs src"
"report": "nyc report --reporter=html",
"doc": "typedoc --name 'JSON Forms React Material Renderers' --mode file --excludeExternals --theme ../../typedoc-jsonforms --out docs src"
},
"jest": {
"moduleFileExtensions": [
Expand Down Expand Up @@ -93,11 +93,18 @@
"enzyme": "^3.10.0",
"enzyme-adapter-react-16": "^1.15.1",
"jest": "^24.9.0",
"nyc": "^14.1.1",
"react-dom": "^16.12.0",
"rimraf": "^3.0.2",
"source-map-loader": "^0.2.4",
"ts-jest": "^24.2.0",
"ts-loader": "^6.2.1",
"tslint": "^5.20.1",
"tslint-loader": "^3.5.4",
"typedoc": "^0.19.2",
"typescript": "3.8.3",
"webpack": "^4.41.2",
"webpack-cli": "^3.2.1",
"webpack-dev-server": "^3.9.0"
}
}
21 changes: 14 additions & 7 deletions packages/react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
"main": "./lib/index.js",
"typings": "./lib/index.d.ts",
"scripts": {
"bundle": "../../node_modules/.bin/webpack --config ./webpack.build.js --env=production --display-error-details",
"build": "../../node_modules/.bin/tsc",
"clean": "rm -rf lib coverage dist .nyc_output 2> /dev/null",
"lint": "../../node_modules/.bin/tslint --project tsconfig.json --exclude src/models/jsonSchema.ts",
"report": "../../node_modules/.bin/nyc report --reporter=html",
"bundle": "webpack --config ./webpack.build.js --env=production --display-error-details",
"build": "tsc",
"clean": "rimraf lib coverage dist .nyc_output 2> /dev/null",
"lint": "tslint --project tsconfig.json --exclude src/models/jsonSchema.ts",
"report": "nyc report --reporter=html",
"test": "jest --no-cache",
"test-cov": "jest --no-cache --coverage",
"doc": "../../node_modules/.bin/typedoc --name 'JSON Forms React Core' --mode file --out docs src"
"doc": "typedoc --name 'JSON Forms React Core' --mode file --out docs src"
},
"ava": {
"verbose": true,
Expand Down Expand Up @@ -92,11 +92,18 @@
"enzyme": "^3.10.0",
"enzyme-adapter-react-16": "^1.15.1",
"jest": "^24.9.0",
"nyc": "^14.1.1",
"react": "^16.12.0",
"react-dom": "^16.12.0",
"react-redux": "^7.1.3",
"redux": "^4.0.4",
"redux-mock-store": "1.5.3",
"ts-jest": "^24.2.0"
"rimraf": "^3.0.2",
"ts-jest": "^24.2.0",
"tslint": "^5.20.1",
"typedoc": "^0.19.2",
"typescript": "3.8.3",
"webpack": "^4.41.2",
"webpack-cli": "^3.2.1"
}
}
20 changes: 13 additions & 7 deletions packages/vanilla/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
"main": "lib/index.js",
"typings": "lib/index.d.ts",
"scripts": {
"bundle": "../../node_modules/.bin/webpack --config ./webpack/webpack.build.js --env=production --display-error-details",
"build": "../../node_modules/.bin/tsc",
"dev": "../../node_modules/.bin/webpack --config ./webpack/webpack.dev.js && webpack-dev-server --config webpack/webpack.dev.js --env=dev --inline",
"clean": "rm -rf lib coverage dist .nyc_output 2> /dev/null",
"lint": "../../node_modules/.bin/tslint --project tsconfig.json --exclude src/models/jsonSchema.ts",
"report": "../../node_modules/.bin/nyc report --reporter=html",
"bundle": "webpack --config ./webpack/webpack.build.js --env=production --display-error-details",
"build": "tsc",
"dev": "webpack --config ./webpack/webpack.dev.js && webpack-dev-server --config webpack/webpack.dev.js --env=dev --inline",
"clean": "rimraf lib coverage dist .nyc_output 2> /dev/null",
"lint": "tslint --project tsconfig.json --exclude src/models/jsonSchema.ts",
"report": "nyc report --reporter=html",
"test": "jest --no-cache",
"test-cov": "jest --no-cache --coverage",
"doc": "../../node_modules/.bin/typedoc --name 'JSON Forms Vanilla Renderers' --mode file --excludeExternals --theme ../../typedoc-jsonforms --out docs src"
"doc": "typedoc --name 'JSON Forms Vanilla Renderers' --mode file --excludeExternals --theme ../../typedoc-jsonforms --out docs src"
},
"keywords": [
"vanilla",
Expand Down Expand Up @@ -51,13 +51,19 @@
"jest": "^24.9.0",
"jsdom": "^15.2.1",
"jsdom-global": "^3.0.2",
"nyc": "^14.1.1",
"react-dom": "^16.12.0",
"react-redux": "^7.1.3",
"rimraf": "^3.0.2",
"source-map-loader": "^0.2.4",
"source-map-support": "0.5.16",
"ts-loader": "^6.2.1",
"ts-node": "^8.5.3",
"tslint": "^5.20.1",
"tslint-loader": "^3.5.4",
"typedoc": "^0.19.2",
"webpack": "^4.41.2",
"webpack-cli": "^3.2.1",
"webpack-dev-server": "^3.9.0"
},
"jest": {
Expand Down
25 changes: 9 additions & 16 deletions packages/vue/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/vue/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"private": true,
"description": "Meta package for JSON Forms Vue 3 development",
"devDependencies": {
"vue": "^3.0.3"
"vue": "3.0.7"
}
}
Loading