From f3009c7a454797db89742fd7b58bd4a1394f6b07 Mon Sep 17 00:00:00 2001 From: dannyrb Date: Mon, 8 Jul 2019 09:38:16 -0400 Subject: [PATCH] Consolidate how/where we specify file/module type entrypoints --- extensions/cornerstone/package.json | 22 +++++++-------- extensions/dicom-html/package.json | 7 ++--- extensions/dicom-microscopy/package.json | 7 ++--- extensions/dicom-pdf/package.json | 9 ++---- extensions/vtk/package.json | 1 + package.json | 36 ++++++++++++------------ platform/i18n/package.json | 27 +++++++++--------- platform/ui/package.json | 9 +++--- platform/viewer/package.json | 4 +-- 9 files changed, 54 insertions(+), 68 deletions(-) diff --git a/extensions/cornerstone/package.json b/extensions/cornerstone/package.json index 6533c6a01..aa6686bd1 100644 --- a/extensions/cornerstone/package.json +++ b/extensions/cornerstone/package.json @@ -6,18 +6,23 @@ "license": "MIT", "repository": "OHIF/Viewers", "main": "dist/index.umd.js", - "module": "dist/index.es.js", - "jsnext:main": "dist/index.es.js", + "module": "src/index.js", "engines": { "node": ">=8", "npm": ">=5" }, + "files": [ + "dist", + "README.md" + ], + "publishConfig": { + "access": "public" + }, "scripts": { "build": "rollup -c", "lerna:build": "webpack --config config/webpack.prod.js -w -d", - "prepublishOnly": "npm run build", - "start": "rollup -c -w", - "lint": "eslint -c .eslintrc --fix src && prettier --single-quote --write src/**/*.{js,jsx,json,css}" + "prepublishOnly": "yarn run build", + "start": "rollup -c -w" }, "peerDependencies": { "cornerstone-core": "^2.2.8", @@ -45,12 +50,5 @@ "devDependencies": { "gh-pages": "^2.0.1", "lodash.clonedeep": "^4.5.0" - }, - "files": [ - "dist", - "README.md" - ], - "publishConfig": { - "access": "public" } } diff --git a/extensions/dicom-html/package.json b/extensions/dicom-html/package.json index 3ed7fed23..c282c7107 100644 --- a/extensions/dicom-html/package.json +++ b/extensions/dicom-html/package.json @@ -6,18 +6,15 @@ "license": "MIT", "repository": "OHIF/Viewers", "main": "dist/index.umd.js", - "module": "dist/index.es.js", - "jsnext:main": "dist/index.es.js", + "module": "src/index.js", "engines": { "node": ">=8", "npm": ">=5" }, "scripts": { - "build": "rollup -c", "lerna:build": "webpack --config config/webpack.prod.js -w -d", "prepublishOnly": "npm run build", - "start": "rollup -c -w", - "lint": "eslint -c .eslintrc --fix src && prettier --single-quote --write src/**/*.{js,jsx,json,css}" + "start": "rollup -c -w" }, "peerDependencies": { "dcmjs": "^0.3.3", diff --git a/extensions/dicom-microscopy/package.json b/extensions/dicom-microscopy/package.json index 12d69852f..25775b73b 100644 --- a/extensions/dicom-microscopy/package.json +++ b/extensions/dicom-microscopy/package.json @@ -6,18 +6,15 @@ "license": "MIT", "repository": "OHIF/Viewers", "main": "dist/index.js", - "module": "dist/index.es.js", - "jsnext:main": "dist/index.es.js", + "module": "src/index.js", "engines": { "node": ">=8", "npm": ">=5" }, "scripts": { - "build": "rollup -c", "lerna:build": "webpack --config config/webpack.prod.js -w -d", "prepublishOnly": "npm run build", - "start": "rollup -c -w", - "lint": "eslint -c .eslintrc --fix src && prettier --single-quote --write src/**/*.{js,jsx,json,css}" + "start": "rollup -c -w" }, "peerDependencies": { "react": "^15.0.0 || ^16.0.0", diff --git a/extensions/dicom-pdf/package.json b/extensions/dicom-pdf/package.json index 224b0e182..73d6414b0 100644 --- a/extensions/dicom-pdf/package.json +++ b/extensions/dicom-pdf/package.json @@ -6,18 +6,15 @@ "license": "MIT", "repository": "OHIF/Viewers", "main": "dist/index.umd.js", - "module": "dist/index.es.js", - "jsnext:main": "dist/index.es.js", + "module": "src/index.js", "engines": { "node": ">=8", "npm": ">=5" }, "scripts": { - "build": "rollup -c", "lerna:build": "webpack --config config/webpack.prod.js -w -d", - "prepublishOnly": "npm run build", - "start": "rollup -c -w", - "lint": "eslint -c .eslintrc --fix src && prettier --single-quote --write src/**/*.{js,jsx,json,css}" + "prepublishOnly": "yarn run build", + "start": "rollup -c -w" }, "peerDependencies": { "dicom-parser": "^1.8.3", diff --git a/extensions/vtk/package.json b/extensions/vtk/package.json index 7f5f43038..e742dbba6 100644 --- a/extensions/vtk/package.json +++ b/extensions/vtk/package.json @@ -6,6 +6,7 @@ "license": "MIT", "repository": "OHIF/Viewers", "main": "dist/index.umd.js", + "module": "src/index.js", "engines": { "node": ">=8", "npm": ">=5" diff --git a/package.json b/package.json index 91359ac09..546a91865 100644 --- a/package.json +++ b/package.json @@ -10,23 +10,6 @@ "build:magic": "lerna run lerna:build --parallel", "build": "lerna exec --parallel -- babel --root-mode upward src -d lib --ignore **/*.story.js,**/*.spec.js" }, - "husky": { - "hooks": { - "pre-commit": "lint-staged" - } - }, - "lint-staged": { - "*.{js,json,md,yml}": [ - "prettier --write", - "git add" - ] - }, - "browserslist": [ - ">0.2%", - "not dead", - "not ie <= 11", - "not op_mini all" - ], "devDependencies": { "@babel/core": "^7.5.0", "@babel/plugin-proposal-class-properties": "^7.5.0", @@ -70,5 +53,22 @@ "webpack-hot-middleware": "^2.25.0", "webpack-merge": "^4.2.1", "workbox-webpack-plugin": "^4.3.1" - } + }, + "husky": { + "hooks": { + "pre-commit": "lint-staged" + } + }, + "lint-staged": { + "*.{js,json,md,yml}": [ + "prettier --write", + "git add" + ] + }, + "browserslist": [ + ">0.2%", + "not dead", + "not ie <= 11", + "not op_mini all" + ] } diff --git a/platform/i18n/package.json b/platform/i18n/package.json index e48e2e2f2..0f2d27855 100644 --- a/platform/i18n/package.json +++ b/platform/i18n/package.json @@ -6,12 +6,17 @@ "license": "MIT", "repository": "OHIF/Viewers", "main": "dist/index.umd.js", - "module": "dist/index.es.js", - "jsnext:main": "dist/index.es.js", + "module": "src/index.js", "engines": { "node": ">=8", "npm": ">=5" }, + "files": [ + "dist" + ], + "publishConfig": { + "access": "public" + }, "scripts": { "build": "rollup -c", "lerna:build": "webpack --config config/webpack.prod.js -w -d", @@ -25,18 +30,6 @@ "react-dom": "^16.0.0", "react-i18next": "^10.11.0" }, - "devDependencies": { - "i18next": "^15.1.3", - "i18next-browser-languagedetector": "^3.0.1", - "locize-cli": "^4.8.0", - "react-i18next": "^10.11.0" - }, - "files": [ - "dist" - ], - "publishConfig": { - "access": "public" - }, "dependencies": { "@babel/runtime": "^7.2.0", "classnames": "^2.2.6", @@ -44,5 +37,11 @@ "locize-editor": "^2.0.0", "locize-lastused": "^1.1.0", "rollup-plugin-json": "^4.0.0" + }, + "devDependencies": { + "i18next": "^15.1.3", + "i18next-browser-languagedetector": "^3.0.1", + "locize-cli": "^4.8.0", + "react-i18next": "^10.11.0" } } diff --git a/platform/ui/package.json b/platform/ui/package.json index 02188fdb9..0724eece7 100644 --- a/platform/ui/package.json +++ b/platform/ui/package.json @@ -6,12 +6,14 @@ "license": "MIT", "repository": "OHIF/react-viewerbase", "main": "dist/index.js", - "module": "dist/index.es.js", - "jsnext:main": "dist/index.es.js", + "module": "src/index.js", "engines": { "node": ">=8", "npm": ">=5" }, + "files": [ + "dist" + ], "scripts": { "cm": "npx git-cz", "dev": "docz dev", @@ -26,9 +28,6 @@ "contributors:add": "all-contributors add", "contributors:generate": "all-contributors generate" }, - "files": [ - "dist" - ], "peerDependencies": { "@ohif/i18n": "0.2.1", "i18next": "^17.0.3", diff --git a/platform/viewer/package.json b/platform/viewer/package.json index 7b7874550..57508379f 100644 --- a/platform/viewer/package.json +++ b/platform/viewer/package.json @@ -6,9 +6,7 @@ "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", + "module": "src/index.js", "engines": { "node": ">=8", "npm": ">=5"