Skip to content

Commit d99cd8c

Browse files
vip-gitvip-git
committed
fix: issues resolved with ci run
1 parent e304243 commit d99cd8c

File tree

4 files changed

+203
-19
lines changed

4 files changed

+203
-19
lines changed

‎.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- uses: actions/setup-node@v1
3333
with:
3434
node-version: 14
35-
- run: npm install
35+
- run: CI_RUN=true npm install
3636
- run: npm run build
3737
- run: npx jest --env=jsdom --config=jest.config.js --coverage --ci --updateSnapshot --detectOpenHandles --forceExit
3838

@@ -46,7 +46,7 @@ jobs:
4646
with:
4747
node-version: 14
4848
registry-url: https://registry.npmjs.org/
49-
- run: npm install
49+
- run: CI_RUN=true npm install
5050
- run: npm run build
5151
- run: npx tsc index.js --declaration --allowJs --emitDeclarationOnly --skipLibCheck --outDir .
5252
- run: npm install -g json
@@ -66,7 +66,7 @@ jobs:
6666
with:
6767
node-version: 14
6868
registry-url: https://npm.pkg.github.com/
69-
- run: npm install
69+
- run: CI_RUN=true npm install
7070
- run: npm run build
7171
- run: npx tsc index.js --declaration --allowJs --emitDeclarationOnly --skipLibCheck --outDir .
7272
- run: npm install -g json

‎package-original.json

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
{
2+
"author": "Vipin Tanna",
3+
"homepage": "https://docs.universal-json-schema.app",
4+
"repository": {
5+
"type": "git",
6+
"url": "git+https://github.com/vip-git/universal-json-schema.git"
7+
},
8+
"bugs": {
9+
"url": "https://github.com/vip-git/universal-json-schema/issues"
10+
},
11+
"scripts": {
12+
"postinstall": "ts-node scripts/installer/index.ts --reactMUI",
13+
"install-react-mui": "ts-node scripts/installer/index.ts --reactMUI",
14+
"install-vue-mui": "ts-node scripts/installer/index.ts --vueMUI",
15+
"install-react-native-paper": "ts-node scripts/installer/index.ts --reactNativePaper",
16+
"install-angular-mui": "ts-node scripts/installer/index.ts --angularMUI",
17+
"install-stencil-ionic": "ts-node scripts/installer/index.ts --stencilIonic",
18+
"install-svelte-mui": "ts-node scripts/installer/index.ts --svelteMUI",
19+
"build": "rollup -c",
20+
"build:demo": "cross-env NODE_ENV=production webpack --config webpack.config.demo.js",
21+
"generate:tests": "node scripts/generator/index.js --testsOnly",
22+
"test": "node scripts/test.js --env=jsdom --config=jest.config.js --coverage",
23+
"lint": "eslint src --fix",
24+
"test:watch": "node scripts/test.js --env=jsdom --config=jest.config.js",
25+
"heroku-postbuild": "npm run build:demo",
26+
"now-build": "npm run build:demo",
27+
"start:ci": "cross-env NODE_ENV=production node demo/web/react/server.js",
28+
"start": "cross-env NODE_ENV=development node demo/web/react/server.js",
29+
"start:demo": "npm run build:demo && npm start",
30+
"start:demo:ci": "npm run build:demo && npm run start:ci",
31+
"deploy:alpha": "npm run build && npm version prerelease --preid=alpha && npm publish",
32+
"deploy": "npm run build && npm version patch && npm publish",
33+
"test:e2e": "npx wdio run wdio.conf.js",
34+
"test:e2e:browserstack:ci": "npx wdio run wdio-ci.conf.js",
35+
"test:e2e:sauce:ci": "npx wdio run wdio-sauce-ci.conf.js",
36+
"posttest": "npm run lint"
37+
},
38+
"pre-commit": [
39+
"lint",
40+
"test"
41+
],
42+
"dependencies": {
43+
"cross-env": "7.0.3",
44+
"ts-node": "10.4.0",
45+
"shelljs": "0.8.4",
46+
"typescript": "4.3.2"
47+
},
48+
"description": "universal-jsonschema-form with UI and XHR Schema.",
49+
"devDependencies": {
50+
"@types/node": "14.18.0"
51+
},
52+
"license": "ISC",
53+
"main": "index.js",
54+
"name": "react-jsonschema-form-material-ui",
55+
"version": "3.0.0-rc.0",
56+
"directories": {
57+
"doc": "docs"
58+
},
59+
"keywords": []
60+
}

‎package.json

Lines changed: 136 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"author": "Vipin Tanna",
3-
"homepage": "https://docs.universal-json-schema.app",
3+
"homepage": "https://react-json-schema.app",
44
"repository": {
55
"type": "git",
66
"url": "git+https://github.com/vip-git/universal-json-schema.git"
@@ -9,13 +9,7 @@
99
"url": "https://github.com/vip-git/universal-json-schema/issues"
1010
},
1111
"scripts": {
12-
"postinstall": "ts-node scripts/installer/index.ts --reactMUI",
13-
"install-react-mui": "ts-node scripts/installer/index.ts --reactMUI",
14-
"install-vue-mui": "ts-node scripts/installer/index.ts --vueMUI",
15-
"install-react-native-paper": "ts-node scripts/installer/index.ts --reactNativePaper",
16-
"install-angular-mui": "ts-node scripts/installer/index.ts --angularMUI",
17-
"install-stencil-ionic": "ts-node scripts/installer/index.ts --stencilIonic",
18-
"install-svelte-mui": "ts-node scripts/installer/index.ts --svelteMUI",
12+
"postinstall": "cross-env FRAMEWORK_NAME=$FRAMEWORK_NAME UI_FRAMEWORK_NAME=$UI_FRAMEWORK_NAME node scripts/generator/index.js",
1913
"build": "rollup -c",
2014
"build:demo": "cross-env NODE_ENV=production webpack --config webpack.config.demo.js",
2115
"generate:tests": "node scripts/generator/index.js --testsOnly",
@@ -40,18 +34,146 @@
4034
"test"
4135
],
4236
"dependencies": {
43-
"cross-env": "7.0.3",
44-
"ts-node": "10.4.0",
45-
"shelljs": "0.8.4",
46-
"typescript": "4.3.2"
37+
"@date-io/moment": "2.11.0",
38+
"@emotion/react": "11.4.1",
39+
"@emotion/styled": "11.3.0",
40+
"@mui/icons-material": "5.0.0",
41+
"@mui/lab": "5.0.0-alpha.47",
42+
"@mui/material": "5.0.0",
43+
"@mui/styles": "5.0.0",
44+
"@material-ui/pickers": "3.3.10",
45+
"@react-jsonschema-form-components/material-radio-group": "3.0.0",
46+
"@react-jsonschema-form-interceptors/translate-currency": "2.0.0",
47+
"@react-jsonschema-form-interceptors/translate-range-date": "2.0.0",
48+
"@react-jsonschema-form-interceptors/translate-ratings": "2.0.0",
49+
"@react-jsonschema-form-utils/enum-utils": "2.0.1",
50+
"@react-jsonschema-form-utils/parse-values": "2.0.1",
51+
"ajv": "6.12.6",
52+
"body-parser": "1.19.0",
53+
"brace": "0.11.1",
54+
"braces": "3.0.2",
55+
"classnames": "2.2.6",
56+
"cross-env": "7.0.2",
57+
"immutability-helper": "^2.6.5 || ^3.0.0",
58+
"immutable": "3.8.2",
59+
"is-hotkey": "0.1.6",
60+
"lodash": "4.17.21",
61+
"moment": "2.29.1",
62+
"nanoid": "3.1.23",
63+
"prop-types": "15.7.2",
64+
"react": "^16 || ^17.0.1",
65+
"react-dom": "^16 || ^17.0.1",
66+
"react-hot-loader": "4.13.0",
67+
"react-material-ui-5-date-range-picker": "5.0.1",
68+
"react-number-format": "4.5.0",
69+
"react-select": "4.1.0",
70+
"slate": "0.47.9",
71+
"slate-collapse-on-escape": "0.8.1",
72+
"slate-html-serializer": "0.8.13",
73+
"slate-plain-serializer": "0.7.13",
74+
"slate-react": "0.22.9",
75+
"slate-soft-break": "0.9.0",
76+
"styled-components": "5.3.0",
77+
"typeface-roboto": "0.0.75",
78+
"url-shim": "1.0.1",
79+
"util": "0.12.3",
80+
"xstate": "4.19.2"
4781
},
48-
"description": "universal-jsonschema-form with UI and XHR Schema.",
82+
"description": "Material UI implementation of react-jsonschema-form with UI and XHR Schema.",
4983
"devDependencies": {
50-
"@types/node": "14.18.0"
84+
"@babel/core": "7.14.0",
85+
"@babel/plugin-proposal-class-properties": "7.13.0",
86+
"@babel/plugin-proposal-object-rest-spread": "7.13.8",
87+
"@babel/plugin-proposal-optional-chaining": "7.13.12",
88+
"@babel/plugin-syntax-dynamic-import": "7.8.3",
89+
"@babel/plugin-syntax-jsx": "^7.12.13",
90+
"@babel/plugin-transform-modules-commonjs": "7.14.0",
91+
"@babel/plugin-transform-runtime": "7.13.15",
92+
"@babel/polyfill": "7.12.1",
93+
"@babel/preset-env": "7.14.0",
94+
"@babel/preset-react": "7.13.13",
95+
"@babel/preset-typescript": "7.13.0",
96+
"@babel/register": "7.13.16",
97+
"@babel/runtime": "7.12.5",
98+
"@monaco-editor/react": "4.0.6",
99+
"@rollup/plugin-commonjs": "19.0.0",
100+
"@rollup/plugin-json": "^4.1.0",
101+
"@rollup/plugin-typescript": "8.2.1",
102+
"@testing-library/react-hooks": "^5.1.2",
103+
"@types/estree": "0.0.47",
104+
"@types/jest": "26.0.21",
105+
"@types/json-schema": "^7.0.8",
106+
"@types/node": "15.6.1",
107+
"@typescript-eslint/eslint-plugin": "4.22.0",
108+
"@typescript-eslint/parser": "4.22.0",
109+
"@wojtekmaj/enzyme-adapter-react-17": "0.6.1",
110+
"autoprefixer": "10.2.1",
111+
"babel-eslint": "10.1.0",
112+
"babel-loader": "8.2.2",
113+
"cheerio": "1.0.0-rc.3",
114+
"compression-webpack-plugin": "7.1.2",
115+
"core-js": "3.8.2",
116+
"css-hot-loader": "1.4.4",
117+
"css-loader": "5.1.0",
118+
"date-fns": "2.15.0",
119+
"ejs": "3.1.6",
120+
"enzyme": "3.11.0",
121+
"enzyme-to-json": "3.6.2",
122+
"eslint": "7.15.0",
123+
"eslint-config-airbnb": "18.2.1",
124+
"eslint-loader": "4.0.2",
125+
"eslint-plugin-babel": "5.3.1",
126+
"eslint-plugin-class-property": "1.1.0",
127+
"eslint-plugin-import": "2.22.1",
128+
"eslint-plugin-jest": "24.3.6",
129+
"eslint-plugin-jsx-a11y": "6.4.1",
130+
"eslint-plugin-react": "7.21.5",
131+
"eslint-plugin-react-hooks": "4.2.0",
132+
"express": "4.17.1",
133+
"file-loader": "6.0.0",
134+
"fs-extra": "10.0.0",
135+
"gts": "3.1.0",
136+
"html-webpack-plugin": "4.3.0",
137+
"husky": "^6.0.0",
138+
"image-webpack-loader": "6.0.0",
139+
"jest": "26.6.3",
140+
"jest-transform-stub": "2.0.0",
141+
"jsdom": "16.5.3",
142+
"mini-css-extract-plugin": "1.3.9",
143+
"multiple-cucumber-html-reporter": "1.18.0",
144+
"namor": "2.0.2",
145+
"node-fetch": "2.6.1",
146+
"node-sass": "5.0.0",
147+
"postcss": "8.2.13",
148+
"postcss-assets": "5.0.0",
149+
"postcss-custom-properties": "^8.0.11",
150+
"postcss-flexbugs-fixes": "5.0.2",
151+
"postcss-import": "14.0.0",
152+
"postcss-loader": "4.1.0",
153+
"postcss-nested": "5.0.3",
154+
"postcss-normalize": "^10.0.0",
155+
"pre-commit": "1.2.2",
156+
"raf": "3.4.1",
157+
"rollup": "2.50.1",
158+
"rollup-plugin-terser": "^7.0.2",
159+
"sass-loader": "11.0.1",
160+
"shelljs": "0.8.4",
161+
"testdom": "3.0.0",
162+
"ts-jest": "26.5.5",
163+
"typescript": "4.3.2",
164+
"url-loader": "4.1.0",
165+
"webpack": "5.15.0",
166+
"webpack-bundle-analyzer": "4.3.0",
167+
"webpack-cli": "4.3.1",
168+
"webpack-dev-middleware": "4.1.0",
169+
"webpack-hot-middleware": "2.25.0"
51170
},
52171
"license": "ISC",
53172
"main": "index.js",
54173
"name": "react-jsonschema-form-material-ui",
174+
"peerDependencies": {
175+
"immutability-helper": "^2.6.5 || ^3.0.0"
176+
},
55177
"version": "3.0.0-rc.0",
56178
"directories": {
57179
"doc": "docs"

‎scripts/installer/framework-generator.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,10 @@ const frameworkGenerator = ({
5454
shelljs.cp(reactMUIPackageJson, `${shelljs.pwd()}/package.json`);
5555
shelljs.exec(`cross-env INTERCEPTORS_FRAMEWORK_NAME=${interceptorFrameworkName} UTILS_FRAMEWORK_NAME=${utilsFrameworkName} COMPONENTS_FRAMEWORK_NAME=${frameworkName} UI_FRAMEWORK_NAME=${uiFrameworkName} npm install --force`);
5656
shelljs.exec(`cross-env INTERCEPTORS_FRAMEWORK_NAME=${interceptorFrameworkName} UTILS_FRAMEWORK_NAME=${utilsFrameworkName} COMPONENTS_FRAMEWORK_NAME=${frameworkName} UI_FRAMEWORK_NAME=${uiFrameworkName} npm run postinstall`);
57-
shelljs.rm('-rf', `${shelljs.pwd()}/package.json`);
58-
shelljs.mv(`${shelljs.pwd()}/package-original.json`, `${shelljs.pwd()}/package.json`);
57+
if (!process.env.CI_RUN) {
58+
shelljs.rm('-rf', `${shelljs.pwd()}/package.json`);
59+
shelljs.mv(`${shelljs.pwd()}/package-original.json`, `${shelljs.pwd()}/package.json`);
60+
}
5961
}
6062

6163
module.exports = frameworkGenerator;

0 commit comments

Comments
 (0)