Update chunks format

Author: amortemousque

scripts/deploy/deploy.js

@@ -39,8 +39,8 @@ const uploadPathTypes = process.argv[4].split(',')
 runMain(async () => {
   const awsConfig = AWS_CONFIG[env]
   let cloudfrontPathsToInvalidate = []
-  for (const { packageName, chunks } of packages) {
-    const pathsToInvalidate = await uploadPackage(awsConfig, packageName, chunks)
+  for (const { packageName } of packages) {
+    const pathsToInvalidate = await uploadPackage(awsConfig, packageName)
     cloudfrontPathsToInvalidate.push(...pathsToInvalidate)
   }
   invalidateCloudfront(awsConfig, cloudfrontPathsToInvalidate)
@@ -55,6 +55,7 @@ async function uploadPackage(awsConfig, packageName) {
       if (!bundlePath.endsWith('.js')) {
         return
       }
+
       const relativeBundlePath = bundlePath.replace(`${bundleFolder}/`, '')
       const uploadPath = await generateUploadPath(uploadPathType, relativeBundlePath, version)
 
@@ -66,7 +67,7 @@ async function uploadPackage(awsConfig, packageName) {
   return cloudfrontPathsToInvalidate
 }
 
-async function generateUploadPath(uploadPathType, chunkName, version) {
+async function generateUploadPath(uploadPathType, filePath, version) {
   let uploadPath
 
   if (uploadPathType === 'pull-request') {
@@ -75,11 +76,11 @@ async function generateUploadPath(uploadPathType, chunkName, version) {
       console.log('No pull requests found for the branch')
       process.exit(0)
     }
-    uploadPath = buildPullRequestUploadPath(chunkName, pr.number)
+    uploadPath = buildPullRequestUploadPath(filePath, pr.number)
   } else if (uploadPathType === 'root') {
-    uploadPath = buildRootUploadPath(chunkName, version)
+    uploadPath = buildRootUploadPath(filePath, version)
   } else {
-    uploadPath = buildDatacenterUploadPath(uploadPathType, chunkName, version)
+    uploadPath = buildDatacenterUploadPath(uploadPathType, filePath, version)
   }
 
   return uploadPath

scripts/deploy/lib/deploymentUtils.js

@@ -1,7 +1,7 @@
 const packages = [
-  { packageName: 'logs', chunks: ['datadog-logs'], service: 'browser-logs-sdk' },
-  { packageName: 'rum', chunks: ['datadog-rum', 'recorder.datadog-rum'], service: 'browser-rum-sdk' },
-  { packageName: 'rum-slim', chunks: ['datadog-rum-slim'], service: 'browser-rum-sdk' },
+  { packageName: 'logs', service: 'browser-logs-sdk' },
+  { packageName: 'rum', service: 'browser-rum-sdk' },
+  { packageName: 'rum-slim', service: 'browser-rum-sdk' },
 ]
 
 // ex: datadog-rum-v4.js, chunks/recorder-8d8a8dfab6958424038f-datadog-rum-v4.js
@@ -12,16 +12,14 @@ const buildRootUploadPath = (filePath, version) => {
   return `${basePath}-${version}.${ext}`
 }
 
-// ex: us1/v4/datadog-rum.js, eu1/v4/recorder.datadog-rum.js
-const buildDatacenterUploadPath = (datacenter, chunkName, version, extension = 'js') =>
-  `${datacenter}/${version}/${chunkName}.${extension}`
+// ex: us1/v4/datadog-rum.js, eu1/v4/chunks/recorder-8d8a8dfab6958424038f-datadog-rum.js
+const buildDatacenterUploadPath = (datacenter, filePath, version) => `${datacenter}/${version}/${filePath}`
 
-// ex: datadog-rum.js, recorder.datadog-rum.js
-const buildBundleFileName = (chunkName, extension = 'js') => `${chunkName}.${extension}`
+// ex: datadog-rum.js, chunks/recorder-8d8a8dfab6958424038f-datadog-rum.js
+const buildBundleFileName = (filePath) => `${filePath}`
 
-// ex: pull-request/2781/datadog-rum.js, pull-request/2781/recorder.datadog-rum.js
-const buildPullRequestUploadPath = (chunkName, version, extension = 'js') =>
-  `pull-request/${version}/${chunkName}.${extension}`
+// ex: pull-request/2781/datadog-rum.js, pull-request/2781/chunks/recorder-8d8a8dfab6958424038f-datadog-rum.js
+const buildPullRequestUploadPath = (filePath, version) => `pull-request/${version}/${filePath}`
 
 // ex: packages/rum/bundle
 const buildBundleFolder = (packageName) => `packages/${packageName}/bundle`

webpack.base.js

@@ -11,6 +11,7 @@ module.exports = ({ entry, mode, filename, types, keepBuildEnvVariables, plugins
   mode,
   output: {
     filename,
+    chunkFilename: `chunks/[name]-[contenthash]-${filename}`,
     path: path.resolve('./bundle'),
   },
   target: ['web', 'es2018'],