Skip to content

chore: degulpify the package tasks #10323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maribethb wants to merge 9 commits into
base: main
Choose a base branch
from
Open

chore: degulpify the package tasks #10323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d45e2f5
chore: de-gulpify the package tasks
maribethb Aug 26, 2026
ad0dfbc
chore: remove unnecessary sanitization
maribethb Aug 26, 2026
e985f30
chore: format and fix package lock
maribethb Aug 27, 2026
0ea8014
chore: actually fix package lock
maribethb Aug 28, 2026
5c28b8e
Merge branch 'main' into gulp-package
maribethb Aug 28, 2026
e3633ed
chore: pass compiler flags on from script
maribethb Sep 3, 2026
a1b945d
chore: minor reorganization
maribethb Sep 8, 2026
d3c6e05
Merge branch 'main' into gulp-package
maribethb Sep 8, 2026
c1ae218
chore: remove now-unused typings script
maribethb Sep 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,8 @@ export default defineConfig(
'packages/blockly/.prettierrc.js',
'packages/blockly/gulpfile.mjs',
'packages/blockly/scripts/helpers.js',
'packages/blockly/scripts/lib/*.mjs',
'packages/blockly/scripts/package.mjs',
'packages/blockly/scripts/update_github_pages.mjs',
'packages/blockly/tests/mocha/.mocharc.js',
'packages/blockly/tests/migration/validate-renamings.mjs',
Expand Down
231 changes: 0 additions & 231 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 1 addition & 8 deletions packages/blockly/gulpfile.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,13 @@ import {
import {
build,
buildAdvancedCompilationTest,
cleanBuildDir,
langfiles,
messages,
minify,
tsc,
} from './scripts/gulpfiles/build_tasks.mjs';
import {
cleanReleaseDir,
pack,
typings,
} from './scripts/gulpfiles/package_tasks.mjs';
import {generators, test} from './scripts/gulpfiles/test_tasks.mjs';
import {cleanBuildDir, cleanReleaseDir} from './scripts/lib/fs_utils.mjs';

const clean = parallel(cleanBuildDir, cleanReleaseDir);

Expand All @@ -53,7 +48,6 @@ export {
tsc,
minify,
build,
pack, // Formerly package.
prepareDemos,
deployDemosBeta,
deployDemos,
Expand All @@ -69,5 +63,4 @@ export {
test,
generators as testGenerators,
buildAdvancedCompilationTest,
typings,
}
4 changes: 1 addition & 3 deletions packages/blockly/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
"lint:fix": "eslint . --fix",
"langfiles": "gulp langfiles",
"minify": "gulp minify",
"package": "gulp pack",
"package": "node scripts/package.mjs",
"prepareDemos": "gulp prepareDemos",
"start": "npm run package && nx run @blockly/dev-tools:build && node \"scripts/prepare_advanced_playground.mjs\" && concurrently -n devtools-watch,blockly-watch,server \"nx watch --projects=@blockly/dev-tools --includeDependencies -- nx run rebuildAdvancedPlayground\" \"nx watch --projects=blockly -- nx run rebuildBlockly\" \"http-server ./ -s -o /tests/playground.html -c-1\"",
"rebuildAdvancedPlayground": "npm run build --workspace=@blockly/dev-tools && node \"scripts/prepare_advanced_playground.mjs\"",
Expand Down Expand Up @@ -177,11 +177,9 @@
"glob": "^13.0.6",
"google-closure-compiler": "^20260819.0.0",
"gulp": "^5.0.1",
"gulp-concat": "^2.6.1",
"gulp-rename": "^2.1.0",
"gulp-replace": "^1.1.4",
"gulp-sourcemaps": "^3.0.0",
"gulp-umd": "^2.0.0",
"http-server": "^14.1.1",
"jsdom": "30.0.1",
"json5": "^2.2.3",
Expand Down
9 changes: 4 additions & 5 deletions packages/blockly/scripts/gulpfiles/appengine_tasks.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@
import * as gulp from 'gulp';

import * as fs from 'fs';
import * as path from 'path';
import {execSync} from 'child_process';
import * as buildTasks from './build_tasks.mjs';
import {getPackageJson} from './helper_tasks.mjs';
import * as packageTasks from './package_tasks.mjs';
import {getPackageJson} from '../lib/package_json.mjs';
import {cleanBuildDir, cleanReleaseDir} from '../lib/fs_utils.mjs';
import {rimraf} from 'rimraf';

const demoTmpDir = '../_deploy';
Expand Down Expand Up @@ -170,8 +169,8 @@ export const prepareDemos = gulp.series(
copyStaticSrc,
copyAppengineSrc),
gulp.series(
gulp.parallel(buildTasks.cleanBuildDir,
packageTasks.cleanReleaseDir),
gulp.parallel(cleanBuildDir,
cleanReleaseDir),
buildTasks.build,
gulp.parallel(copyBuilt,
copyCompressedToOldLocation,
Expand Down
Loading