IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Web: change prebuild-webpack-plugin for before-build-webpack-plugin

Browse Source
This commit is contained in:
Timofey Boyko 2023-02-03 18:52:51 +03:00
parent d83c9520dc
commit 0b7b214fbb
7 changed files with 68 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/client/package.json
View File

@ -62,6 +62,7 @@
"@babel/preset-typescript": "^7.18.6",
"@svgr/webpack": "^5.5.0",
"babel-loader": "^8.2.2",
"before-build-webpack": "^0.2.13",
"clean-webpack-plugin": "^4.0.0",
"copy-webpack-plugin": "^9.0.1",
"css-loader": "^6.2.0",
@ -71,7 +72,6 @@
"html-webpack-plugin": "5.3.2",
"json-loader": "^0.5.7",
"playwright": "^1.18.1",
"prebuild-webpack-plugin": "^1.1.1",
"sass": "^1.39.2",
"sass-loader": "^12.1.0",
"serve": "14.1.1",

21
packages/client/webpack.config.js
View File

@ -4,7 +4,7 @@ const HtmlWebpackPlugin = require("html-webpack-plugin");
const ModuleFederationPlugin = require("webpack").container
.ModuleFederationPlugin;
const DefinePlugin = require("webpack").DefinePlugin;
const PrebuildWebpackPlugin = require("prebuild-webpack-plugin");
const WebpackBeforeBuildPlugin = require("before-build-webpack");
const ExternalTemplateRemotesPlugin = require("external-remotes-plugin");
const TerserPlugin = require("terser-webpack-plugin");
const combineUrl = require("@docspace/common/utils/combineUrl");
@ -240,16 +240,15 @@ const config = {
plugins: [
new CleanWebpackPlugin(),
new ExternalTemplateRemotesPlugin(),
new PrebuildWebpackPlugin({
build: async (compiler, compilation, matchedFiles) => {
await beforeBuild(
[
path.join(__dirname, "./public/locales"),
path.join(__dirname, "../../public/locales"),
],
path.join(__dirname, "./src/helpers/autoGeneratedTranslations.js")
);
},
new WebpackBeforeBuildPlugin(async function (stats, callback) {
await beforeBuild(
[
path.join(__dirname, "./public/locales"),
path.join(__dirname, "../../public/locales"),
],
path.join(__dirname, "./src/helpers/autoGeneratedTranslations.js")
);
callback();
}),
new CopyPlugin({
patterns: [

2
packages/editor/package.json
View File

@ -33,6 +33,7 @@
"@svgr/webpack": "^6.2.1",
"babel-loader": "^8.2.2",
"babel-plugin-styled-components": "^1.12.0",
"before-build-webpack": "^0.2.13",
"clean-webpack-plugin": "^4.0.0",
"copy-webpack-plugin": "^11.0.0",
"cross-env": "^7.0.3",
@ -43,7 +44,6 @@
"json-loader": "^0.5.7",
"nodemon": "^2.0.7",
"npm-run-all": "^4.1.5",
"prebuild-webpack-plugin": "^1.1.1",
"sass": "^1.53.0",
"sass-loader": "^13.0.2",
"shx": "^0.3.4",

45
packages/editor/webpack/webpack.client.js
View File

@ -9,7 +9,7 @@ const ExternalTemplateRemotesPlugin = require("external-remotes-plugin");
const CopyPlugin = require("copy-webpack-plugin");
const TerserPlugin = require("terser-webpack-plugin");
const minifyJson = require("@docspace/common/utils/minifyJson");
const PrebuildWebpackPlugin = require("prebuild-webpack-plugin");
const WebpackBeforeBuildPlugin = require("before-build-webpack");
const beforeBuild = require("@docspace/common/utils/beforeBuild");
const sharedDeps = require("@docspace/common/constants/sharedDependencies");
@ -137,29 +137,28 @@ const clientConfig = {
],
}),
new WebpackManifestPlugin(),
new PrebuildWebpackPlugin({
build: async (compiler, compilation, matchedFiles) => {
await beforeBuild(
[
path.join(__dirname, "../public/locales"),
path.join(__dirname, "../../../public/locales"),
new WebpackBeforeBuildPlugin(async function (stats, callback) {
await beforeBuild(
[
path.join(__dirname, "../public/locales"),
path.join(__dirname, "../../../public/locales"),
],
path.join(__dirname, "../src/autoGeneratedTranslations.js"),
{
path: path.join(__dirname, "../../client/public/locales"),
files: [
"ChangeOwnerPanel.json",
"EmbeddingPanel.json",
"Files.json",
"PeopleSelector.json",
"PeopleTranslations.json",
"SharingPanel.json",
"Translations.json",
],
path.join(__dirname, "../src/autoGeneratedTranslations.js"),
{
path: path.join(__dirname, "../../client/public/locales"),
files: [
"ChangeOwnerPanel.json",
"EmbeddingPanel.json",
"Files.json",
"PeopleSelector.json",
"PeopleTranslations.json",
"SharingPanel.json",
"Translations.json",
],
alias: "CLIENT_PUBLIC_DIR",
}
);
},
alias: "CLIENT_PUBLIC_DIR",
}
);
callback();
}),
],
};

2
packages/login/package.json
View File

@ -73,6 +73,7 @@
"@types/styled-components": "^5.1.25",
"@types/winston": "^2.4.4",
"babel-loader": "^8.2.2",
"before-build-webpack": "^0.2.13",
"clean-webpack-plugin": "^4.0.0",
"copy-webpack-plugin": "^9.0.1",
"css-loader": "^6.2.0",
@ -87,7 +88,6 @@
"nodemon": "^2.0.19",
"npm-run-all": "^4.1.5",
"playwright": "^1.17.1",
"prebuild-webpack-plugin": "^1.1.1",
"sass": "^1.39.2",
"sass-loader": "^12.1.0",
"serve": "14.1.1",

31
packages/login/webpack/webpack.client.js
View File

@ -11,7 +11,7 @@ const TerserPlugin = require("terser-webpack-plugin");
const combineUrl = require("@docspace/common/utils/combineUrl");
const minifyJson = require("@docspace/common/utils/minifyJson");
const sharedDeps = require("@docspace/common/constants/sharedDependencies");
const PrebuildWebpackPlugin = require("prebuild-webpack-plugin");
const WebpackBeforeBuildPlugin = require("before-build-webpack");
const beforeBuild = require("@docspace/common/utils/beforeBuild");
const baseConfig = require("./webpack.base.js");
const pkg = require("../package.json");
@ -139,21 +139,20 @@ const clientConfig = {
],
}),
new WebpackManifestPlugin(),
new PrebuildWebpackPlugin({
build: async (compiler, compilation, matchedFiles) => {
await beforeBuild(
[
path.join(__dirname, "../public/locales"),
path.join(__dirname, "../../../public/locales"),
],
path.join(__dirname, "../src/autoGeneratedTranslations.ts"),
{
path: path.join(__dirname, "../../client/public/locales"),
files: ["Files.json"],
alias: "CLIENT_PUBLIC_DIR",
}
);
},
new WebpackBeforeBuildPlugin(async function (stats, callback) {
await beforeBuild(
[
path.join(__dirname, "../public/locales"),
path.join(__dirname, "../../../public/locales"),
],
path.join(__dirname, "../src/autoGeneratedTranslations.ts"),
{
path: path.join(__dirname, "../../client/public/locales"),
files: ["Files.json"],
alias: "CLIENT_PUBLIC_DIR",
}
);
callback();
}),
],
};

40
yarn.lock
View File

@ -2784,6 +2784,7 @@ __metadata:
"@babel/preset-typescript": ^7.18.6
"@svgr/webpack": ^5.5.0
babel-loader: ^8.2.2
before-build-webpack: ^0.2.13
clean-webpack-plugin: ^4.0.0
copy-to-clipboard: ^3.3.1
copy-webpack-plugin: ^9.0.1
@ -2798,7 +2799,6 @@ __metadata:
html-webpack-plugin: 5.3.2
json-loader: ^0.5.7
playwright: ^1.18.1
prebuild-webpack-plugin: ^1.1.1
react-avatar-editor: ^13.0.0
react-colorful: ^5.5.1
react-hotkeys-hook: ^3.4.4
@ -2970,6 +2970,7 @@ __metadata:
aws-crt: ^1.14.7
babel-loader: ^8.2.2
babel-plugin-styled-components: ^1.12.0
before-build-webpack: ^0.2.13
bufferutil: ^4.0.6
clean-webpack-plugin: ^4.0.0
compression: ^1.7.4
@ -2988,7 +2989,6 @@ __metadata:
nconf: ^0.12.0
nodemon: ^2.0.7
npm-run-all: ^4.1.5
prebuild-webpack-plugin: ^1.1.1
sass: ^1.53.0
sass-loader: ^13.0.2
shx: ^0.3.4
@ -3039,6 +3039,7 @@ __metadata:
"@types/ws": ^8.5.3
aws-crt: ^1.14.7
babel-loader: ^8.2.2
before-build-webpack: ^0.2.13
bufferutil: ^4.0.6
clean-webpack-plugin: ^4.0.0
compression: ^1.7.4
@ -3063,7 +3064,6 @@ __metadata:
nodemon: ^2.0.19
npm-run-all: ^4.1.5
playwright: ^1.17.1
prebuild-webpack-plugin: ^1.1.1
sass: ^1.39.2
sass-loader: ^12.1.0
serve: 14.1.1
@ -9158,6 +9158,13 @@ __metadata:
languageName: node
linkType: hard
"before-build-webpack@npm:^0.2.13":
version: 0.2.13
resolution: "before-build-webpack@npm:0.2.13"
checksum: 9f31c0c8a6677ac86db885e6e24fe1329c3cbe9f23723d0c106b93e064549241a01653557b4608531266d9c51ff347f939be6fc1fb4a246cba6765b573e93793
languageName: node
linkType: hard
"better-opn@npm:^2.1.1":
version: 2.1.1
resolution: "better-opn@npm:2.1.1"
@ -13736,7 +13743,7 @@ __metadata:
"fsevents@patch:fsevents@^1.2.7#~builtin<compat/fsevents>":
version: 1.2.13
resolution: "fsevents@patch:fsevents@npm%3A1.2.13#~builtin<compat/fsevents>::version=1.2.13&hash=18f3a7"
resolution: "fsevents@patch:fsevents@npm%3A1.2.13#~builtin<compat/fsevents>::version=1.2.13&hash=d11327"
dependencies:
bindings: ^1.5.0
nan: ^2.12.1
@ -13746,7 +13753,7 @@ __metadata:
"fsevents@patch:fsevents@^2.1.2#~builtin<compat/fsevents>, fsevents@patch:fsevents@~2.3.2#~builtin<compat/fsevents>":
version: 2.3.2
resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=18f3a7"
resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=df0bf1"
dependencies:
node-gyp: latest
conditions: os=darwin
@ -14033,7 +14040,7 @@ __metadata:
languageName: node
linkType: hard
"glob@npm:^7.0.0, glob@npm:^7.0.3, glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.5, glob@npm:^7.1.6, glob@npm:^7.2.0":
"glob@npm:^7.0.0, glob@npm:^7.0.3, glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0":
version: 7.2.3
resolution: "glob@npm:7.2.3"
dependencies:
@ -20305,17 +20312,6 @@ __metadata:
languageName: node
linkType: hard
"prebuild-webpack-plugin@npm:^1.1.1":
version: 1.1.1
resolution: "prebuild-webpack-plugin@npm:1.1.1"
dependencies:
debug: ^4.1.1
glob: ^7.1.5
minimatch: ^3.0.4
checksum: 11e091bbefc8e3dcda84c6abd1d02e250af4f4a5189355464bb5b440de2c6da722a55956b190ca6e4a4136684f0643d16c7d5c48a6eeae9b670409d62e1c6047
languageName: node
linkType: hard
"prefix-style@npm:2.0.1":
version: 2.0.1
resolution: "prefix-style@npm:2.0.1"
@ -22328,14 +22324,14 @@ __metadata:
"resolve@patch:resolve@1.1.7#~builtin<compat/resolve>":
version: 1.1.7
resolution: "resolve@patch:resolve@npm%3A1.1.7#~builtin<compat/resolve>::version=1.1.7&hash=07638b"
resolution: "resolve@patch:resolve@npm%3A1.1.7#~builtin<compat/resolve>::version=1.1.7&hash=3bafbf"
checksum: e9dbca78600ae56835c43a09f1276876c883e4b4bbd43e2683fa140671519d2bdebeb1c1576ca87c8c508ae2987b3ec481645ac5d3054b0f23254cfc1ce49942
languageName: node
linkType: hard
"resolve@patch:resolve@^1.1.6#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.12.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.14.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.19.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.3.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.8.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.9.0#~builtin<compat/resolve>":
version: 1.22.1
resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin<compat/resolve>::version=1.22.1&hash=07638b"
resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin<compat/resolve>::version=1.22.1&hash=c3c19d"
dependencies:
is-core-module: ^2.9.0
path-parse: ^1.0.7
@ -22348,7 +22344,7 @@ __metadata:
"resolve@patch:resolve@^2.0.0-next.4#~builtin<compat/resolve>":
version: 2.0.0-next.4
resolution: "resolve@patch:resolve@npm%3A2.0.0-next.4#~builtin<compat/resolve>::version=2.0.0-next.4&hash=07638b"
resolution: "resolve@patch:resolve@npm%3A2.0.0-next.4#~builtin<compat/resolve>::version=2.0.0-next.4&hash=c3c19d"
dependencies:
is-core-module: ^2.9.0
path-parse: ^1.0.7
@ -24826,11 +24822,11 @@ __metadata:
"typescript@patch:typescript@^4.7.4#~builtin<compat/typescript>":
version: 4.9.4
resolution: "typescript@patch:typescript@npm%3A4.9.4#~builtin<compat/typescript>::version=4.9.4&hash=701156"
resolution: "typescript@patch:typescript@npm%3A4.9.4#~builtin<compat/typescript>::version=4.9.4&hash=ad5954"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 37f6e2c3c5e2aa5934b85b0fddbf32eeac8b1bacf3a5b51d01946936d03f5377fe86255d4e5a4ae628fd0cd553386355ad362c57f13b4635064400f3e8e05b9d
checksum: 1caaea6cb7f813e64345190fddc4e6c924d0b698ab81189b503763c4a18f7f5501c69362979d36e19c042d89d936443e768a78b0675690b35eb663d19e0eae71
languageName: node
linkType: hard