fix(config): module resolution

This commit is contained in:
Wroud
2020-09-11 00:46:41 +03:00
parent 530a6c4469
commit e5e56b7e98
5 changed files with 15 additions and 15 deletions
+2 -2
View File
@@ -67,7 +67,7 @@ module.exports = (env, argv) => {
sourceMap: true,
sassOptions: {
implementation: require('node-sass'),
includePaths: [resolve('node_modules'), join(__dirname, '../node_modules')]
includePaths: [resolve('node_modules'), resolve('../../node_modules')]
},
}
}
@@ -88,7 +88,7 @@ module.exports = (env, argv) => {
mode: argv.mode || 'development',
resolve: {
extensions: ['.ts', '.tsx', '.js'],
modules: [resolve('node_modules'), join(__dirname, '../node_modules')],
modules: [resolve('node_modules'), resolve('../../node_modules')],
alias: {
react: 'preact/compat',
react$: 'preact/compat',
-1
View File
@@ -37,6 +37,5 @@ module.exports = (env, argv) => merge(commonConfig(env, argv), {
version: JSON.stringify(package.buildVersion),
}),
new HtmlWebpackPlugin({ template: resolve('src/index.html.ejs'), }),
new webpack.NamedModulesPlugin(),
],
});
+3 -1
View File
@@ -23,6 +23,9 @@ module.exports = (env, argv) => merge(commonConfig(env, argv), {
}
},
devtool: 'cheap-module-eval-source-map',
optimization: {
namedModules: true,
},
plugins: [
new CopyWebpackPlugin({
patterns: getAssets(package, '')
@@ -32,7 +35,6 @@ module.exports = (env, argv) => merge(commonConfig(env, argv), {
}),
new HtmlWebpackPlugin({ template: resolve('src/index.html.ejs'), }),
new webpack.HotModuleReplacementPlugin(), // enable HMR globally
new webpack.NamedModulesPlugin(),
// new BundleAnalyzerPlugin()
],
});
+10 -10
View File
@@ -1,13 +1,13 @@
const fs = require('fs');
const { join } = require('path');
const { resolve } = require('path');
function getCloudbeaverDeps(package) {
if (!package.dependencies) {
return [];
return [];
}
return Object.keys(package.dependencies)
.filter(dependency => /@cloudbeaver\/(.*?)/.test(dependency))
.filter(dependency => /@cloudbeaver\/(.*?)/.test(dependency))
}
function scanCloudbeaverDeps(package) {
@@ -15,13 +15,13 @@ function scanCloudbeaverDeps(package) {
const list = getCloudbeaverDeps(package);
while (list.length) {
const dependency = list.shift();
const dependency = list.shift();
if (!deps.has(dependency)) {
list.push(...getCloudbeaverDeps(require(join(__dirname, '../node_modules', dependency, 'package.json'))))
}
if (!deps.has(dependency)) {
list.push(...getCloudbeaverDeps(require(resolve('../../node_modules', dependency, 'package.json'))))
}
deps.add(dependency);
deps.add(dependency);
}
return Array.from(deps.keys())
@@ -29,8 +29,8 @@ function scanCloudbeaverDeps(package) {
module.exports = function getAssets(package, to) {
const patterns = scanCloudbeaverDeps(package)
.map(dependency => ({ from: join(__dirname, '../node_modules', dependency, 'public'), to, force: true }))
.reverse();
.map(dependency => ({ from: resolve('../../node_modules', dependency, 'public'), to, force: true }))
.reverse();
patterns.push({ from: './public', to, force: true });
@@ -10,7 +10,6 @@ import {
NavNodeManagerService,
INodeNavigationData,
ITab,
NavigationType,
NodeManagerUtils,
} from '@cloudbeaver/core-app';
import { injectable } from '@cloudbeaver/core-di';