diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-03-16 13:52:55 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-16 14:14:20 +0100 |
commit | 4df3b7cb067797982199c3e613ba32a9c7474348 (patch) | |
tree | bf237d385411f73e670af4c744d8239ab4799434 /config/webpack/loaders | |
parent | c2fa0f7c40bcc4064e8baaa221665eadd391c001 (diff) | |
parent | 1a0d3c9c65d663210494ec9b55912debad6331f5 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/settings/follower_domains_controller.rb Removed upstream. Did the same here. Maybe we should not have? - config/locales/en.yml Upstream removed the “Authorized followers” page and associated translations. This is too close in the file to our glitch-soc-specific “flavour” string. No actual conflict. - config/locales/ja.yml Same as above. - config/locales/pl.yml Same as above. - config/navigation.rb No real conflict. New route added too close to the glitch-soc-specific “flavours” one. - config/webpack/configuration.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpack/loaders/babel.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. The contents of this file have been moved to package.json. - config/webpack/shared.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpacker.yml Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - jest.config.js The contents of this file have been moved to package.json. - package.json Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - yarn.lock Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up.
Diffstat (limited to 'config/webpack/loaders')
-rw-r--r-- | config/webpack/loaders/assets.js | 12 | ||||
-rw-r--r-- | config/webpack/loaders/babel.js | 13 | ||||
-rw-r--r-- | config/webpack/loaders/babel_external.js | 21 | ||||
-rw-r--r-- | config/webpack/loaders/mark.js | 8 | ||||
-rw-r--r-- | config/webpack/loaders/sass.js | 24 |
5 files changed, 0 insertions, 78 deletions
diff --git a/config/webpack/loaders/assets.js b/config/webpack/loaders/assets.js deleted file mode 100644 index 643b3eeb0..000000000 --- a/config/webpack/loaders/assets.js +++ /dev/null @@ -1,12 +0,0 @@ -const { env, publicPath } = require('../configuration.js'); - -module.exports = { - test: /\.(jpg|jpeg|png|gif|svg|eot|ttf|woff|woff2)$/i, - use: [{ - loader: 'file-loader', - options: { - publicPath, - name: env.NODE_ENV === 'production' ? '[name]-[hash].[ext]' : '[name].[ext]', - }, - }], -}; diff --git a/config/webpack/loaders/babel.js b/config/webpack/loaders/babel.js deleted file mode 100644 index d8d785b98..000000000 --- a/config/webpack/loaders/babel.js +++ /dev/null @@ -1,13 +0,0 @@ -const { resolve } = require('path'); - -const env = process.env.NODE_ENV || 'development'; - -module.exports = { - test: /\.js$/, - exclude: /node_modules/, - loader: 'babel-loader', - options: { - sourceRoot: 'app/javascript', - cacheDirectory: env === 'development' ? false : resolve(__dirname, '..', '..', '..', 'tmp', 'cache', 'babel-loader'), - }, -}; diff --git a/config/webpack/loaders/babel_external.js b/config/webpack/loaders/babel_external.js deleted file mode 100644 index 39e74ed90..000000000 --- a/config/webpack/loaders/babel_external.js +++ /dev/null @@ -1,21 +0,0 @@ -const { resolve } = require('path'); - -const env = process.env.NODE_ENV || 'development'; - -if (env === 'development') { - module.exports = {}; -} else { - // babel options to apply only to external libraries, e.g. remove-prop-types - module.exports = { - test: /\.js$/, - include: /node_modules/, - loader: 'babel-loader', - options: { - babelrc: false, - plugins: [ - 'transform-react-remove-prop-types', - ], - cacheDirectory: env === 'development' ? false : resolve(__dirname, '..', '..', '..', 'tmp', 'cache', 'babel-loader-external'), - }, - }; -} diff --git a/config/webpack/loaders/mark.js b/config/webpack/loaders/mark.js deleted file mode 100644 index e62a526b0..000000000 --- a/config/webpack/loaders/mark.js +++ /dev/null @@ -1,8 +0,0 @@ -if (process.env.NODE_ENV === 'production') { - module.exports = {}; -} else { - module.exports = { - test: /\.js$/, - loader: 'mark-loader', - }; -} diff --git a/config/webpack/loaders/sass.js b/config/webpack/loaders/sass.js deleted file mode 100644 index 5a96096bd..000000000 --- a/config/webpack/loaders/sass.js +++ /dev/null @@ -1,24 +0,0 @@ -const MiniCssExtractPlugin = require('mini-css-extract-plugin'); - -module.exports = { - test: /\.s?css$/i, - use: [ - MiniCssExtractPlugin.loader, - 'css-loader', - { - loader: 'postcss-loader', - options: { - sourceMap: true, - }, - }, - { - loader: 'sass-loader', - options: { - includePaths: ['app/javascript'], - fiber: require('fibers'), - implementation: require('sass'), - sourceMap: true, - }, - }, - ], -}; |