From 3c99c38c07ce4d12311cd67fd2005380455198e6 Mon Sep 17 00:00:00 2001 From: Rachel Fenichel Date: Mon, 25 Sep 2023 11:30:59 -0700 Subject: [PATCH 1/3] release: Update version number to 10.2.0 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3fffb4e8f..1a0462c34 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "blockly", - "version": "10.1.3", + "version": "10.2.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "blockly", - "version": "10.1.3", + "version": "10.2.0", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { diff --git a/package.json b/package.json index b89945d34..d0c8d2718 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "blockly", - "version": "10.1.3", + "version": "10.2.0", "description": "Blockly is a library for building visual programming editors.", "keywords": [ "blockly" From c62f3350d870737da2f1779cc91bff0c3b50e576 Mon Sep 17 00:00:00 2001 From: Christopher Allen Date: Wed, 27 Sep 2023 18:52:06 +0200 Subject: [PATCH 2/3] fix(build): Fix broken npm install of Closure Compiler (#7547) --- package-lock.json | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 1a0462c34..33ff09617 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5839,6 +5839,35 @@ "linux" ] }, + "node_modules/google-closure-compiler-osx": { + "version": "20230802.0.0", + "resolved": "https://registry.npmjs.org/google-closure-compiler-osx/-/google-closure-compiler-osx-20230802.0.0.tgz", + "integrity": "sha512-ANAi/ux92Tt+Na7vFDLeK2hRzotjC5j+nxoPtE0OcuNcbjji5dREKoJxkq7r0YwRTCzAFZszK5ip/NPdTOdCEg==", + "cpu": [ + "x32", + "x64", + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/google-closure-compiler-windows": { + "version": "20230802.0.0", + "resolved": "https://registry.npmjs.org/google-closure-compiler-windows/-/google-closure-compiler-windows-20230802.0.0.tgz", + "integrity": "sha512-ZQPujoNiiUyTGl8zEGR/0yAygWnbMtX/NQ/S/EHVgq5nmYkvDEVuiVbgpPAmO9lzBTq0hvUTRRATZbTU2ISxgA==", + "cpu": [ + "x32", + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, "node_modules/got": { "version": "13.0.0", "resolved": "https://registry.npmjs.org/got/-/got-13.0.0.tgz", @@ -11854,7 +11883,7 @@ "node_modules/vinyl-sourcemaps-apply": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz", - "integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=", + "integrity": "sha512-+oDh3KYZBoZC8hfocrbrxbLUeaYtQK7J5WU5Br9VqWqmCll3tFJqKp97GC9GmMsVIL0qnx2DgEDVxdo5EZ5sSw==", "dev": true, "dependencies": { "source-map": "^0.5.1" From f8bd6bed53436d9affab0dbf504387deefca7f87 Mon Sep 17 00:00:00 2001 From: Christopher Allen Date: Thu, 28 Sep 2023 17:35:27 +0200 Subject: [PATCH 3/3] 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 06d78af6a403370ed933d75fbe523860c15b8aec 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. --- scripts/gulpfiles/build_tasks.js | 5 +++-- tests/scripts/check_metadata.sh | 16 ++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/scripts/gulpfiles/build_tasks.js b/scripts/gulpfiles/build_tasks.js index cc95fec7f..8775f6918 100644 --- a/scripts/gulpfiles/build_tasks.js +++ b/scripts/gulpfiles/build_tasks.js @@ -163,7 +163,8 @@ for (let i = 1; i < chunks.length; i++) { * as munged by Closure Compiler. */ function modulePath(chunk) { - return 'module$' + chunk.entry.replace(/\.js$/, '').replaceAll('/', '$'); + const entryPath = path.posix.join(TSC_OUTPUT_DIR_POSIX, chunk.entry); + return 'module$' + entryPath.replace(/\.js$/, '').replaceAll('/', '$'); } const licenseRegex = `\\/\\*\\* @@ -555,7 +556,7 @@ function buildCompiled() { }; // Fire up compilation pipline. - return gulp.src(chunkOptions.js, {base: TSC_OUTPUT_DIR_POSIX}) + return gulp.src(chunkOptions.js, {base: './'}) .pipe(stripApacheLicense()) .pipe(gulp.sourcemaps.init()) .pipe(compile(options)) diff --git a/tests/scripts/check_metadata.sh b/tests/scripts/check_metadata.sh index 72d8f6512..d9b7326f1 100755 --- a/tests/scripts/check_metadata.sh +++ b/tests/scripts/check_metadata.sh @@ -35,8 +35,8 @@ readonly RELEASE_DIR='dist' # Q4 2022 9.1.1 903357 # Q1 2023 9.2.1 909181 # Q2 2023 9.3.3 887618 -# Q3 2023 10.1.3 818138 -readonly BLOCKLY_SIZE_EXPECTED=818138 +# Q3 2023 10.1.3 898859 +readonly BLOCKLY_SIZE_EXPECTED=898859 # Size of blocks_compressed.js # Q2 2019 2.20190722.0 75618 @@ -57,8 +57,8 @@ readonly BLOCKLY_SIZE_EXPECTED=818138 # Q4 2022 9.1.1 102190 # Q1 2023 9.2.1 101114 # Q2 2023 9.3.3 91848 -# Q3 2023 10.1.3 84772 -readonly BLOCKS_SIZE_EXPECTED=84772 +# Q3 2023 10.1.3 90150 +readonly BLOCKS_SIZE_EXPECTED=90150 # Size of blockly_compressed.js.gz # Q2 2019 2.20190722.0 180925 @@ -80,8 +80,8 @@ readonly BLOCKS_SIZE_EXPECTED=84772 # Q4 2022 9.1.1 179306 # Q1 2023 9.2.1 179814 # Q2 2023 9.3.3 175206 -# Q3 2023 10.1.3 177241 -readonly BLOCKLY_GZ_SIZE_EXPECTED=177241 +# Q3 2023 10.1.3 180553 +readonly BLOCKLY_GZ_SIZE_EXPECTED=180553 # Size of blocks_compressed.js.gz # Q2 2019 2.20190722.0 14552 @@ -102,8 +102,8 @@ readonly BLOCKLY_GZ_SIZE_EXPECTED=177241 # Q4 2022 9.1.1 17182 # Q1 2023 9.2.1 17262 # Q2 2023 9.3.3 16736 -# Q3 2023 10.1.3 16299 -readonly BLOCKS_GZ_SIZE_EXPECTED=16299 +# Q3 2023 10.1.3 16508 +readonly BLOCKS_GZ_SIZE_EXPECTED=16508 # ANSI colors readonly BOLD_GREEN='\033[1;32m'