aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-02-25 15:00:43 +0100
committerChocobozzz <me@florianbigard.com>2021-02-25 15:01:29 +0100
commit031ea8efed6979cb01d0a7857cea6aa27270ceb7 (patch)
treed5f7a82b44b239abbb9a53d5d74b702514c5c2d3
parentd61893f7236abbed30c25b1823e6ecad93a8e8dd (diff)
downloadPeerTube-031ea8efed6979cb01d0a7857cea6aa27270ceb7.tar.gz
PeerTube-031ea8efed6979cb01d0a7857cea6aa27270ceb7.tar.zst
PeerTube-031ea8efed6979cb01d0a7857cea6aa27270ceb7.zip
Use named chunk for embed on analyze
-rw-r--r--client/webpack/webpack.video-embed.js6
-rw-r--r--server/middlewares/validators/videos/videos.ts2
-rw-r--r--server/models/account/user.ts1
3 files changed, 6 insertions, 3 deletions
diff --git a/client/webpack/webpack.video-embed.js b/client/webpack/webpack.video-embed.js
index ef17deeb6..7de63adfc 100644
--- a/client/webpack/webpack.video-embed.js
+++ b/client/webpack/webpack.video-embed.js
@@ -40,7 +40,11 @@ module.exports = function () {
40 : '[name].[hash].bundle.js', 40 : '[name].[hash].bundle.js',
41 41
42 sourceMapFilename: '[file].map', 42 sourceMapFilename: '[file].map',
43 chunkFilename: '[id].[hash].chunk.js', 43
44 chunkFilename: process.env.ANALYZE_BUNDLE === 'true'
45 ? '[name].chunk.js'
46 : '[id].[hash].chunk.js',
47
44 publicPath: '/client/standalone/videos/' 48 publicPath: '/client/standalone/videos/'
45 }, 49 },
46 50
diff --git a/server/middlewares/validators/videos/videos.ts b/server/middlewares/validators/videos/videos.ts
index d51c86972..37cc07b94 100644
--- a/server/middlewares/validators/videos/videos.ts
+++ b/server/middlewares/validators/videos/videos.ts
@@ -3,7 +3,7 @@ import { body, param, query, ValidationChain } from 'express-validator'
3import { isAbleToUploadVideo } from '@server/lib/user' 3import { isAbleToUploadVideo } from '@server/lib/user'
4import { getServerActor } from '@server/models/application/application' 4import { getServerActor } from '@server/models/application/application'
5import { ExpressPromiseHandler } from '@server/types/express' 5import { ExpressPromiseHandler } from '@server/types/express'
6import { MVideoFullLight, MVideoWithRights } from '@server/types/models' 6import { MVideoWithRights } from '@server/types/models'
7import { ServerErrorCode, UserRight, VideoChangeOwnershipStatus, VideoPrivacy } from '../../../../shared' 7import { ServerErrorCode, UserRight, VideoChangeOwnershipStatus, VideoPrivacy } from '../../../../shared'
8import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes' 8import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
9import { VideoChangeOwnershipAccept } from '../../../../shared/models/videos/video-change-ownership-accept.model' 9import { VideoChangeOwnershipAccept } from '../../../../shared/models/videos/video-change-ownership-accept.model'
diff --git a/server/models/account/user.ts b/server/models/account/user.ts
index 0834ecfa5..c1f22b76a 100644
--- a/server/models/account/user.ts
+++ b/server/models/account/user.ts
@@ -28,7 +28,6 @@ import {
28 MUserFormattable, 28 MUserFormattable,
29 MUserNotifSettingChannelDefault, 29 MUserNotifSettingChannelDefault,
30 MUserWithNotificationSetting, 30 MUserWithNotificationSetting,
31 MVideoFullLight,
32 MVideoWithRights 31 MVideoWithRights
33} from '@server/types/models' 32} from '@server/types/models'
34import { hasUserRight, USER_ROLE_LABELS } from '../../../shared/core-utils/users' 33import { hasUserRight, USER_ROLE_LABELS } from '../../../shared/core-utils/users'