Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion .github/workflows/deploy-docusaurus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
- name: Generate reference docs
working-directory: ./packages/blockly
run: |
npx gulp typings
npm run typings
npm run docs
- name: Build the Docusaurus site
Expand Down
2 changes: 2 additions & 0 deletions eslint.config.mjs
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
11,740 changes: 3,403 additions & 8,337 deletions package-lock.json

Large diffs are not rendered by default.

12 changes: 5 additions & 7 deletions packages/blockly/gulpfile.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,10 @@ import {
} from './scripts/gulpfiles/build_tasks.mjs';
import {docs} from './scripts/gulpfiles/docs_tasks.mjs';
import {
cleanReleaseDir,
pack,
typings,
} from './scripts/gulpfiles/package_tasks.mjs';
import {generators, test} from './scripts/gulpfiles/test_tasks.mjs';
generators,
test,
} from './scripts/gulpfiles/test_tasks.mjs';
import {cleanReleaseDir} from './scripts/lib/release_dir.mjs';

const clean = parallel(cleanBuildDir, cleanReleaseDir);

Expand All @@ -54,7 +53,6 @@ export {
tsc,
minify,
build,
pack, // Formerly package.
prepareDemos,
deployDemosBeta,
deployDemos,
Expand All @@ -66,10 +64,10 @@ export {
// prettier-ignore
export {
messages, // Generate msg/json/en.json et al.
cleanBuildDir,
clean,
test,
generators as testGenerators,
buildAdvancedCompilationTest,
docs,
typings,
}
5 changes: 2 additions & 3 deletions packages/blockly/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,11 @@
"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 && npx nx run @blockly/dev-tools:build && concurrently -n watch,devtools-server,core-server \"npx nx watch --projects=@blockly/dev-tools --includeDependencies -- npm run build\" \"npx nx run @blockly/dev-tools:start --no-open\" \"http-server ./ -p 8081 -s -o /tests/playground.html -c-1\"",
"tsc": "gulp tsc",
"typings": "node scripts/package.mjs typings",
"test": "gulp test",
"test:browser": "npx mocha --config tests/browser/.mocharc.js",
"test:mocha:node": "npx mocha --config tests/mocha/.mocharc.node.cjs \"tests/mocha/**/*_test.js\"",
Expand Down Expand Up @@ -149,11 +150,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
6 changes: 3 additions & 3 deletions packages/blockly/scripts/gulpfiles/appengine_tasks.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ 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 {cleanReleaseDir} from '../lib/release_dir.mjs';
import {rimraf} from 'rimraf';

const demoTmpDir = '../_deploy';
Expand Down Expand Up @@ -171,7 +171,7 @@ export const prepareDemos = gulp.series(
copyAppengineSrc),
gulp.series(
gulp.parallel(buildTasks.cleanBuildDir,
packageTasks.cleanReleaseDir),
cleanReleaseDir),
buildTasks.build,
gulp.parallel(copyBuilt,
copyCompressedToOldLocation,
Expand Down
2 changes: 1 addition & 1 deletion packages/blockly/scripts/gulpfiles/build_tasks.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ import {
TSC_OUTPUT_DIR,
TYPINGS_BUILD_DIR,
} from './config.mjs';
import {getPackageJson} from './helper_tasks.mjs';

import {posixPath, quote} from '../helpers.js';
import {getPackageJson} from '../lib/package_json.mjs';

const argv = yargs(hideBin(process.argv)).parse();

Expand Down
25 changes: 0 additions & 25 deletions packages/blockly/scripts/gulpfiles/helper_tasks.mjs

This file was deleted.

Loading
Loading