Skip to content

Commit 971d127

Browse files
nicolethoennicolethoen
committed
fix usage of cjs and es modules
1 parent 3189c3c commit 971d127

File tree

5 files changed

+48
-58
lines changed

5 files changed

+48
-58
lines changed

jest.config.js renamed to jest.config.cjs

File renamed without changes.

‎stylePaths.js‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
const path = require('path');
2-
module.exports = {
3-
stylePaths: [
4-
path.resolve(__dirname, 'src'),
5-
path.resolve(__dirname, 'node_modules/patternfly'),
6-
path.resolve(__dirname, 'node_modules/@patternfly/patternfly'),
7-
path.resolve(__dirname, 'node_modules/@patternfly/react-styles/css'),
8-
path.resolve(__dirname, 'node_modules/@patternfly/react-core/dist/styles/base.css'),
9-
path.resolve(__dirname, 'node_modules/@patternfly/react-core/dist/esm/@patternfly/patternfly'),
10-
path.resolve(__dirname, 'node_modules/@patternfly/react-core/node_modules/@patternfly/react-styles/css'),
11-
path.resolve(__dirname, 'node_modules/@patternfly/react-table/node_modules/@patternfly/react-styles/css'),
12-
path.resolve(__dirname, 'node_modules/@patternfly/react-inline-edit-extension/node_modules/@patternfly/react-styles/css')
13-
]
14-
}
1+
import path from 'path';
2+
export const stylePaths = [
3+
path.resolve('./src'),
4+
path.resolve('./node_modules/patternfly'),
5+
path.resolve('./node_modules/@patternfly/patternfly'),
6+
path.resolve('./node_modules/@patternfly/react-styles/css'),
7+
path.resolve('./node_modules/@patternfly/react-core/dist/styles/base.css'),
8+
path.resolve('./node_modules/@patternfly/react-core/dist/esm/@patternfly/patternfly'),
9+
path.resolve('./node_modules/@patternfly/react-core/node_modules/@patternfly/react-styles/css'),
10+
path.resolve('./node_modules/@patternfly/react-table/node_modules/@patternfly/react-styles/css'),
11+
path.resolve('./node_modules/@patternfly/react-inline-edit-extension/node_modules/@patternfly/react-styles/css')
12+
];

‎webpack.common.js‎

Lines changed: 23 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
/* eslint-disable @typescript-eslint/no-var-requires */
22

3-
const path = require('path');
4-
const HtmlWebpackPlugin = require('html-webpack-plugin');
5-
const CopyPlugin = require('copy-webpack-plugin');
6-
const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
7-
const Dotenv = require('dotenv-webpack');
3+
import path from 'path';
4+
import HtmlWebpackPlugin from 'html-webpack-plugin';
5+
import CopyPlugin from 'copy-webpack-plugin';
6+
import TsconfigPathsPlugin from 'tsconfig-paths-webpack-plugin';
7+
import Dotenv from 'dotenv-webpack';
88
const BG_IMAGES_DIRNAME = 'bgimages';
99
const ASSET_PATH = process.env.ASSET_PATH || '/';
10-
module.exports = (env) => {
10+
11+
export default (env) => {
1112
return {
1213
module: {
1314
rules: [
@@ -29,11 +30,11 @@ module.exports = (env) => {
2930
// only process modules with this loader
3031
// if they live under a 'fonts' or 'pficon' directory
3132
include: [
32-
path.resolve(__dirname, 'node_modules/patternfly/dist/fonts'),
33-
path.resolve(__dirname, 'node_modules/@patternfly/react-core/dist/styles/assets/fonts'),
34-
path.resolve(__dirname, 'node_modules/@patternfly/react-core/dist/styles/assets/pficon'),
35-
path.resolve(__dirname, 'node_modules/@patternfly/patternfly/assets/fonts'),
36-
path.resolve(__dirname, 'node_modules/@patternfly/patternfly/assets/pficon'),
33+
path.resolve('./node_modules/patternfly/dist/fonts'),
34+
path.resolve('./node_modules/@patternfly/react-core/dist/styles/assets/fonts'),
35+
path.resolve('./node_modules/@patternfly/react-core/dist/styles/assets/pficon'),
36+
path.resolve('./node_modules/@patternfly/patternfly/assets/fonts'),
37+
path.resolve('./node_modules/@patternfly/patternfly/assets/pficon'),
3738
],
3839
},
3940
{
@@ -74,23 +75,14 @@ module.exports = (env) => {
7475
{
7576
test: /\.(jpg|jpeg|png|gif)$/i,
7677
include: [
77-
path.resolve(__dirname, 'src'),
78-
path.resolve(__dirname, 'node_modules/patternfly'),
79-
path.resolve(__dirname, 'node_modules/@patternfly/patternfly/assets/images'),
80-
path.resolve(__dirname, 'node_modules/@patternfly/react-styles/css/assets/images'),
81-
path.resolve(__dirname, 'node_modules/@patternfly/react-core/dist/styles/assets/images'),
82-
path.resolve(
83-
__dirname,
84-
'node_modules/@patternfly/react-core/node_modules/@patternfly/react-styles/css/assets/images'
85-
),
86-
path.resolve(
87-
__dirname,
88-
'node_modules/@patternfly/react-table/node_modules/@patternfly/react-styles/css/assets/images'
89-
),
90-
path.resolve(
91-
__dirname,
92-
'node_modules/@patternfly/react-inline-edit-extension/node_modules/@patternfly/react-styles/css/assets/images'
93-
),
78+
path.resolve('./src'),
79+
path.resolve('./node_modules/patternfly'),
80+
path.resolve('./node_modules/@patternfly/patternfly/assets/images'),
81+
path.resolve('./node_modules/@patternfly/react-styles/css/assets/images'),
82+
path.resolve('./node_modules/@patternfly/react-core/dist/styles/assets/images'),
83+
path.resolve('./node_modules/@patternfly/react-core/node_modules/@patternfly/react-styles/css/assets/images'),
84+
path.resolve('./node_modules/@patternfly/react-table/node_modules/@patternfly/react-styles/css/assets/images'),
85+
path.resolve('./node_modules/@patternfly/react-inline-edit-extension/node_modules/@patternfly/react-styles/css/assets/images')
9486
],
9587
type: 'asset/inline',
9688
use: [
@@ -107,12 +99,12 @@ module.exports = (env) => {
10799
},
108100
output: {
109101
filename: '[name].bundle.js',
110-
path: path.resolve(__dirname, 'dist'),
102+
path: path.resolve('./dist'),
111103
publicPath: ASSET_PATH,
112104
},
113105
plugins: [
114106
new HtmlWebpackPlugin({
115-
template: path.resolve(__dirname, 'src', 'index.html'),
107+
template: path.resolve('./src', 'index.html'),
116108
}),
117109
new Dotenv({
118110
systemvars: true,
@@ -126,7 +118,7 @@ module.exports = (env) => {
126118
extensions: ['.js', '.ts', '.tsx', '.jsx'],
127119
plugins: [
128120
new TsconfigPathsPlugin({
129-
configFile: path.resolve(__dirname, './tsconfig.json'),
121+
configFile: path.resolve('./tsconfig.json'),
130122
}),
131123
],
132124
symlinks: false,

‎webpack.dev.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
/* eslint-disable @typescript-eslint/no-var-requires */
22

3-
const path = require('path');
4-
const { merge } = require('webpack-merge');
5-
const common = require('./webpack.common.js');
6-
const { stylePaths } = require('./stylePaths');
3+
import path from 'path';
4+
import { merge } from 'webpack-merge';
5+
import common from './webpack.common.js';
6+
import { stylePaths } from './stylePaths.js';
77
const HOST = process.env.HOST || 'localhost';
88
const PORT = process.env.PORT || '9000';
99

10-
module.exports = merge(common('development'), {
10+
export default merge(common('development'), {
1111
mode: 'development',
1212
devtool: 'eval-source-map',
1313
devServer: {
@@ -16,7 +16,7 @@ module.exports = merge(common('development'), {
1616
historyApiFallback: true,
1717
open: true,
1818
static: {
19-
directory: path.resolve(__dirname, 'dist'),
19+
directory: path.resolve('./dist'),
2020
},
2121
client: {
2222
overlay: true,

‎webpack.prod.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
/* eslint-disable @typescript-eslint/no-var-requires */
22

3-
const { merge } = require('webpack-merge');
4-
const common = require('./webpack.common.js');
5-
const { stylePaths } = require('./stylePaths');
6-
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
7-
const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
8-
const TerserJSPlugin = require('terser-webpack-plugin');
3+
import { merge } from 'webpack-merge';
4+
import common from './webpack.common.js';
5+
import { stylePaths } from './stylePaths.js';
6+
import MiniCssExtractPlugin from 'mini-css-extract-plugin';
7+
import CssMinimizerPlugin from 'css-minimizer-webpack-plugin';
8+
import TerserJSPlugin from 'terser-webpack-plugin';
99

10-
module.exports = merge(common('production'), {
10+
export default merge(common('production'), {
1111
mode: 'production',
1212
devtool: 'source-map',
1313
optimization: {

0 commit comments

Comments
 (0)