Commit Graph

5868 Commits

Author SHA1 Message Date
Christopher Allen
ffd0252947 Merge branch 'develop' into build-elsewhere
Fix conflict in package.json.
2021-07-09 14:13:23 +01:00
Christopher Allen
9e72378b69 Finish renaming BUILD_DIR; make tests more error-prone
I had forgotten that I needed to change the value of BUILD_DIR
in several different places.

Added comments warning future editors about this as well as filing
issue #5007 to track fixing this properly.

Despite being misconfigured and therefore failing, the typescript
and metadata test scripts were exiting with status 0, indicating
successful completion.  These have been fixed so they should fail
on any error, including misconfiguration.
2021-07-09 14:06:59 +01:00
Rachel Fenichel
f5e4022407 Merge pull request #4998 from rachel-fenichel/deploy_appengine_workflow
Initial commit for appengine deploy action
2021-07-08 19:11:37 -07:00
Rachel Fenichel
16a11e419a Update comments to be more descriptive 2021-07-08 19:05:56 -07:00
Aaron Dodson
b562242614 Merge pull request #5003 from gonfunko/owners
Added @google/blockly-eng as the owner of the entire repo
2021-07-08 14:34:14 -07:00
Aaron Dodson
fa95a3a332 Added @google/blockly-eng as the owner of the entire repo 2021-07-08 14:23:52 -07:00
Christopher Allen
1e4fa8005a Fix comment TODO formatting. 2021-07-08 17:29:26 +01:00
Christopher Allen
311b2c16d8 Rename BUILD_DIR to "build" (was "built")
Per discussion in PR #4968, the dirname "build" is widely used for
this purpose.
2021-07-08 16:55:15 +01:00
Christopher Allen
ec14cc3ed8 Package build output; fix node tests.
- Reconfigure package_tasks.js to use BUILD_DIR from config.js
  (i.e., build/) rather than repository root as source of files to
  package.

  - Add check to packageTasks.package to ensure that certain required
    files exist in BUILD_DIR, to verify that buildTasks.build and
    typings.typings have been run.

  - Fix packageUMDBundle to use generated, rather than checked-in
    version of en.js.

  - Fix packageDTS to use the generated (rather than checked-in)
    versions of blockly.d.ts and msg/*.d.ts.

- Modify run_all_tests.sh to run packageTasks.package before running
  node tests, since they depend on it.  Previously this was only
  working because 'npm install' runs the 'prepare' script, which would
  run the 'package' script - so the code being tested by the node tests
  was not the current source but whatever precomipled code had
  previously been checked in.

- Remove the 'prepare' script from package.json, since it is no longer
  needed (and is now broken, since it requires that build and typings
  have been done first.)  Note that no scripts at all are included in
  the version of package.json that is created in dist/ and subsequently
  included in the published npms, so this deletion does not affect what
  happens when the Blockly npm in installed - it only affects what
  happens when 'npm install' is run after the blockly repo is cloned.

- Factor out the actual recompilation steps from releaseTasks.recompile.

- Rename releaseTasks.recomple to recompileDevelop, since it deals
  specifically with the develop branch.  (The npm script name is
  unchanged.)

- Ensure that a full recompile and repackage is done before publishing
  (beta and non-beta) npms.
2021-07-08 16:34:50 +01:00
Aaron Dodson
3f55ca59ad Merge pull request #4969 from gonfunko/scrollin-safari
Work around WebKit bug that prevents scrolling/zooming the workspace.
2021-07-08 08:25:29 -07:00
translatewiki.net
fd93e312b1 Localisation updates from https://translatewiki.net. 2021-07-08 13:00:37 +02:00
Rachel Fenichel
23602bb177 Initial commit for appengine deploy action 2021-07-07 17:57:48 -07:00
Aaron Dodson
49a4fa7898 Merge pull request #4938 from gonfunko/flyout-zoom
Reflow flyouts when zoom level changes to keep block zoom level in sync.
2021-07-07 10:29:44 -07:00
Christopher Allen
e6929decde Also check in sourcemaps
The .js.map files generated by buildCompressed, buildBlocks etc. were
not being copied back by checkinBuilt.
2021-07-07 15:36:39 +01:00
translatewiki.net
0cb4fe1d3a Localisation updates from https://translatewiki.net. 2021-07-05 13:00:46 +02:00
Christopher Allen
c265eb87b5 Update metadata sizes for Q2 2021 release
Transcribed (with tweaks) from PR #4986.
2021-07-02 10:23:10 +01:00
Beka Westberg
ae840202ec Merge pull request #4981 from google/master
Merge master into develop. July 2021 Release
2021-07-01 09:05:52 -07:00
Beka Westberg
64188ae272 Merge pull request #4976 from google/rc_2021_7
Rc 2021 7
6.20210701.0
2021-07-01 08:57:19 -07:00
Beka Westberg
bff1c042fe Resolve conflicts? 2021-07-01 15:44:58 +00:00
Beka Westberg
c83ff6ca06 Bump README release date. 2021-07-01 15:20:16 +00:00
Beka Westberg
30d7f0914e Rebuild (#4975) 2021-07-01 08:17:08 -07:00
translatewiki.net
fbf03fb561 Localisation updates from https://translatewiki.net. 2021-07-01 13:40:00 +02:00
Maribeth Bottorff
d102cbfab4 Fix Jsdoc by removing trailing comma (#4974) 2021-06-30 16:45:02 -07:00
Aaron Dodson
c163a76807 Removed unused event argument. 2021-06-30 17:52:17 +00:00
Aaron Dodson
5aa8bab22f Work around WebKit bug that prevents scrolling/zooming the workspace. 2021-06-30 17:40:00 +00:00
Christopher Allen
5410ba6ab3 Do trivial gulp tasks in parallel where possible
N.B. can't run typings.typings and typings.msgTypings in parallel
yet because the latter depends on the existence of an output directory
created by the former.
2021-06-30 16:12:10 +01:00
Christopher Allen
37ecce8d80 Have npm run typings use built directory; fix typescript tests
* Modify scripts/gulpfiles/typings.js to write typings to BUILD_DIR.
* Modify tests/scripts/compile_typings.sh to check compilability of
  resulting output from BUILD_DIR.
* Rename checkin script to checkin:built, add a checkin:typings script
  to do the same for .d.ts files, and a new checkin script to do both.
* Have recompile run checkin:typings.
2021-06-30 15:34:54 +01:00
Neil Fraser
344ebcfd02 Revert "Group field edits together for undo/redo"
This reverts commit 33ad2448b8.
2021-06-29 11:35:21 -07:00
Neil Fraser
33ad2448b8 Group field edits together for undo/redo
Fixes #4189.
Also use 0 instead of 0px, in accordance with the rest of Blockly and Google’s CSS style guide.
2021-06-29 09:57:25 -07:00
Christopher Allen
1aa35ef438 Merge branch 'develop' into build-elsewhere 2021-06-29 16:22:13 +01:00
Rachel Fenichel
5412adf7e5 Merge pull request #4951 from rachel-fenichel/remove_build_py
Remove deprecated build.py script
2021-06-28 11:13:05 -07:00
Rachel Fenichel
5c48bfc188 Tweak comment 2021-06-28 11:09:01 -07:00
Aaron Dodson
627647c7f2 Reflow workspace- and toolbox-owned flyouts when workspace zoom changes. 2021-06-28 11:08:03 -07:00
Aaron Dodson
0d44d22629 Revert "Reflow flyouts when zoom level changes to keep block zoom level in sync."
This reverts commit 1f6c8f0206.
2021-06-28 10:48:36 -07:00
Neil Fraser
9ad50ea98a Fix escape key on all fields. (#4934)
Currently the escape key fails to revert the value.  This is the inherited root of all type-in fields, including number, angle, and note.

Fixes #4910
2021-06-27 23:51:46 -07:00
Rachel Fenichel
2fcdd846be Remove deprecated build.py script 2021-06-24 16:58:28 -07:00
dependabot[bot]
18a27a2613 Bump eslint from 7.28.0 to 7.29.0 (#4949)
Bumps [eslint](https://github.com/eslint/eslint) from 7.28.0 to 7.29.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.28.0...v7.29.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-24 13:23:28 -07:00
Christopher Allen
96da5ed014 Fix metadata tests
- Do not run npm install.
- Do not re-run build that has already been run by a previous test.
- Check files in built/ instead repo root.
- Fix formatting, styleguide issues.
2021-06-24 12:09:06 +01:00
Christopher Allen
daab45f678 Fix eslint tests
Don't try to lint built/.
2021-06-24 12:00:37 +01:00
dependabot[bot]
0263f88ef3 Bump google-closure-deps from 20210406.0.0 to 20210601.0.0 (#4947)
Bumps [google-closure-deps](https://github.com/google/closure-library) from 20210406.0.0 to 20210601.0.0.
- [Release notes](https://github.com/google/closure-library/releases)
- [Commits](https://github.com/google/closure-library/compare/v20210406...v20210601)

---
updated-dependencies:
- dependency-name: google-closure-deps
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-23 16:12:35 -07:00
dependabot[bot]
5b9715c220 Bump selenium-standalone from 6.23.0 to 7.1.0 (#4946)
Bumps [selenium-standalone](https://github.com/vvo/selenium-standalone) from 6.23.0 to 7.1.0.
- [Release notes](https://github.com/vvo/selenium-standalone/releases)
- [Changelog](https://github.com/vvo/selenium-standalone/blob/master/HISTORY.md)
- [Commits](https://github.com/vvo/selenium-standalone/compare/v6.23.0...v7.1.0)

---
updated-dependencies:
- dependency-name: selenium-standalone
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-23 16:11:08 -07:00
dependabot[bot]
d74482b289 Bump @blockly/block-test from 1.0.14 to 1.1.0 (#4869)
Bumps [@blockly/block-test](https://github.com/google/blockly-samples/tree/HEAD/plugins/block-test) from 1.0.14 to 1.1.0.
- [Release notes](https://github.com/google/blockly-samples/releases)
- [Commits](https://github.com/google/blockly-samples/commits/@blockly/block-test@1.1.0/plugins/block-test)

---
updated-dependencies:
- dependency-name: "@blockly/block-test"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-23 08:30:23 -07:00
Christopher Allen
c521fa9bfa Fix release process
The documented release process is to do npm run recompile, merge the
resulting branch to develop, and then do npm run relase, which does
not do another build.

This process should probably be changed, but for the moment ensure
that npm run recompile (as well as npm run package:beta) runs
buildTasks.checkinBuilt after each .build to preserve the old procedure.
2021-06-23 13:11:29 +01:00
Christopher Allen
e8eb30fa8b Script to clean release directory
You can now do npm run clean:buildDir, ... clean:releaseDir, or just
... clean, which does both.

The release directory is automatically cleaned before packaging
commences.
2021-06-23 13:07:20 +01:00
dependabot[bot]
56f1c4f36d Bump @blockly/theme-modern from 2.1.17 to 2.1.18 (#4944)
Bumps [@blockly/theme-modern](https://github.com/google/blockly-samples/tree/HEAD/plugins/theme-modern) from 2.1.17 to 2.1.18.
- [Release notes](https://github.com/google/blockly-samples/releases)
- [Commits](https://github.com/google/blockly-samples/commits/@blockly/theme-modern@2.1.18/plugins/theme-modern)

---
updated-dependencies:
- dependency-name: "@blockly/theme-modern"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-22 16:17:57 -07:00
dependabot[bot]
b9fec34a85 Bump @blockly/dev-tools from 2.3.0 to 2.4.0 (#4936)
Bumps [@blockly/dev-tools](https://github.com/google/blockly-samples/tree/HEAD/plugins/dev-tools) from 2.3.0 to 2.4.0.
- [Release notes](https://github.com/google/blockly-samples/releases)
- [Commits](https://github.com/google/blockly-samples/commits/@blockly/dev-tools@2.4.0/plugins/dev-tools)

---
updated-dependencies:
- dependency-name: "@blockly/dev-tools"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-22 10:31:27 -07:00
Christopher Allen
961319b3eb Script to clean build directory 2021-06-22 18:10:02 +01:00
Christopher Allen
e2c4a9b7f9 Script to copy built files from BUILD_DIR to repository
This is to allow built files to be checked in.
2021-06-22 18:08:23 +01:00
Christopher Allen
25f073d0e3 Build msg/js/*.js langfiles in BUILD_DIR 2021-06-22 12:04:30 +01:00
Christopher Allen
a03cd29b68 Separate script to rebuild msg/json/en.json, qqq.json etc.
There are some files in msg/json/ (currently en.json, qqq.json,
constants.json and synonyms.json) that are generated by
scripts/i18n/js_to_json.py as part of the language file build process
- but this only needs to be done when messages.js is updated and
and usually requires some manual cleanup, so remove this step from the
existing buildLangfiles gulp script and create a separate command
('npm run generate:langfiles') to do this when required.
2021-06-22 10:59:24 +01:00