kopia lustrzana https://github.com/OpenDroneMap/WebODM
Bump to node 18
Upgraded to node 18 and Webpack 5. Package cleanup for webpack 5pull/1439/head
rodzic
3f42eaa824
commit
6ea180dd43
|
@ -19,7 +19,7 @@ RUN apt-get -qq update && apt-get -qq install -y --no-install-recommends wget cu
|
|||
apt-get install -y ca-certificates gnupg && \
|
||||
mkdir -p /etc/apt/keyrings && \
|
||||
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
|
||||
NODE_MAJOR=16 && \
|
||||
NODE_MAJOR=18 && \
|
||||
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
|
||||
apt-get -qq update && apt-get -qq install -y nodejs && \
|
||||
# Install Python3, GDAL, PDAL, nginx, letsencrypt, psql
|
||||
|
@ -30,7 +30,7 @@ RUN apt-get -qq update && apt-get -qq install -y --no-install-recommends wget cu
|
|||
# Setup cron
|
||||
ln -s /webodm/nginx/crontab /var/spool/cron/crontabs/root && chmod 0644 /webodm/nginx/crontab && service cron start && chmod +x /webodm/nginx/letsencrypt-autogen.sh && \
|
||||
/webodm/nodeodm/setup.sh && /webodm/nodeodm/cleanup.sh && cd /webodm && \
|
||||
npm install --quiet -g webpack@4.16.5 && npm install --quiet -g webpack-cli@4.2.0 && npm install --quiet && webpack --mode production && \
|
||||
npm install --quiet -g webpack@5.89.0 && npm install --quiet -g webpack-cli@5.1.4 && npm install --quiet && webpack --mode production && \
|
||||
echo "UTC" > /etc/timezone && \
|
||||
python manage.py collectstatic --noinput && \
|
||||
python manage.py rebuildplugins && \
|
||||
|
|
|
@ -58,15 +58,14 @@
|
|||
"react-test-renderer": "^16.14.0",
|
||||
"regenerator-runtime": "^0.11.0",
|
||||
"sass": "^1.22.7",
|
||||
"sass-loader": "^7.1.0",
|
||||
"sass-loader": "13.3.2",
|
||||
"shpjs": "^3.4.2",
|
||||
"sinon": "^4.0.0",
|
||||
"statuses": "^1.3.1",
|
||||
"style-loader": "^0.13.1",
|
||||
"tween.js": "^16.6.0",
|
||||
"uglifyjs-webpack-plugin": "^1.2.7",
|
||||
"url-loader": "^0.5.7",
|
||||
"webpack": "^4.16.2",
|
||||
"webpack": "5.89.0",
|
||||
"webpack-bundle-tracker": "0.4.3",
|
||||
"webpack-livereload-plugin": "3.0.2",
|
||||
"mini-css-extract-plugin": "1.6.2"
|
||||
|
|
|
@ -23,6 +23,7 @@ module.exports = {
|
|||
output: {
|
||||
path: path.join(__dirname, './app/static/app/bundles/'),
|
||||
filename: "[name]-[hash].js",
|
||||
publicPath: '/static/app/bundles/'
|
||||
},
|
||||
|
||||
plugins: [
|
||||
|
@ -32,7 +33,7 @@ module.exports = {
|
|||
path: path.join(__dirname, './'),
|
||||
}),
|
||||
new MiniCssExtractPlugin({
|
||||
filename: "[name]-[hash].css",
|
||||
filename: "./css/[name]-[hash].css",
|
||||
chunkFilename: "[id].css"
|
||||
}),
|
||||
],
|
||||
|
@ -85,7 +86,10 @@ module.exports = {
|
|||
|
||||
resolve: {
|
||||
modules: ['node_modules', 'bower_components'],
|
||||
extensions: ['.js', '.jsx']
|
||||
extensions: ['.js', '.jsx'],
|
||||
fallback: {
|
||||
"buffer": false
|
||||
}
|
||||
},
|
||||
|
||||
externals: {
|
||||
|
|
Ładowanie…
Reference in New Issue