-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* DEP Upgrade webpack and deps * DEP Upgrade code to work with upgraded dependencies * MNT Run yarn build
- Loading branch information
1 parent
fa4cdaa
commit 4043291
Showing
7 changed files
with
5,416 additions
and
9,201 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 10 | ||
| 18 |
Large diffs are not rendered by default.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,58 +1,27 @@ | ||
| const Path = require('path'); | ||
| const webpackConfig = require('@silverstripe/webpack-config'); | ||
| const { | ||
| resolveJS, | ||
| externalJS, | ||
| moduleJS, | ||
| pluginJS, | ||
| moduleCSS, | ||
| pluginCSS, | ||
| } = webpackConfig; | ||
| const { JavascriptWebpackConfig, CssWebpackConfig } = require('@silverstripe/webpack-config'); | ||
|
|
||
| const ENV = process.env.NODE_ENV; | ||
| const PATHS = { | ||
| MODULES: 'node_modules', | ||
| FILES_PATH: '../', | ||
| ROOT: Path.resolve(), | ||
| SRC: Path.resolve('client/src'), | ||
| DIST: Path.resolve('client/dist'), | ||
| }; | ||
|
|
||
| const externals = externalJS(ENV, PATHS); | ||
| delete externals.reactstrap; | ||
|
|
||
| const config = [ | ||
| { | ||
| name: 'js', | ||
| entry: { | ||
| // Main JS bundle | ||
| new JavascriptWebpackConfig('js', PATHS, 'silverstripe/session-manager') | ||
| .setEntry({ | ||
| bundle: `${PATHS.SRC}/bundles/bundle.js`, | ||
| }, | ||
| output: { | ||
| path: PATHS.DIST, | ||
| filename: 'js/[name].js', | ||
| }, | ||
| devtool: (ENV !== 'production') ? 'source-map' : '', | ||
| resolve: resolveJS(ENV, PATHS), | ||
| externals, | ||
| module: moduleJS(ENV, PATHS), | ||
| plugins: pluginJS(ENV, PATHS), | ||
| }, | ||
| { | ||
| name: 'css', | ||
| entry: { | ||
| }) | ||
| .getConfig(), | ||
| // sass to css | ||
| new CssWebpackConfig('css', PATHS) | ||
| .setEntry({ | ||
| bundle: `${PATHS.SRC}/bundles/bundle.scss`, | ||
| }, | ||
| output: { | ||
| path: PATHS.DIST, | ||
| filename: 'styles/[name].css', | ||
| }, | ||
| devtool: (ENV !== 'production') ? 'source-map' : '', | ||
| module: moduleCSS(ENV, PATHS), | ||
| plugins: pluginCSS(ENV, PATHS), | ||
| }, | ||
| }) | ||
| .getConfig(), | ||
| ]; | ||
|
|
||
| // Use WEBPACK_CHILD=js or WEBPACK_CHILD=css env var to run a single config | ||
| module.exports = (process.env.WEBPACK_CHILD) | ||
| ? config.find((entry) => entry.name === process.env.WEBPACK_CHILD) | ||
| : module.exports = config; | ||
| : config; |
Oops, something went wrong.