diff --git a/config/webpack/loaders/angular.js b/config/webpack/loaders/angular.js index cbb916e33e3..e921a429bd0 100644 --- a/config/webpack/loaders/angular.js +++ b/config/webpack/loaders/angular.js @@ -1,4 +1,4 @@ module.exports = { - test: /.ts$/, + test: /\.(ts|tsx)$/, loader: 'ts-loader' } diff --git a/config/webpack/loaders/babel.js b/config/webpack/loaders/babel.js index c608e708f37..484b68c0347 100644 --- a/config/webpack/loaders/babel.js +++ b/config/webpack/loaders/babel.js @@ -1,5 +1,4 @@ module.exports = { - test: /\.js(\.erb)?$/, - exclude: /node_modules/, + test: /\.js$/, loader: 'babel-loader' } diff --git a/config/webpack/loaders/coffee.js b/config/webpack/loaders/coffee.js deleted file mode 100644 index dae8742492f..00000000000 --- a/config/webpack/loaders/coffee.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - test: /\.coffee(\.erb)?$/, - loader: 'coffee-loader' -} diff --git a/config/webpack/loaders/erb.js b/config/webpack/loaders/erb.js deleted file mode 100644 index 4cd7d684955..00000000000 --- a/config/webpack/loaders/erb.js +++ /dev/null @@ -1,9 +0,0 @@ -module.exports = { - test: /\.erb$/, - enforce: 'pre', - exclude: /node_modules/, - loader: 'rails-erb-loader', - options: { - runner: 'bin/rails runner' - } -} diff --git a/config/webpack/loaders/react.js b/config/webpack/loaders/react.js index f5948cc4c29..245cd51d643 100644 --- a/config/webpack/loaders/react.js +++ b/config/webpack/loaders/react.js @@ -1,9 +1,7 @@ module.exports = { - test: /\.(js|jsx)?(\.erb)?$/, - exclude: /node_modules/, + test: /\.(js|jsx)$/, loader: 'babel-loader', query: { presets: ['react'], }, }; - diff --git a/config/webpacker.yml b/config/webpacker.yml index 05e3bf20080..057618bb7b1 100644 --- a/config/webpacker.yml +++ b/config/webpacker.yml @@ -6,11 +6,10 @@ default: &default public_output_path: packs extensions: - - .coffee - - .erb - .js - .jsx - .ts + - .tsx - .vue - .sass - .scss diff --git a/package.json b/package.json index 8b9adab9013..50b4d28fc0f 100644 --- a/package.json +++ b/package.json @@ -58,8 +58,6 @@ "babel-polyfill": "^6.23.0", "babel-preset-env": "~1.4.0", "babel-preset-react": "^6.24.1", - "coffee-loader": "~0.7.3", - "coffee-script": "~1.12.5", "compression-webpack-plugin": "~0.4.0", "css-loader": "~0.28.0", "eslint": "^4.14.0", @@ -84,7 +82,6 @@ "postcss-loader": "~1.3.3", "postcss-smart-import": "~0.6.11", "precss": "~1.4.0", - "rails-erb-loader": "~5.0.0", "resolve-url-loader": "^2.0.2", "sass-loader": "~6.0.3", "style-loader": "~0.16.1",