diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-16 17:10:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-16 17:10:27 +0100 |
| commit | 6af2300454c960ef83f7b7d31e9b829e0d5a8e38 (patch) | |
| tree | 97325ab7ad5a572170637da7a72ba72b7231a02f /config/webpack/configuration.js | |
| parent | c2fa0f7c40bcc4064e8baaa221665eadd391c001 (diff) | |
| parent | 0fbe90e2d3cfc2c5d1fd12ea564daa52a83ec0ac (diff) | |
Merge pull request #961 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/webpack/configuration.js')
| -rw-r--r-- | config/webpack/configuration.js | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config/webpack/configuration.js b/config/webpack/configuration.js index f81d23dd4..926af9b39 100644 --- a/config/webpack/configuration.js +++ b/config/webpack/configuration.js @@ -7,7 +7,6 @@ const { lstatSync, readFileSync } = require('fs'); const glob = require('glob'); const configPath = resolve('config', 'webpacker.yml'); -const loadersDir = join(__dirname, 'loaders'); const settings = safeLoad(readFileSync(configPath), 'utf8')[env.RAILS_ENV || env.NODE_ENV]; const flavourFiles = glob.sync('app/javascript/flavours/*/theme.yml'); const skinFiles = glob.sync('app/javascript/skins/*/*'); @@ -84,6 +83,5 @@ module.exports = { CDN_HOST: env.CDN_HOST, NODE_ENV: env.NODE_ENV, }, - loadersDir, output, }; |