Web: fix build

This commit is contained in:
Timofey Boyko 2023-02-06 19:15:04 +03:00
parent f25abdc1ba
commit 131dd06bdb
9 changed files with 58 additions and 72 deletions

View File

@ -4,10 +4,11 @@
"private": true,
"homepage": "",
"scripts": {
"build": "NODE_OPTIONS=--openssl-legacy-provider webpack --mode production",
"build": "yarn build:translations && NODE_OPTIONS=--openssl-legacy-provider webpack --mode production",
"build:translations": "node scripts/buildTranslations.js",
"clean": "shx rm -rf dist",
"deploy": "shx --silent mkdir -p ../../build/deploy/client && shx cp -r dist/* ../../build/deploy/client",
"start": "NODE_OPTIONS=--openssl-legacy-provider webpack-cli serve",
"start": "yarn build:translations && NODE_OPTIONS=--openssl-legacy-provider webpack-cli serve",
"start-prod": "serve dist -s -p 5001"
},
"old-scripts": {

View File

@ -0,0 +1,10 @@
const path = require("path");
const beforeBuild = require("@docspace/common/utils/beforeBuild");
beforeBuild(
[
path.join(__dirname, "../public/locales"),
path.join(__dirname, "../../../public/locales"),
],
path.join(__dirname, "../src/helpers/autoGeneratedTranslations.js")
);

View File

@ -242,22 +242,7 @@ const config = {
plugins: [
new CleanWebpackPlugin(),
new ExternalTemplateRemotesPlugin(),
{
apply: (compiler) => {
compiler.hooks.environment.tap(
"Create autoGeneratedTranslations file",
async () => {
await beforeBuild(
[
path.join(__dirname, "./public/locales"),
path.join(__dirname, "../../public/locales"),
],
path.join(__dirname, "./src/helpers/autoGeneratedTranslations.js")
);
}
);
},
},
new CopyPlugin({
patterns: [
// {

View File

@ -4,13 +4,14 @@
"private": true,
"homepage": "/doceditor",
"scripts": {
"build": "yarn clean && yarn build:client && yarn build:server",
"build": "yarn clean && yarn build:translations && yarn build:client && yarn build:server",
"build:server": "NODE_OPTIONS=--openssl-legacy-provider webpack --mode production --config webpack/webpack.server.js",
"build:client": "NODE_OPTIONS=--openssl-legacy-provider webpack --mode production --config webpack/webpack.client.js",
"build:dev-server": "NODE_OPTIONS=--openssl-legacy-provider webpack --config webpack/webpack.server.js",
"build:dev-client": "NODE_OPTIONS=--openssl-legacy-provider webpack --config webpack/webpack.client.js",
"build:translations": "node scripts/buildTranslations.js",
"clean": "shx rm -rf dist",
"start": "yarn clean && npm-run-all --parallel start:client start:server start:common",
"start": "yarn clean && yarn build:translations && npm-run-all --parallel start:client start:server start:common",
"start:client": "NODE_OPTIONS=--openssl-legacy-provider webpack --config webpack/webpack.client.js --watch --no-cache",
"start:server": "NODE_OPTIONS=--openssl-legacy-provider webpack --config webpack/webpack.server.js --watch --no-cache",
"start:common": "yarn build:dev-client && yarn build:dev-server && NODE_OPTIONS=--openssl-legacy-provider nodemon --watch dist/server.js dist/server.js",

View File

@ -0,0 +1,23 @@
const path = require("path");
const beforeBuild = require("@docspace/common/utils/beforeBuild");
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",
],
alias: "CLIENT_PUBLIC_DIR",
}
);

View File

@ -137,35 +137,6 @@ const clientConfig = {
],
}),
new WebpackManifestPlugin(),
{
apply: (compiler) => {
compiler.hooks.environment.tap(
"Create autoGeneratedTranslations file",
async () => {
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",
],
alias: "CLIENT_PUBLIC_DIR",
}
);
}
);
},
},
],
};

View File

@ -4,7 +4,7 @@
"private": true,
"homepage": "/login",
"scripts": {
"build": "yarn clean && yarn build:client && yarn build:server",
"build": "yarn clean && yarn build:translations && yarn build:client && yarn build:server",
"build:client": "NODE_OPTIONS=--openssl-legacy-provider webpack --mode production --config webpack/webpack.client.js",
"build:server": "NODE_OPTIONS=--openssl-legacy-provider webpack --mode production --config webpack/webpack.server.js",
"build:dev-server": "NODE_OPTIONS=--openssl-legacy-provider webpack --config webpack/webpack.server.js",
@ -14,8 +14,9 @@
"build-rooms:server": "NODE_OPTIONS=--openssl-legacy-provider webpack --mode production --env rooms=true --config webpack/webpack.server.js",
"build-rooms:dev-server": "NODE_OPTIONS=--openssl-legacy-provider webpack --env rooms=true --config webpack/webpack.server.js",
"build-rooms:dev-client": "NODE_OPTIONS=--openssl-legacy-provider webpack --env rooms=true --config webpack/webpack.client.js",
"build:translations": "node scripts/buildTranslations.js",
"clean": "shx rm -rf dist",
"start": "yarn clean && npm-run-all --parallel start:client start:server start:common",
"start": "yarn clean && yarn build:translations && npm-run-all --parallel start:client start:server start:common",
"start:client": "NODE_OPTIONS=--openssl-legacy-provider webpack --config webpack/webpack.client.js --watch --no-cache",
"start:server": "NODE_OPTIONS=--openssl-legacy-provider webpack --config webpack/webpack.server.js --watch --no-cache",
"start:common": "yarn build:dev-client && yarn build:dev-server && NODE_OPTIONS=--openssl-legacy-provider nodemon --watch dist/server.js dist/server.js",

View File

@ -0,0 +1,15 @@
const path = require("path");
const beforeBuild = require("@docspace/common/utils/beforeBuild");
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",
}
);

View File

@ -138,27 +138,6 @@ const clientConfig = {
],
}),
new WebpackManifestPlugin(),
{
apply: (compiler) => {
compiler.hooks.environment.tap(
"Create autoGeneratedTranslations file",
async () => {
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",
}
);
}
);
},
},
],
};