Skip to content

Commit f8bd6be

Browse files
cpcallenrachel-fenichel
authored andcommitted
fix(build): Fix sourcemaps, re-update metadata (#7550)
* fix(build): Revert "refactor: Remove $build$src infix from munged paths" This is a mostly-manual revert of commit 06d78af to fix an issue where the generated sourcemaps are missing the inline copies of the original .ts source files. * chore: Update metadata for 2020 Q3 release This is being done a second time as the revert of 06d78af causes a significant increase in the size of the build products.
1 parent c62f335 commit f8bd6be

2 files changed

Lines changed: 11 additions & 10 deletions

File tree

scripts/gulpfiles/build_tasks.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,8 @@ for (let i = 1; i < chunks.length; i++) {
163163
* as munged by Closure Compiler.
164164
*/
165165
function modulePath(chunk) {
166-
return 'module$' + chunk.entry.replace(/\.js$/, '').replaceAll('/', '$');
166+
const entryPath = path.posix.join(TSC_OUTPUT_DIR_POSIX, chunk.entry);
167+
return 'module$' + entryPath.replace(/\.js$/, '').replaceAll('/', '$');
167168
}
168169

169170
const licenseRegex = `\\/\\*\\*
@@ -555,7 +556,7 @@ function buildCompiled() {
555556
};
556557

557558
// Fire up compilation pipline.
558-
return gulp.src(chunkOptions.js, {base: TSC_OUTPUT_DIR_POSIX})
559+
return gulp.src(chunkOptions.js, {base: './'})
559560
.pipe(stripApacheLicense())
560561
.pipe(gulp.sourcemaps.init())
561562
.pipe(compile(options))

tests/scripts/check_metadata.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ readonly RELEASE_DIR='dist'
3535
# Q4 2022 9.1.1 903357
3636
# Q1 2023 9.2.1 909181
3737
# Q2 2023 9.3.3 887618
38-
# Q3 2023 10.1.3 818138
39-
readonly BLOCKLY_SIZE_EXPECTED=818138
38+
# Q3 2023 10.1.3 898859
39+
readonly BLOCKLY_SIZE_EXPECTED=898859
4040

4141
# Size of blocks_compressed.js
4242
# Q2 2019 2.20190722.0 75618
@@ -57,8 +57,8 @@ readonly BLOCKLY_SIZE_EXPECTED=818138
5757
# Q4 2022 9.1.1 102190
5858
# Q1 2023 9.2.1 101114
5959
# Q2 2023 9.3.3 91848
60-
# Q3 2023 10.1.3 84772
61-
readonly BLOCKS_SIZE_EXPECTED=84772
60+
# Q3 2023 10.1.3 90150
61+
readonly BLOCKS_SIZE_EXPECTED=90150
6262

6363
# Size of blockly_compressed.js.gz
6464
# Q2 2019 2.20190722.0 180925
@@ -80,8 +80,8 @@ readonly BLOCKS_SIZE_EXPECTED=84772
8080
# Q4 2022 9.1.1 179306
8181
# Q1 2023 9.2.1 179814
8282
# Q2 2023 9.3.3 175206
83-
# Q3 2023 10.1.3 177241
84-
readonly BLOCKLY_GZ_SIZE_EXPECTED=177241
83+
# Q3 2023 10.1.3 180553
84+
readonly BLOCKLY_GZ_SIZE_EXPECTED=180553
8585

8686
# Size of blocks_compressed.js.gz
8787
# Q2 2019 2.20190722.0 14552
@@ -102,8 +102,8 @@ readonly BLOCKLY_GZ_SIZE_EXPECTED=177241
102102
# Q4 2022 9.1.1 17182
103103
# Q1 2023 9.2.1 17262
104104
# Q2 2023 9.3.3 16736
105-
# Q3 2023 10.1.3 16299
106-
readonly BLOCKS_GZ_SIZE_EXPECTED=16299
105+
# Q3 2023 10.1.3 16508
106+
readonly BLOCKS_GZ_SIZE_EXPECTED=16508
107107

108108
# ANSI colors
109109
readonly BOLD_GREEN='\033[1;32m'

0 commit comments

Comments
 (0)