Merge branch '157-replace-pintura-files-by-npm-package' into develop
Dockerfile
deleted
100644 → 0
Dockerfile
0 → 120000
This diff is collapsed.
... | ... | @@ -19,7 +19,10 @@ |
"file-saver": "^1.3.8", | ||
"flux": "^3.1.2", | ||
"gaugeJS": "^1.3.2", | ||
"handlebars": "^4.1.1", | ||
"immutable": "^3.8.1", | ||
"jszip": "^3.2.0", | ||
"libcimsvg": "git+https://git.rwth-aachen.de/acs/public/cim/pintura-npm-package.git", | ||
"lodash": "^4.17.11", | ||
"prop-types": "^15.6.2", | ||
"rc-slider": "^8.6.3", | ||
... | ... | @@ -36,7 +39,7 @@ |
"react-rnd": "^7.4.3", | ||
"react-router": "^4.3.1", | ||
"react-router-dom": "^4.3.1", | ||
"react-scripts": "^1.1.5", | ||
"react-scripts": "^3.0.1", | ||
"react-sortable-tree": "^0.1.19", | ||
"react-svg-pan-zoom": "^2.18.0", | ||
"superagent": "^3.8.3", | ||
... | ... | @@ -51,5 +54,17 @@ |
"test": "react-scripts test --env=jsdom", | ||
"eject": "react-scripts eject" | ||
}, | ||
"proxy": "http://localhost:4000" | ||
"proxy": "http://localhost:4000", | ||
"browserslist": { | ||
"production": [ | ||
">0.2%", | ||
"not dead", | ||
"not op_mini all" | ||
], | ||
"development": [ | ||
"last 1 chrome version", | ||
"last 1 firefox version", | ||
"last 1 safari version" | ||
] | ||
} | ||
} |
packaging/docker/Dockerfile
0 → 100644
This diff is collapsed.