Modules feature update 6.20210701.1

.clang-format

@@ -0,0 +1,3 @@
+Language:        JavaScript
+BasedOnStyle:    Google
+ColumnLimit:     80

.eslintrc.json

@@ -2,9 +2,9 @@
     "rules": {
         "curly": ["error"],
         "eol-last": ["error"],
-        "_comment": "Blockly/Google use 2-space indents",
-        "_comment": "Blockly/Google uses +4 space indents for line continuations.",
-        "_comment": "Ignore default rules for ternary expressions.",
+        // Blockly/Google use 2-space indents.
+        // Blockly/Google uses +4 space indents for line continuations.
+        // Ignore default rules for ternary expressions.
         "indent": [
             "error", 2,
             {
@@ -42,26 +42,26 @@
             "error",
             {
                 "args": "after-used",
-                "_comment": "Ignore vars starting with an underscore.",
+                // Ignore vars starting with an underscore.
                 "varsIgnorePattern": "^_",
-                "_comment": "Ignore arguments starting with an underscore.",
+                // Ignore arguments starting with an underscore.
                 "argsIgnorePattern": "^_"
             }
         ],
         "no-use-before-define": ["error"],
-        "_comment":"Blockly uses for exporting symbols. no-self-assign added in eslint 5.",
+        // Blockly uses for exporting symbols. no-self-assign added in eslint 5.
         "no-self-assign": ["off"],
-        "_comment": "Blockly uses single quotes except for JSON blobs, which must use double quotes.",
+        // Blockly uses single quotes except for JSON blobs, which must use double quotes.
         "quotes": ["off"],
         "semi": ["error", "always"],
-        "_comment": "Blockly doesn't have space before function paren when defining functions",
+        // Blockly doesn't have space before function paren when defining functions.
         "space-before-function-paren": ["error", "never"],
-        "_comment": "Blocklydoesn't have space before function paren when calling functions",
+        // Blockly doesn't have space before function paren when calling functions.
         "func-call-spacing": ["error", "never"],
         "space-infix-ops": ["error"],
-        "_comment": "Blockly uses 'use strict' in files",
+        // Blockly uses 'use strict' in files.
         "strict": ["off"],
-        "_comment": "Closure style allows redeclarations",
+        // Closure style allows redeclarations.
         "no-redeclare": ["off"],
         "valid-jsdoc": ["error", {"requireReturn": false}],
         "no-console": ["off"],
@@ -72,8 +72,7 @@
                 "balanced": true
             },
             "exceptions": ["*"]
-        }],
-        "es5/no-es6-methods": ["warn"]
+        }]
     },
     "env": {
         "browser": true
@@ -83,7 +82,6 @@
         "goog": true
     },
     "extends": [
-        "eslint:recommended",
-        "plugin:es5/no-es2015"
+        "eslint:recommended"
     ]
 }

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,7 @@
+contact_links:
+  - name: Blockly Forum
+    url: https://groups.google.com/forum/#!forum/blockly
+    about: The Blockly developer forum, where you can ask and answer questions.
+  - name: Plugins and examples
+    url: https://github.com/google/blockly-samples/issues/new/choose
+    about: File bugs or feature requests about plugins and samples in our blockly-samples repository.

.github/PULL_REQUEST_TEMPLATE.md

@@ -20,6 +20,14 @@
 
 <!-- TODO: Describe what this Pull Request does.  Include screenshots if applicable. -->
 
+#### Behavior Before Change
+
+<!--TODO: Image, gif or explanation of behavior before this pull request. -->
+
+#### Behavior After Change
+
+<!--TODO: Image, gif or explanation of behavior after this pull request. -->
+
 ### Reason for Changes
 
 <!--TODO: Explain why these changes should be made.  Include screenshots if applicable. -->
@@ -31,7 +39,7 @@
   -        uncomment the systems in the list below.
   -->
 
-Tested on:
+<!-- Tested on: -->
 <!-- * Desktop Chrome -->
 <!-- * Desktop Firefox -->
 <!-- * Desktop Safari -->

.github/PULL_REQUEST_TEMPLATE/goog_module.md

@@ -0,0 +1,24 @@
+<!-- Suggested PR title: Migrate PATH/TO/FILE.js to goog.module syntax -->
+
+## The basics
+
+- [ ] I branched from `goog_module`
+- [ ] My pull request is against `goog_module`
+- [ ] My code follows the [style guide](
+      https://developers.google.com/blockly/guides/modify/web/style-guide)
+- [ ] My code is presented in the form suggested in the [module
+      conversion guide](https://github.com/google/blockly/issues/5026)
+- [ ] I have run `npm test`.
+
+## The details
+### Resolves
+
+Part of #5026
+
+### Proposed Changes
+
+Converts `PATH/TO/FILE.js` to `goog.module` with ES6 `const`/`let`.
+
+### Additional Information
+
+<!-- Anything else we should know? -->

.github/dependabot.yml

@@ -0,0 +1,18 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "npm" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    target-branch: "develop"
+    schedule:
+      interval: "weekly"
+    ignore:
+      - dependency-name: "jsdom"
+        # For jsdom, ignore all updates for version 16.
+        # We should test that this does not cause issue 
+        # google/blockly-samples#665 when version 17 is released.
+        versions: "16.x"

.github/workflows/appengine_deploy.yml

@@ -0,0 +1,54 @@
+# Workflow that prepares files and deploys to appengine
+
+name: Deploy to App Engine
+
+# Controls when the workflow will run
+on:
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  prepare:
+    name: Prepare
+    runs-on: ubuntu-latest
+
+    steps:
+      # Checks-out the repository under $GITHUB_WORKSPACE.
+      # When running manually this checks out the master branch.
+      - uses: actions/checkout@v2
+
+      - name: Prepare demo files
+        # Install all dependencies, then copy all the files needed for demos.
+        run: |
+          npm install
+          npm run prepareDemos
+
+      - name: Upload
+        uses: actions/upload-artifact@v2
+        with:
+          name: appengine_files
+          path: _deploy/
+
+  deploy:
+    name: Deploy
+    runs-on: ubuntu-latest
+    # The prepare step must succeed for this step to run.
+    needs: prepare
+    steps:
+      - name: Download prepared files
+        uses: actions/download-artifact@v2
+        with:
+          name: appengine_files
+          path: _deploy/
+
+      - name: Deploy to App Engine
+        uses: google-github-actions/deploy-appengine@v0.2.0
+        # For parameters see:
+        # https://github.com/google-github-actions/deploy-appengine#inputs
+        with:
+          working_directory: _deploy/
+          deliverables: app.yaml
+          project_id: ${{ secrets.GCP_PROJECT }}
+          credentials: ${{ secrets.GCP_SA_KEY }}
+          promote: false
+          version: vtest

.github/workflows/build.yml

@@ -0,0 +1,43 @@
+# This workflow will do a clean install, start the selenium server, and run
+# all of our tests.
+
+name: Node.js CI
+
+on: [pull_request]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        # TODO (#2114): re-enable osx build.
+        # os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest]
+        node-version: [10.x, 12.x, 14.x, 16.x]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+
+    - name: Npm Install
+      run: npm install
+
+    - name: Linux Test Setup
+      if: runner.os == 'Linux'
+      run: source ./tests/scripts/setup_linux_env.sh
+
+    - name: MacOS Test Setup
+      if: runner.os == 'macOS'
+      run: source ./tests/scripts/setup_osx_env.sh
+
+    - name: Run
+      run: npm run test
+
+      env:
+        CI: true

.gitignore

@@ -4,12 +4,14 @@ build-debug.log
 .DS_Store
 .settings
 .project
+.idea
 *.gz
 *.pyc
 *.komodoproject
 /nbproject/private/
 
 tests/compile/main_compressed.js
+tests/compile/main_compressed.js.map
 tests/compile/*compiler*.jar
 tests/screenshot/outputs/*
 local_build/*compiler*.jar

README.md

@@ -1,60 +1,41 @@
-# Blockly [![Build Status]( https://travis-ci.org/google/blockly.svg?branch=master)](https://travis-ci.org/google/blockly)
+# Varwin Blockly
 
+Это форк Google Blockly с доработками для Varwin. Основная фича: "Модули", которая сильно затрагивает core.
 
-Google's Blockly is a web-based, visual programming editor.  Users can drag
-blocks together to build programs.  All code is free and open source.
+# Алгорит обновления репозитория
 
-**The project page is https://developers.google.com/blockly/**
+1. Подтягиваем изменения из google/blockly. (Github сам предложит это сделать, если обнаружит новые коммиты в master google/blockly)
+2. Если есть конфликты, будет создан PR для мерджа
+3. Переходим на ветку слияния и решаем все конфликты
+4. Выполняем npm run build
+5. Запускаем локальный playground, которые лежит в tests/playground.html
+6. Если обнаруживаются ошибки, то переходим к пункту 3 и решаем возникшие проблемы. Обратите внимание на раздел с частыми проблемами ниже
+7. Выполняем npm run prepare
+8. Переходим в директорию dist
+9. Выполняем npm publish
 
-![](https://developers.google.com/blockly/images/sample.png)
+# Как удобно тестить Varwin Blockly сразу в RMS
 
-Blockly has an active [developer forum](https://groups.google.com/forum/#!forum/blockly).  Please drop by and say hello. Show us your prototypes early; collectively we have a lot of experience and can offer hints which will save you time. We actively monitor the forums and typically respond to questions within 2 working days.
+Можно вызывать gulp package с аргументом --output "path" где path это путь до папки blockly в node_modules RMS.  
+Учитывайте, что путь должен быть относительно корня репозитория Varwin Blockly
 
-Help us focus our development efforts by telling us [what you are doing with
-Blockly](https://developers.google.com/blockly/registration).  The questionnaire only takes
-a few minutes and will help us better support the Blockly community.
+Т.е.
+1. Что-то исправляем в Varwin Blockly
+2. Вызываем npm run build
+3. Вызываем gulp package --output "~/node_modules/blockly/"
+4. Запускаем сборку RMS (или hot reload сам подтянет node_modules)
+5. Дебажим
 
-Cross-browser Testing Platform and Open Source <3 Provided by [Sauce Labs](https://saucelabs.com)
+# Частые проблемы
 
-We support IE11 and test it using [BrowserStack](https://browserstack.com)
+### Playground не может найти файлы
 
-Want to contribute? Great! First, read [our guidelines for contributors](https://developers.google.com/blockly/guides/modify/contributing).
+Идем в файл /blockly_uncompresed.js и исправляем пути до файлов.
 
-## Releases
+### Build падает с ошибкой "No supported platform for closure-compiler found"
 
-The next major release will be **June 26th, 2020**.
+Можно попробовать установить не поддерживаемый пакет google-closure-compiler-js.  
+Затем залезть в node_modules/google-closure-compiler/lib/utils.js и в методе getFirstSupportedPlatform всегда возвращать  
+"google-closure-compiler-js".
 
-We release by pushing the latest code to the master branch, followed by updating our [docs](https://developers.google.com/blockly) and [demo pages](https://blockly-demo.appspot.com). We typically release a new version of Blockly once a quarter (every 3 months). If there are breaking bugs, such as a crash when performing a standard action or a rendering issue that makes Blockly unusable, we will cherry-pick fixes to master between releases to fix them. The [releases page](https://github.com/google/blockly/releases) has a list of all releases.
-
-Releases are tagged by the release date (YYYYMMDD) with a leading '2.' and a trailing '.0' in case we ever need a major or minor version (such as [2.20190722.1](https://github.com/google/blockly/tree/2.20190722.1)). If you're using npm, you can install the ``blockly`` package on npm: 
-```bash
-npm install blockly
-```
-
-### New APIs
-
-Once a new API is merged into master it is considered beta until the following release. We generally try to avoid changing an API after it has been merged to master, but sometimes we need to make changes after seeing how an API is used. If an API has been around for at least two releases we'll do our best to avoid breaking it.
-
-Unreleased APIs may change radically. Anything that is in `develop` but not `master` is subject to change without warning.
-
-### Branches
-
-There are two main branches for Blockly.
-
-**[master](https://github.com/google/blockly)** - This is the (mostly) stable current release of Blockly.
-
-**[develop](https://github.com/google/blockly/tree/develop)** - This is where most of our work happens. Pull requests should always be made against develop. This branch will generally be usable, but may be less stable than the master branch. Once something is in develop we expect it to merge to master in the next release.
-
-**other branches:** - Larger changes may have their own branches until they are good enough for people to try out. These will be developed separately until we think they are almost ready for release. These branches typically get merged into develop immediately after a release to allow extra time for testing.
-
-## Issues and Milestones
-
-We typically triage all bugs within 2 working days, which includes adding any appropriate labels and assigning it to a milestone. Please keep in mind, we are a small team so even feature requests that everyone agrees on may not be prioritized.
-
-### Milestones
-
-**Upcoming release** - The upcoming release milestone is for all bugs we plan on fixing before the next release. This typically has the form of `year_quarter_release` (such as `2019_q2_release`). Some bugs will be added to this release when they are triaged, others may be added closer to a release.
-
-**Bug Bash Backlog** - These are bugs that we're still prioritizing. They haven't been added to a specific release yet, but we'll consider them for each release depending on relative priority and available time.
-
-**Icebox** - These are bugs that we do not intend to spend time on. They are either too much work or minor enough that we don't expect them to ever take priority. We are still happy to accept pull requests for these bugs.
+Так пакет будет собираться средствами node.js, но это медленнее, зато работает. Пока что.