Skip to content

Commit

Permalink
Use simplified config from FEC monorepo (#71)
Browse files Browse the repository at this point in the history
* Use simplified config from FEC monorepo

* Add postcss to allow style linting

* Include css loader to fix build
  • Loading branch information
karelhala authored and ryelo committed Jun 4, 2019
1 parent 2676fa9 commit 885c596
Show file tree
Hide file tree
Showing 11 changed files with 10,784 additions and 9,799 deletions.
69 changes: 0 additions & 69 deletions config/base.webpack.config.js

This file was deleted.

107 changes: 0 additions & 107 deletions config/base.webpack.plugins.js

This file was deleted.

27 changes: 11 additions & 16 deletions config/dev.webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,14 @@
/* global require, module */

const _ = require('lodash');
const webpackConfig = require('./base.webpack.config');
const config = require('./webpack.common.js');
/* global require, module, __dirname */
const { resolve } = require('path');
const config = require('@redhat-cloud-services/frontend-components-config');
const { config: webpackConfig, plugins } = config({
rootFolder: resolve(__dirname, '../'),
debug: true,
https: true
});

webpackConfig.devServer = {
contentBase: config.paths.public,
hot: true,
https: false,
port: 8002,
disableHostCheck: true,
historyApiFallback: true
module.exports = {
...webpackConfig,
plugins
};

module.exports = _.merge({},
webpackConfig,
require('./dev.webpack.plugins.js')
);
6 changes: 0 additions & 6 deletions config/dev.webpack.plugins.js

This file was deleted.

17 changes: 10 additions & 7 deletions config/prod.webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
/* global require, module */

const _ = require('lodash');
const webpackConfig = require('./base.webpack.config');
/* global require, module, __dirname */
const { resolve } = require('path');
const config = require('@redhat-cloud-services/frontend-components-config');
const { config: webpackConfig, plugins } = config({
rootFolder: resolve(__dirname, '../')
});

module.exports = _.merge({},
webpackConfig,
require('./base.webpack.plugins.js')
);
module.exports = {
...webpackConfig,
plugins
};
4 changes: 2 additions & 2 deletions config/spandx.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const localhost = (process.env.PLATFORM === 'linux') ? 'localhost' : 'host.docke

module.exports = {
routes: {
'/apps/starter': { host: `http://${localhost}:8002` },
'/insights/starter': { host: `http://${localhost}:8002` }
'/apps/starter': { host: `https://${localhost}:8002` },
'/insights/starter': { host: `https://${localhost}:8002` }
}
};
17 changes: 10 additions & 7 deletions config/test.webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
/* global require, module */

const _ = require('lodash');
const config = _.cloneDeep(require('./base.webpack.config'));
/* global require, module, __dirname */
const { resolve } = require('path');
const config = require('@redhat-cloud-services/frontend-components-config');
const { config: webpackConfig, plugins } = config({
rootFolder: resolve(__dirname, '../')
});

module.exports = _.merge({},
config,
require('./test.webpack.plugins.js')
);
module.exports = {
...webpackConfig,
plugins
};
4 changes: 0 additions & 4 deletions config/test.webpack.plugins.js

This file was deleted.

38 changes: 0 additions & 38 deletions config/webpack.common.js

This file was deleted.

Loading

0 comments on commit 885c596

Please sign in to comment.