Skip to content

Commit

Permalink
Fixes to dockerization
Browse files Browse the repository at this point in the history
  • Loading branch information
tiberiuichim committed Mar 19, 2020
1 parent 13434b1 commit 0bbf2d0
Show file tree
Hide file tree
Showing 6 changed files with 97 additions and 31 deletions.
2 changes: 1 addition & 1 deletion docker-image.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
tiberiuichim/bise-frontend:4.0-0.13
tiberiuichim/bise-frontend:4.0-0.15
90 changes: 85 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
"test": "razzle test --env=jsdom --passWithNoTests",
"start:prod": "NODE_ENV=production node build/server.js",
"i18n": "NODE_ENV=production node node_modules/@plone/volto/src/i18n.js",
"develop": "missdev --config=jsconfig.json --output=develop"
"develop": "missdev --config=jsconfig.json --output=develop",
"serve": "http-server -p $PORT ./build",
"analyze": "webpack-bundle-analyzer -p $PORT -h 0.0.0.0 ./build/public/stats.json"
},
"jest": {
"snapshotSerializers": [
Expand Down Expand Up @@ -93,6 +95,7 @@
"@blueprintjs/icons": "^3.10.0",
"@datapunt/matomo-tracker-react": "0.0.16",
"@plone/volto": "github:tiberiuichim/volto#kitchen_sink",
"http-server": "^0.12.1",
"immutable": "^3.8.2",
"less-loader": "5.0.0",
"npm": "^6.13.7",
Expand All @@ -110,7 +113,7 @@
"semantic-ui-css": "^2.4.1",
"slick-carousel": "^1.8.1",
"start": "^5.1.0",
"webpack-bundle-analyzer": "^3.6.0"
"webpack-bundle-analyzer": "^3.6.1"
},
"devDependencies": {
"@babel/cli": "^7.8.4",
Expand Down Expand Up @@ -148,7 +151,8 @@
"shelljs": "^0.8.3"
},
"optimizeLiftPackages": [
"immutable"
"immutable",
"react"
],
"manuallyTranspile": [
"prepend-http",
Expand Down
2 changes: 1 addition & 1 deletion public/robots.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
User-agent: *

Disallow: /
22 changes: 2 additions & 20 deletions razzle.config.js
Original file line number Diff line number Diff line change
@@ -1,28 +1,10 @@
// const HardSourceWebpackPlugin = require('hard-source-webpack-plugin');
const path = require('path');
const jsConfig = require('./jsconfig').compilerOptions;
// const base = require('./src/develop/volto-base/src').razzle;
// const config = base.BaseConfig(path.resolve('.'));

const pathsConfig = jsConfig.paths;
let voltoPath = './node_modules/@plone/volto';
Object.keys(pathsConfig).forEach(pkg => {
if (pkg === '@plone/volto') {
voltoPath = `./${jsConfig.baseUrl}/${pathsConfig[pkg][0]}`;
}
});

// module.exports = require(`${voltoPath}/razzle.config`);

// let config = require(`${voltoPath}/razzle.config`);
// console.log(config);
// module.exports = config;

const base = require('./src/develop/volto-base/src').razzle;
const config = base.BaseConfig(path.resolve('.'));
const razzleModify = config.modify;

module.exports = {
plugins: base.plugins,
modify: config.modify, //razzleModify(voltoPath),
plugins: base.defaultPlugins,
modify: razzleModify,
};
2 changes: 1 addition & 1 deletion scripts/prebuild-fix-modules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ for PKG in "${REMOVE[@]}"; do
find $f | grep "node_modules/${PKG}$" | xargs echo
done;

find ${NODE_MODULES} | grep "node_modules/.*/node_modules/${PKG}$" | xargs echo
find ${NODE_MODULES} -type d -name react | grep "node_modules\/.*node_modules\/${PKG}$" | xargs rm -r

done;

Expand Down

0 comments on commit 0bbf2d0

Please sign in to comment.