Skip to content

Commit

Permalink
Fixed Webpack builds
Browse files Browse the repository at this point in the history 
* Removed duplicated babel loaders

Signed-off-by: Sergey Markov <[email protected]>
  • Loading branch information
Sergey Markov committed Sep 5, 2024
1 parent 7b512cf commit 0d22ef3
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 63 deletions.
8 changes: 4 additions & 4 deletions bindings/kepler.gl-jupyter/js/webpack/config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const rules = [
// fix for arrow-related errors
{
test: /\.mjs$/,
// include: /node_modules\/apache-arrow/,
// include: /node_modules[\\/]apache-arrow/,
include: /node_modules/,
type: 'javascript/auto'
},
Expand All @@ -25,9 +25,9 @@ const rules = [
test: /\.(js|ts)$/,
loader: 'babel-loader',
include: [
/node_modules\/@probe.gl/,
/node_modules\/@loaders.gl/,
/node_modules\/@math.gl/
/node_modules[\\/]@probe.gl/,
/node_modules[\\/]@loaders.gl/,
/node_modules[\\/]@math.gl/
]
}
];
Expand Down
10 changes: 5 additions & 5 deletions examples/demo-app/webpack.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ const CONFIG = {
],
include: [
join(__dirname, 'src'),
/node_modules\/@loaders\.gl/,
/node_modules\/@probe\.gl/,
/node_modules\/@math\.gl/,
/node_modules\/@kepler\.gl/
/node_modules[\\/]@loaders\.gl/,
/node_modules[\\/]@probe\.gl/,
/node_modules[\\/]@math\.gl/,
/node_modules[\\/]@kepler\.gl/
],
exclude: [/node_modules\/(?!(@loaders\.gl|@probe\.gl|@kepler\.gl|@math\.gl)).*/]
exclude: [/node_modules[\\/](?!(@loaders\.gl|@probe\.gl|@kepler\.gl|@math\.gl)).*/]
}
}
},
Expand Down
102 changes: 51 additions & 51 deletions examples/webpack.config.local.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,17 +112,17 @@ function makeLocalDevConfig(env, externals = {}) {
use: ['source-map-loader'],
enforce: 'pre',
exclude: [
/node_modules\/react-palm/,
/node_modules\/react-data-grid/,
/node_modules\/@loaders.gl/,
/node_modules\/@probe.gl/,
/node_modules\/@turf\/jsts/
/node_modules[\\/]react-palm/,
/node_modules[\\/]react-data-grid/,
/node_modules[\\/]@loaders.gl/,
/node_modules[\\/]@probe.gl/,
/node_modules[\\/]@turf[\\/]jsts/
]
},
// for compiling apache-arrow ESM module
{
test: /\.mjs$/,
include: /node_modules\/apache-arrow/,
include: /node_modules[\\/]apache-arrow/,
type: 'javascript/auto'
},
{
Expand All @@ -138,11 +138,11 @@ function makeLocalDevConfig(env, externals = {}) {
'@babel/plugin-transform-export-namespace-from'
],
include: [
/node_modules\/@loaders\.gl/,
/node_modules\/@probe\.gl/,
/node_modules\/@math\.gl/
/node_modules[\\/]@loaders\.gl/,
/node_modules[\\/]@probe\.gl/,
/node_modules[\\/]@math\.gl/
],
exclude: [/node_modules\/(?!(@loaders\.gl|@probe\.gl|@math\.gl)).*/]
exclude: [/node_modules[\\/](?!(@loaders\.gl|@probe\.gl|@math\.gl)).*/]
}
}
}
Expand All @@ -157,53 +157,53 @@ function makeBabelRule(env, exampleDir) {
return {
// Compile source using babel
test: /\.(js|ts|tsx)$/,
loader: 'babel-loader',
include: [
...(env.deck || env.deck_src
? [
use: {
loader: 'babel-loader',
options: {
include: [
/node_modules[\\/]@loaders\.gl/,
/node_modules[\\/]@probe\.gl/,
/node_modules[\\/]@math\.gl/,
/node_modules[\\/]@kepler\.gl/,
...(env.deck || env.deck_src ? [
join(NODE_MODULES_DIR, '@deck.gl'),
join(NODE_MODULES_DIR, '@luma.gl'),
join(NODE_MODULES_DIR, '@probe.gl'),
join(NODE_MODULES_DIR, '@loaders.gl'),
join(EXTERNAL_DECK_SRC, 'modules'),
join(EXTERNAL_DECK_SRC, 'node_modules/@luma.gl'),
join(EXTERNAL_DECK_SRC, 'node_modules/@probe.gl'),
join(EXTERNAL_DECK_SRC, 'node_modules/probe.gl'),
join(EXTERNAL_DECK_SRC, 'node_modules/@loaders.gl')
] : []),
...(env.loaders_src ? [join(EXTERNAL_LOADERS_SRC, 'modules')] : []),
...(env.hubble_src ? [join(EXTERNAL_HUBBLE_SRC, 'modules')] : []),
join(exampleDir, 'src'),
SRC_DIR
],
exclude: env.deck || env.deck_src
? [/node_modules\/(?!(@deck\.gl|@luma\.gl|@probe\.gl|probe.gl|@loaders\.gl|@kepler\.gl|@math\.gl)\/).*/]
: [/node_modules[\\/](?!(@loaders\.gl|@probe\.gl|@kepler\.gl|@math\.gl)).*/],

presets: ['@babel/preset-env', '@babel/preset-react', '@babel/preset-typescript'],
plugins: [
['@babel/plugin-transform-typescript', {isTSX: true, allowDeclareFields: true}],
'@babel/plugin-transform-logical-assignment-operators',
'@babel/plugin-transform-modules-commonjs',
'@babel/plugin-transform-nullish-coalescing-operator',
'@babel/plugin-transform-class-properties',
'@babel/plugin-transform-optional-chaining',
'@babel/plugin-transform-export-namespace-from',
'@babel/plugin-transform-runtime',
[
'search-and-replace',
{
rules: [
{
search: '__PACKAGE_VERSION__',
replace: KeplerPackage.version
}
]
}
]
: []),
...(env.loaders_src ? [join(EXTERNAL_LOADERS_SRC, 'modules')] : []),
...(env.hubble_src ? [join(EXTERNAL_HUBBLE_SRC, 'modules')] : []),
join(exampleDir, 'src'),
SRC_DIR
],
// do not exclude deck.gl and luma.gl when loading from root/node_modules
exclude:
env.deck || env.deck_src
? [/node_modules\/(?!(@deck\.gl|@luma\.gl|@probe\.gl|probe.gl|@loaders\.gl)\/).*/]
: [/node_modules/],
options: {
presets: ['@babel/preset-env', '@babel/preset-react', '@babel/preset-typescript'],
plugins: [
['@babel/plugin-transform-typescript', {isTSX: true, allowDeclareFields: true}],
'@babel/plugin-transform-logical-assignment-operators',
'@babel/plugin-transform-nullish-coalescing-operator',
'@babel/plugin-transform-class-properties',
'@babel/plugin-transform-optional-chaining',
'@babel/plugin-transform-export-namespace-from',
'@babel/plugin-transform-runtime',
[
'search-and-replace',
{
rules: [
{
search: '__PACKAGE_VERSION__',
replace: KeplerPackage.version
}
]
}
]
]
}
}
};
}
Expand Down Expand Up @@ -244,7 +244,7 @@ function addBabelSettings(env, config, exampleDir) {
module: {
...config.module,
rules: [
...config.module.rules.filter(r => r.loader !== 'babel-loader'),
...config.module.rules.filter(r => r.loader !== 'babel-loader' && r.use?.loader !== 'babel-loader'),
makeBabelRule(env, exampleDir)
]
}
Expand Down
6 changes: 3 additions & 3 deletions website/webpack.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ const COMMON_CONFIG = {
// for compiling apache-arrow ESM module
{
test: /\.mjs$/,
include: /node_modules\/apache-arrow/,
include: /node_modules[\\/]apache-arrow/,
type: 'javascript/auto'
},
// for compiling @probe.gl, website build started to fail (March, 2024)
Expand All @@ -81,7 +81,7 @@ const COMMON_CONFIG = {
test: /\.(js)$/,
loader: 'babel-loader',
options: BABEL_CONFIG,
include: [/node_modules\/@probe.gl/, /node_modules\/@loaders.gl/, /node_modules\/@math.gl/]
include: [/node_modules[\\/]@probe.gl/, /node_modules[\\/]@loaders.gl/, /node_modules[\\/]@math.gl/]
}
]
},
Expand Down Expand Up @@ -115,7 +115,7 @@ const addDevConfig = config => {
test: /\.js$/,
use: ['source-map-loader'],
enforce: 'pre',
exclude: [/node_modules\/react-palm/, /node_modules\/react-data-grid/]
exclude: [/node_modules[\\/]react-palm/, /node_modules[\\/]react-data-grid/]
});

return Object.assign(config, {
Expand Down

0 comments on commit 0d22ef3

Please sign in to comment.