From bd605b9752223a569c3f8e148f0a4d1bea01c258 Mon Sep 17 00:00:00 2001 From: dannyrb Date: Mon, 15 Apr 2019 16:55:51 -0400 Subject: [PATCH] More shifting --- Packages-react/ohif-viewer/LICENSE | 21 --- Packages-react/ohif-viewer/package.json | 129 --------------- .../ohif-viewer/README.md => README-react.md | 0 package-lock.json | 5 - package.json | 147 +++++++++++++++--- .../rollup.config.js => rollup.config.js | 0 6 files changed, 126 insertions(+), 176 deletions(-) delete mode 100644 Packages-react/ohif-viewer/LICENSE delete mode 100644 Packages-react/ohif-viewer/package.json rename Packages-react/ohif-viewer/README.md => README-react.md (100%) delete mode 100644 package-lock.json rename Packages-react/ohif-viewer/rollup.config.js => rollup.config.js (100%) diff --git a/Packages-react/ohif-viewer/LICENSE b/Packages-react/ohif-viewer/LICENSE deleted file mode 100644 index 19e20dd35..000000000 --- a/Packages-react/ohif-viewer/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2018 Open Health Imaging Foundation - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/Packages-react/ohif-viewer/package.json b/Packages-react/ohif-viewer/package.json deleted file mode 100644 index 3cdd01e1c..000000000 --- a/Packages-react/ohif-viewer/package.json +++ /dev/null @@ -1,129 +0,0 @@ -{ - "name": "ohif-viewer", - "version": "0.0.20", - "description": "OHIF Viewer", - "author": "OHIF Contributors", - "license": "MIT", - "repository": "OHIF/Viewers", - "main": "dist/index.umd.js", - "browser": "dist/index.umd.js", - "module": "dist/index.es.js", - "jsnext:main": "dist/index.es.js", - "homepage": "http://localhost:5000", - "engines": { - "node": ">=8", - "npm": ">=5" - }, - "scripts": { - "build": "node --max-old-space-size=8192 node_modules/rollup/bin/rollup -c", - "prepublishOnly": "npm run build", - "lint": "eslint -c .eslintrc --fix src && prettier --single-quote --write src/**/*.{js,jsx,json,css}", - "prepare": "npm run build", - "predeploy": "cd example && npm install && npm run build", - "deploy": "gh-pages -d example/build", - "generateStaticSite": "./generateStaticSite.sh", - "test:watch": "react-scripts test --env=jsdom", - "test": "cross-env CI=1 react-scripts test --env=jsdom", - "copy:webworkers": "cp node_modules/cornerstone-wado-image-loader/dist/*.min.js* public", - "version": "node -p -e \"'export default \\'' + require('./package.json').version + '\\';'\" > src/version.js", - "sha": "echo \"export default '\"$(git rev-parse HEAD)\"';\" > src/sha.js", - "details": "npm run version && npm run sha", - "prep": "npm run details && npm run copy:webworkers", - "start": "npm run prep && cross-env PORT=5000 react-scripts start", - "start:debug": "cross-env PORT=5000 react-scripts start" - }, - "peerDependencies": { - "react": "^15.0.0 || ^16.0.0", - "react-dom": "^15.0.0 || ^16.0.0" - }, - "devDependencies": { - "@babel/core": "^7.2.2", - "@babel/plugin-external-helpers": "^7.2.0", - "@babel/plugin-proposal-class-properties": "^7.2.3", - "@babel/plugin-transform-runtime": "^7.2.0", - "@babel/preset-env": "^7.2.3", - "@babel/preset-react": "^7.0.0", - "@svgr/rollup": "^4.1.0", - "babel-eslint": "^9.0.0", - "cross-env": "^5.2.0", - "eslint": "5.12.0", - "eslint-plugin-import": "^2.14.0", - "eslint-plugin-node": "^8.0.0", - "eslint-plugin-promise": "^4.0.1", - "eslint-plugin-react": "^7.11.1", - "gh-pages": "^2.0.1", - "husky": "^1.3.1", - "lint-staged": "^8.1.0", - "lodash.clonedeep": "^4.5.0", - "prettier": "^1.15.3", - "react": "^16.7.0", - "react-dom": "^16.7.0", - "react-scripts": "^2.1.5", - "rollup": "^1.1.2", - "rollup-plugin-babel": "^4.2.0", - "rollup-plugin-commonjs": "^9.2.0", - "rollup-plugin-json": "^3.1.0", - "rollup-plugin-node-builtins": "^2.1.2", - "rollup-plugin-node-resolve": "^4.0.0", - "rollup-plugin-peer-deps-external": "^2.2.0", - "rollup-plugin-postcss": "^2.0.3", - "rollup-plugin-url": "^2.1.0", - "stylelint": "^9.9.0", - "stylelint-config-recommended": "^2.1.0", - "stylus": "^0.54.5" - }, - "husky": { - "hooks": { - "pre-commit": "lint-staged" - } - }, - "lint-staged": { - "src/**/*.{js,jsx,json,css}": [ - "prettier --single-quote --write", - "git add" - ] - }, - "browserslist": [ - ">0.2%", - "not dead", - "not ie <= 11", - "not op_mini all" - ], - "files": [ - "dist" - ], - "dependencies": { - "@babel/polyfill": "^7.2.5", - "@babel/runtime": "^7.2.0", - "classnames": "^2.2.6", - "cornerstone-core": "^2.2.8", - "cornerstone-math": "^0.1.8", - "cornerstone-tools": "^3.2.4", - "cornerstone-wado-image-loader": "^2.2.3", - "dcmjs": "^0.3.8", - "dicom-parser": "^1.8.3", - "dicomweb-client": "^0.4.2", - "hammerjs": "^2.0.8", - "lodash.isequal": "^4.5.0", - "moment": "^2.24.0", - "ohif-core": "^0.3.5", - "ohif-cornerstone-extension": "^0.0.26", - "ohif-dicom-html-extension": "^0.0.2", - "ohif-dicom-microscopy-extension": "^0.0.5", - "ohif-dicom-pdf-extension": "^0.0.6", - "ohif-vtk-extension": "^0.0.1", - "oidc-client": "^1.6.1", - "prop-types": "^15.6.2", - "react-bootstrap-modal": "^4.2.0", - "react-dnd": "^7.0.2", - "react-dnd-html5-backend": "^7.0.2", - "react-redux": "^6.0.0", - "react-resize-detector": "^3.4.0", - "react-router": "^4.3.1", - "react-router-dom": "^4.3.1", - "react-viewerbase": "0.2.17", - "react-vtkjs-viewport": "^0.0.7", - "redux": "^4.0.1", - "redux-oidc": "^3.1.0" - } -} diff --git a/Packages-react/ohif-viewer/README.md b/README-react.md similarity index 100% rename from Packages-react/ohif-viewer/README.md rename to README-react.md diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index 851cb319a..000000000 --- a/package-lock.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "ohif-viewers-meta", - "version": "0.0.1", - "lockfileVersion": 1 -} diff --git a/package.json b/package.json index 96724d992..a8ee52a1f 100644 --- a/package.json +++ b/package.json @@ -1,25 +1,130 @@ { - "name": "ohif-viewers-meta", - "version": "0.0.1", - "description": "NPM Package for running scripts in the OHIF/Viewers Repository", - "directories": { - "doc": "docs", - "test": "test" - }, - "dependencies": {}, - "devDependencies": {}, - "scripts": { - "test": "./test/testApp.sh", - "staticDeploy": "./generateStaticSite.sh" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/OHIF/Viewers.git" - }, - "author": "Open Health Imaging Foundation", + "name": "ohif-viewer", + "version": "0.0.20", + "description": "OHIF Viewer", + "author": "OHIF Contributors", "license": "MIT", - "bugs": { - "url": "https://github.com/OHIF/Viewers/issues" + "repository": "OHIF/Viewers", + "main": "dist/index.umd.js", + "browser": "dist/index.umd.js", + "module": "dist/index.es.js", + "jsnext:main": "dist/index.es.js", + "homepage": "http://localhost:5000", + "engines": { + "node": ">=8", + "npm": ">=5" }, - "homepage": "https://github.com/OHIF/Viewers#readme" + "scripts": { + "build": "node --max-old-space-size=8192 node_modules/rollup/bin/rollup -c", + "prepublishOnly": "npm run build", + "lint": "eslint -c .eslintrc --fix src && prettier --single-quote --write src/**/*.{js,jsx,json,css}", + "prepare": "npm run build", + "predeploy": "cd example && npm install && npm run build", + "deploy": "gh-pages -d example/build", + "generateStaticSite": "./generateStaticSite.sh", + "staticDeploy": "./generateStaticSite.sh", + "test:watch": "react-scripts test --env=jsdom", + "test": "cross-env CI=1 react-scripts test --env=jsdom", + "copy:webworkers": "cp node_modules/cornerstone-wado-image-loader/dist/*.min.js* public", + "version": "node -p -e \"'export default \\'' + require('./package.json').version + '\\';'\" > src/version.js", + "sha": "echo \"export default '\"$(git rev-parse HEAD)\"';\" > src/sha.js", + "details": "npm run version && npm run sha", + "prep": "npm run details && npm run copy:webworkers", + "start": "npm run prep && cross-env PORT=5000 react-scripts start", + "start:debug": "cross-env PORT=5000 react-scripts start" + }, + "peerDependencies": { + "react": "^15.0.0 || ^16.0.0", + "react-dom": "^15.0.0 || ^16.0.0" + }, + "devDependencies": { + "@babel/core": "^7.2.2", + "@babel/plugin-external-helpers": "^7.2.0", + "@babel/plugin-proposal-class-properties": "^7.2.3", + "@babel/plugin-transform-runtime": "^7.2.0", + "@babel/preset-env": "^7.2.3", + "@babel/preset-react": "^7.0.0", + "@svgr/rollup": "^4.1.0", + "babel-eslint": "^9.0.0", + "cross-env": "^5.2.0", + "eslint": "5.12.0", + "eslint-plugin-import": "^2.14.0", + "eslint-plugin-node": "^8.0.0", + "eslint-plugin-promise": "^4.0.1", + "eslint-plugin-react": "^7.11.1", + "gh-pages": "^2.0.1", + "husky": "^1.3.1", + "lint-staged": "^8.1.0", + "lodash.clonedeep": "^4.5.0", + "prettier": "^1.15.3", + "react": "^16.7.0", + "react-dom": "^16.7.0", + "react-scripts": "^2.1.5", + "rollup": "^1.1.2", + "rollup-plugin-babel": "^4.2.0", + "rollup-plugin-commonjs": "^9.2.0", + "rollup-plugin-json": "^3.1.0", + "rollup-plugin-node-builtins": "^2.1.2", + "rollup-plugin-node-resolve": "^4.0.0", + "rollup-plugin-peer-deps-external": "^2.2.0", + "rollup-plugin-postcss": "^2.0.3", + "rollup-plugin-url": "^2.1.0", + "stylelint": "^9.9.0", + "stylelint-config-recommended": "^2.1.0", + "stylus": "^0.54.5" + }, + "husky": { + "hooks": { + "pre-commit": "lint-staged" + } + }, + "lint-staged": { + "src/**/*.{js,jsx,json,css}": [ + "prettier --single-quote --write", + "git add" + ] + }, + "browserslist": [ + ">0.2%", + "not dead", + "not ie <= 11", + "not op_mini all" + ], + "files": [ + "dist" + ], + "dependencies": { + "@babel/polyfill": "^7.2.5", + "@babel/runtime": "^7.2.0", + "classnames": "^2.2.6", + "cornerstone-core": "^2.2.8", + "cornerstone-math": "^0.1.8", + "cornerstone-tools": "^3.2.4", + "cornerstone-wado-image-loader": "^2.2.3", + "dcmjs": "^0.3.8", + "dicom-parser": "^1.8.3", + "dicomweb-client": "^0.4.2", + "hammerjs": "^2.0.8", + "lodash.isequal": "^4.5.0", + "moment": "^2.24.0", + "ohif-core": "^0.3.5", + "ohif-cornerstone-extension": "^0.0.26", + "ohif-dicom-html-extension": "^0.0.2", + "ohif-dicom-microscopy-extension": "^0.0.5", + "ohif-dicom-pdf-extension": "^0.0.6", + "ohif-vtk-extension": "^0.0.1", + "oidc-client": "^1.6.1", + "prop-types": "^15.6.2", + "react-bootstrap-modal": "^4.2.0", + "react-dnd": "^7.0.2", + "react-dnd-html5-backend": "^7.0.2", + "react-redux": "^6.0.0", + "react-resize-detector": "^3.4.0", + "react-router": "^4.3.1", + "react-router-dom": "^4.3.1", + "react-viewerbase": "0.2.17", + "react-vtkjs-viewport": "^0.0.7", + "redux": "^4.0.1", + "redux-oidc": "^3.1.0" + } } diff --git a/Packages-react/ohif-viewer/rollup.config.js b/rollup.config.js similarity index 100% rename from Packages-react/ohif-viewer/rollup.config.js rename to rollup.config.js