1
0
mirror of https://github.com/flarum/core.git synced 2025-08-13 20:04:24 +02:00

Compare commits

...

5 Commits

Author SHA1 Message Date
Alexander Skvortsov
e15e903cfe Regen lockfile with v2 2021-04-16 08:48:55 -04:00
Alexander Skvortsov
ee0299fa8c Build JS 2021-04-13 15:54:51 -04:00
Alexander Skvortsov
fd2e201a21 Dont generate license.txt
See https://stackoverflow.com/questions/64818489/webpack-omit-creation-of-license-txt-files
2021-04-13 15:51:13 -04:00
Alexander Skvortsov
f05163eda5 Use webpack 5 2021-04-13 15:50:47 -04:00
Alexander Skvortsov
b5dc653a19 Add semicolons in flarum.extension assignments
Without these, content generated by webpack 5 breaks
2021-04-13 15:47:06 -04:00
9 changed files with 1157 additions and 6917 deletions

6
js/dist/admin.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

54
js/dist/forum.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

7988
js/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -6,7 +6,7 @@
"clsx": "^1.1.1",
"color-thief-browser": "^2.0.2",
"dayjs": "^1.10.4",
"expose-loader": "^1.0.3",
"expose-loader": "^2.0.0",
"jquery": "^3.6.0",
"jquery.hotkeys": "^0.1.0",
"lodash-es": "^4.17.21",
@@ -27,10 +27,10 @@
"flarum-webpack-config": "0.1.0-beta.10",
"husky": "^4.3.8",
"prettier": "^2.2.1",
"webpack": "^4.46.0",
"webpack-bundle-analyzer": "^4.4.0",
"webpack-cli": "^3.3.12",
"webpack-merge": "^4.2.2"
"webpack": "^5.0.0",
"webpack-bundle-analyzer": "^4.4.1",
"webpack-cli": "^4.0.0",
"webpack-merge": "^4.0.0"
},
"scripts": {
"dev": "webpack --mode development --watch",

View File

@@ -1,5 +1,5 @@
// Expose jQuery, mithril and dayjs to the window browser object
import 'expose-loader?exposes[]=$&exposes[]=jQuery!jquery';
import 'expose-loader?exposes=$,jQuery!jquery';
import 'expose-loader?exposes=m!mithril';
import 'expose-loader?exposes=dayjs!dayjs';

View File

@@ -1,6 +1,7 @@
const config = require('flarum-webpack-config');
const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
const merge = require('webpack-merge');
const TerserPlugin = require("terser-webpack-plugin");
const useBundleAnalyzer = process.env.ANALYZER === 'true';
@@ -21,6 +22,11 @@ module.exports = merge(config(), {
},
plugins,
optimization: {
minimizer: [new TerserPlugin({
extractComments: false,
})],
},
});
module.exports['module'].rules[0].test = /\.(tsx?|js)$/;

View File

@@ -97,11 +97,11 @@ class Frontend implements ExtenderInterface
if ($this->js) {
$assets->js(function (SourceCollector $sources) use ($moduleName) {
$sources->addString(function () {
return 'var module={}';
return 'var module={};';
});
$sources->addFile($this->js);
$sources->addString(function () use ($moduleName) {
return "flarum.extensions['$moduleName']=module.exports";
return "flarum.extensions['$moduleName']=module.exports;";
});
});
}