Use ESM syntax for webpack.config.js

go-gitea · Aug 18, 2020 · 92bf4e7 · 92bf4e7
1 parent 394f247
commit 92bf4e7
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 27 deletions.
diff --git a/Makefile b/Makefile
@@ -316,7 +316,7 @@ lint-backend: golangci-lint revive vet
 .PHONY: watch-frontend
 watch-frontend: node-check $(FOMANTIC_DEST) node_modules
 	rm -rf $(WEBPACK_DEST_ENTRIES)
-	NODE_ENV=development npx webpack --hide-modules --display-entrypoints=false --watch --progress
+	NODE_ENV=development npx webpack -r @babel/register --hide-modules --display-entrypoints=false --watch --progress
 
 .PHONY: watch-backend
 watch-backend: go-check
@@ -639,7 +639,7 @@ webpack: $(WEBPACK_DEST)
 
 $(WEBPACK_DEST): $(WEBPACK_SOURCES) $(WEBPACK_CONFIGS) package-lock.json | node_modules
 	rm -rf $(WEBPACK_DEST_ENTRIES)
-	npx webpack --hide-modules --display-entrypoints=false
+	npx webpack -r @babel/register --hide-modules --display-entrypoints=false
 	@touch $(WEBPACK_DEST)
 
 .PHONY: svg

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -51,6 +51,7 @@
     "wrap-ansi": "7.0.0"
   },
   "devDependencies": {
+    "@babel/register": "7.10.5",
     "eslint": "7.6.0",
     "eslint-plugin-import": "2.22.0",
     "eslint-plugin-unicorn": "21.0.0",
@@ -63,5 +64,10 @@
     "defaults",
     "not ie > 0",
     "not ie_mob > 0"
-  ]
+  ],
+  "babel": {
+    "presets": [
+      "@babel/preset-env"
+    ]
+  }
 }
diff --git a/webpack.config.js b/webpack.config.js
@@ -1,20 +1,16 @@
-const fastGlob = require('fast-glob');
-const wrapAnsi = require('wrap-ansi');
-const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
-const FixStyleOnlyEntriesPlugin = require('webpack-fix-style-only-entries');
-const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
-const PostCSSPresetEnv = () => require('postcss-preset-env')({
-  features: {
-    'system-ui-font-family': false,
-  }
-});
-const TerserPlugin = require('terser-webpack-plugin');
-const VueLoaderPlugin = require('vue-loader/lib/plugin');
-const {statSync} = require('fs');
-const {resolve, parse} = require('path');
-const {LicenseWebpackPlugin} = require('license-webpack-plugin');
-const {SourceMapDevToolPlugin} = require('webpack');
+import fastGlob from 'fast-glob';
+import wrapAnsi from 'wrap-ansi';
+import CssMinimizerPlugin from 'css-minimizer-webpack-plugin';
+import FixStyleOnlyEntriesPlugin from 'webpack-fix-style-only-entries';
+import MiniCssExtractPlugin from 'mini-css-extract-plugin';
+import MonacoWebpackPlugin from 'monaco-editor-webpack-plugin';
+import PostCSSPresetEnv from 'postcss-preset-env';
+import TerserPlugin from 'terser-webpack-plugin';
+import VueLoaderPlugin from 'vue-loader/lib/plugin';
+import {statSync} from 'fs';
+import {resolve, parse} from 'path';
+import {LicenseWebpackPlugin} from 'license-webpack-plugin';
+import {SourceMapDevToolPlugin} from 'webpack';
 
 const glob = (pattern) => fastGlob.sync(pattern, {cwd: __dirname, absolute: true});
 
@@ -41,7 +37,15 @@ const filterCssImport = (url, ...args) => {
   return true;
 };
 
-module.exports = {
+const postCSSPlugins = () => [
+  PostCSSPresetEnv({
+    features: {
+      'system-ui-font-family': false,
+    },
+  }),
+];
+
+export default {
   mode: isProduction ? 'production' : 'development',
   entry: {
     index: [
@@ -179,9 +183,7 @@ module.exports = {
           {
             loader: 'postcss-loader',
             options: {
-              plugins: () => [
-                PostCSSPresetEnv(),
-              ],
+              plugins: postCSSPlugins,
               sourceMap: true,
             },
           },
@@ -205,9 +207,7 @@ module.exports = {
           {
             loader: 'postcss-loader',
             options: {
-              plugins: () => [
-                PostCSSPresetEnv(),
-              ],
+              plugins: postCSSPlugins,
               sourceMap: true,
             },
           },