Skip to content

Commit

Permalink
Fix compiling when used as external lib.
Browse files Browse the repository at this point in the history
  • Loading branch information
robgietema committed Oct 3, 2018
1 parent 884af7f commit b9a87f0
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 7 deletions.
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Change Log

## 0.9.0 (unreleased)

### Added
## 0.8.1 (2018-08-03)

### Changes

- Fix compiling when used as a library @robgietema

## 0.8.0 (2018-08-03)

### Added
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
}
],
"license": "MIT",
"version": "0.9.0",
"version": "0.8.1",
"repository": {
"type": "git",
"url": "[email protected]:plone/plone-react.git"
Expand Down
38 changes: 35 additions & 3 deletions razzle.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
const path = require('path');
const autoprefixer = require('autoprefixer');
const makeLoaderFinder = require('razzle-dev-utils/makeLoaderFinder');
const nodeExternals = require('webpack-node-externals');
const fs = require('fs');

const fileLoaderFinder = makeLoaderFinder('file-loader');
const eslintLoaderFinder = makeLoaderFinder('eslint-loader');
Expand Down Expand Up @@ -110,8 +112,6 @@ module.exports = {
...fileLoader.exclude,
];

// const eslintLoader = config.module.rules.find(eslintLoaderFinder);
// eslintLoader.exclude = [path.join(path.resolve('.'), 'src', 'lib')];
// Disabling the ESlint pre loader
config.module.rules.splice(0, 1);

Expand All @@ -122,7 +122,7 @@ module.exports = {
config.resolve.alias = {
...config.resolve.alias,
'../../theme.config$': `${projectRootPath}/theme/theme.config`,
'@plone/plone-react': `${projectRootPath}/src/lib/plone-react/src/`,
'@plone/plone-react': `${projectRootPath}/node_modules/@plone/plone-react/src/`,
...customizations,
};

Expand All @@ -131,6 +131,38 @@ module.exports = {
maxEntrypointSize: 10000000,
};

const babelRuleIndex = config.module.rules.findIndex(
rule =>
rule.use &&
rule.use[0].loader &&
rule.use[0].loader.includes('babel-loader'),
);
const { include } = config.module.rules[babelRuleIndex];
if (fs.existsSync('./node_modules/@plone/plone-react/src')) {
include.push(fs.realpathSync('./node_modules/@plone/plone-react/src'));
}
config.module.rules[babelRuleIndex] = Object.assign(
config.module.rules[babelRuleIndex],
{
include,
},
);
config.externals =
target === 'node'
? [
nodeExternals({
whitelist: [
dev ? 'webpack/hot/poll?300' : null,
/\.(eot|woff|woff2|ttf|otf)$/,
/\.(svg|png|jpg|jpeg|gif|ico)$/,
/\.(mp4|mp3|ogg|swf|webp)$/,
/\.(css|scss|sass|sss|less)$/,
/^@plone\/plone-react/,
].filter(Boolean),
}),
]
: [];

return config;
},
};

0 comments on commit b9a87f0

Please sign in to comment.