Clean up ui and i18n config

extensions/cornerstone/package.json

@@ -26,7 +26,7 @@
   },
   "peerDependencies": {
     "@ohif/core": "^0.6.0",
-    "@ohif/ui": "^0.6.0",
+    "@ohif/ui": "^0.2.18",
     "cornerstone-core": "^2.2.8",
     "cornerstone-math": "^0.1.8",
     "cornerstone-tools": "^3.1.0",

extensions/vtk/package.json

@@ -18,8 +18,8 @@
   },
   "peerDependencies": {
     "@ohif/core": "^0.6.0",
-    "@ohif/i18n": "0.2.2",
+    "@ohif/i18n": "^0.2.3",
-    "@ohif/ui": "^0.15.1",
+    "@ohif/ui": "^0.2.18",
     "cornerstone-core": "^2.2.8",
     "cornerstone-wado-image-loader": "^2.2.3",
     "dcmjs": "^0.4.7",
@@ -41,7 +41,7 @@
   },
   "devDependencies": {
     "@ohif/core": "^0.7.0",
-    "@ohif/ui": "^0.15.1",
+    "@ohif/ui": "^0.2.18",
     "cornerstone-tools": "^3.13.0",
     "cornerstone-wado-image-loader": "^2.2.3",
     "dcmjs": "^0.4.7",

platform/i18n/.codecov.yml

@@ -1,2 +0,0 @@
-fixes:
-  - "::platform/i18n/"

platform/i18n/.gitignore

@@ -1,29 +0,0 @@
-
-# See https://help.github.com/ignore-files/ for more about ignoring files.
-
-# dependencies
-node_modules
-
-# builds
-build
-dist
-.rpt2_cache
-
-# misc
-.DS_Store
-.env
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-.idea
-
-yalc.lock
-.yalc
-
-# Note: DO NOT include this file because it includes our API key
-.locize

platform/i18n/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ohif/i18n",
   "version": "0.2.3-alpha.0",
-  "description": "OHIF extension for internationalization",
+  "description": "Internationalization library for The OHIF Viewer",
   "author": "OHIF",
   "license": "MIT",
   "repository": "OHIF/Viewers",
@@ -12,7 +12,8 @@
     "npm": ">=5"
   },
   "files": [
-    "dist"
+    "dist",
+    "README.md"
   ],
   "publishConfig": {
     "access": "public"
@@ -20,9 +21,11 @@
   "scripts": {
     "test:unit": "echo 'platform/i18n: missing unit tests'",
     "test:unit:ci": "echo 'platform/i18n: missing unit tests'",
-    "build": "rollup -c",
+    "dev": "webpack --config config/webpack.prod.js -w -d",
-    "lerna:build": "webpack --config config/webpack.prod.js -w -d",
+    "dev:i18n": "yarn run dev",
-    "prepublishOnly": "npm run build",
+    "prepublishOnly": "yarn run build",
+    "build": "webpack --config config/webpack.prod.js -d",
+    "build:package": "yarn run build",
     "pullTranslations": "./pullTranslations.sh"
   },
   "peerDependencies": {

platform/i18n/rollup.config.js

@@ -1,67 +0,0 @@
-import babel from 'rollup-plugin-babel';
-import commonjs from 'rollup-plugin-commonjs';
-import external from 'rollup-plugin-peer-deps-external';
-import postcss from 'rollup-plugin-postcss';
-import resolve from 'rollup-plugin-node-resolve';
-import url from 'rollup-plugin-url';
-import pkg from './package.json';
-// Deal with https://github.com/rollup/rollup-plugin-commonjs/issues/297
-import builtins from 'rollup-plugin-node-builtins';
-import json from 'rollup-plugin-json';
-
-const globals = {
-  react: 'React',
-  'react-dom': 'ReactDOM',
-  'react-redux': 'ReactRedux',
-  'react-resize-detector': 'ReactResizeDetector',
-  'prop-types': 'PropTypes',
-  i18next: 'i18next',
-  'react-i18next': 'react-i18next',
-  'i18next-browser-languagedetector': 'LngDetector',
-};
-
-export default {
-  input: 'src/index.js',
-  output: [
-    {
-      file: pkg.main,
-      format: 'umd',
-      name: 'ohif-i18n',
-      sourcemap: true,
-      globals,
-      exports: 'named',
-    },
-    {
-      file: pkg.module,
-      format: 'es',
-      sourcemap: true,
-      globals,
-      exports: 'named',
-    },
-  ],
-  plugins: [
-    builtins(),
-    external(),
-    postcss({
-      modules: false,
-    }),
-    json({
-      // ignores indent and generates the smallest code
-      compact: true, // Default: false
-
-      // generate a named export for every property of the JSON object
-      namedExports: true, // Default: true
-    }),
-    url(),
-    babel({
-      exclude: 'node_modules/**',
-      externalHelpers: true,
-      runtimeHelpers: true,
-    }),
-    resolve(),
-    commonjs({
-      include: ['node_modules/**', '.yalc/**'],
-    }),
-  ],
-  external: Object.keys(pkg.peerDependencies || {}),
-};

platform/ui/package.json

@@ -26,7 +26,7 @@
     "dev:ui": "yarn run dev"
   },
   "peerDependencies": {
-    "@ohif/i18n": "0.2.1",
+    "@ohif/i18n": "^0.2.3",
     "i18next": "^17.0.3",
     "react": "^16.8.6",
     "react-dom": "^16.8.6",
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@babel/runtime": "7.2.0",
-    "@ohif/i18n": "0.2.1",
+    "@ohif/i18n": "^0.2.3",
     "classnames": "2.2.6",
     "i18next": "^17.0.3",
     "i18next-browser-languagedetector": "^3.0.1",

platform/ui/postcss.config.js

@@ -1,9 +1 @@
-module.exports = {
+module.exports = require("../../postcss.config.js");
-  // parser: "sugarss",
-  parser: false,
-  plugins: {
-    'postcss-import': {},
-    'postcss-preset-env': {},
-    cssnano: {},
-  },
-};

platform/viewer/package.json

@@ -59,7 +59,7 @@
     "@ohif/extension-dicom-pdf": "^0.0.8-alpha.0",
     "@ohif/extension-vtk": "^0.1.4-alpha.0",
     "@ohif/i18n": "^0.2.3-alpha.0",
-    "@ohif/ui": "0.15.3",
+    "@ohif/ui": "^0.2.18",
     "@tanem/react-nprogress": "^1.1.25",
     "classnames": "^2.2.6",
     "cornerstone-core": "^2.2.8",

postcss.config.js

@@ -0,0 +1,9 @@
+module.exports = {
+  // parser: "sugarss",
+  parser: false,
+  plugins: {
+    "postcss-import": {},
+    "postcss-preset-env": {},
+    cssnano: {}
+  }
+};