Skip to content

Commit

Permalink
Merge pull request #13 from zowe/staging
Browse files Browse the repository at this point in the history
Zowe Suite 1.3.0
  • Loading branch information
1000TurquoisePogs authored May 24, 2019
2 parents 0e331cc + 13335de commit ad26c99
Show file tree
Hide file tree
Showing 12 changed files with 376 additions and 134 deletions.
6 changes: 2 additions & 4 deletions pluginDefinition.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"identifier": "org.zowe.zlux.sample.react",
"apiVersion": "1.0.0",
"pluginVersion": "1.0.0",
"pluginVersion": "1.1.0",
"pluginType": "application",
"webContent": {
"framework": "react",
Expand All @@ -15,9 +15,7 @@
"isSingleWindowApp": true,
"defaultWindowStyle": {
"width": 800,
"height": 450,
"x": 200,
"y": 50
"height": 450
}
},
"dataServices": [
Expand Down
168 changes: 81 additions & 87 deletions webClient/package-lock.json

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

21 changes: 12 additions & 9 deletions webClient/package.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,27 @@
{
"name": "org.zowe.zlux.sample.react",
"version": "1.0.0",
"version": "1.1.0",
"description": "A sample react showcasing react framework in Zowe App Framework",
"license": "EPL-2.0",
"dependencies": {
"react": "~16.4.0",
"react-dom": "~16.4.0",
"i18next": "~15.1.0",
"i18next-browser-languagedetector": "~3.0.1",
"i18next-xhr-backend": "~2.0.1",
"react": "~16.8.6",
"react-dom": "~16.8.6",
"react-i18next": "~10.9.0",
"react-router": "~4.3.1",
"react-scripts-ts": "2.16.0"
},
"scripts": {
"start": "webpack --progress --colors --watch",
"build": "webpack --progress --colors",
"test": "react-scripts-ts test --env=jsdom",
"eject": "react-scripts-ts eject"
},
"devDependencies": {
"@types/jest": "~23.0.2",
"@types/react": "~16.3.17",
"@types/react-dom": "~16.0.6",
"@types/react": "~16.3.18",
"@types/react-dom": "~16.0.11",
"copy-webpack-plugin": "~4.5.2",
"css-loader": "~1.0.0",
"exports-loader": "~0.7.0",
Expand All @@ -27,11 +30,11 @@
"script-loader": "~0.7.2",
"source-map-loader": "~0.2.3",
"ts-loader": "~4.4.2",
"typescript": "~2.9.0",
"tslint": "~5.10.0",
"typescript": "~2.9.0",
"url-loader": "~1.0.1",
"webpack": "~4.0.0",
"webpack-config": "~7.5.0",
"webpack-cli": "~3.0.0"
"webpack-cli": "~3.0.0",
"webpack-config": "~7.5.0"
}
}
Loading

0 comments on commit ad26c99

Please sign in to comment.