Merge pull request #215 from Catrobat/develop

Release 1.1.0

.eslintignore

@@ -1,2 +1,4 @@
-babel.config.js
-webpack.config.js
+**/*config.js
+dist/
+release/
+tools/

.eslintrc

@@ -27,15 +27,27 @@
       "warn"
     ],
     "indent": [
+      "warn",
+      2,
+      { "SwitchCase": 1 }
+    ],
+    "curly": [
       "error",
-      2
+      "all"
+    ],
+    "no-multi-spaces": [
+      "error"
+    ],
+    "no-multi-assign": [
+      "error"
     ],
     "no-mixed-spaces-and-tabs": [
       "error"
     ]
   },
   "globals": {
-    "process": false
+    "process": false,
+    "$": true
   },
   "plugins": ["jest"]
 }

.github/workflows/interval_catroid_check_action.yaml

@@ -0,0 +1,19 @@
+name: Interval Action for brick support and language update check
+
+on:
+    schedule:
+        - cron: '0 7 * * 1' # Mondays 7AM UTC
+        - cron: '0 7 * * 4' # Thursdays 7AM UTC
+
+jobs:
+    runDocker:
+        if: github.repository == 'Catrobat/Catblocks'
+        name: checkout repo and check supported bricks and language updates
+        runs-on: ubuntu-latest
+        steps:
+            - name: checkout repo
+              uses: actions/checkout@v2
+            - name: run checker for brick support and language updates
+              uses: ./github_actions/catroid-support-checker-action/
+              with:
+                slack_webhook: ${{ secrets.SLACK_WEBHOOK_URL }}

.github/workflows/interval_dependabot_action.yaml

@@ -0,0 +1,26 @@
+name: Interval Action checking for Blockly updates
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  updatePackages:
+    if: github.repository == 'Catrobat/Catblocks'
+    name: Update
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: set remote url
+        run: git remote set-url --push origin https://$GITHUB_ACTOR:${{ secrets.PAT }}@github.com/$GITHUB_REPOSITORY
+      - name: update packages
+        uses: taichi/actions-package-update@master
+        env:
+          AUTHOR_EMAIL: [email protected]
+          AUTHOR_NAME: catrobat-github-bot
+          COMMIT_MESSAGE: BLOCKS-MAINTENANCE update blockly version
+          EXECUTE: "true"
+          GITHUB_TOKEN: ${{ secrets.PAT }}
+          UPDATE_COMMAND: yarn
+        with:
+          args: upgrade blockly --latest

.github/workflows/merge_actions.yaml → .github/workflows/merge_actions_develop.yaml

@@ -1,19 +1,21 @@
-name: Merge Action
+name: Merge Action develop
 
 on:
   push:
     branches: [ develop ] # merge creates commit + push
 
 jobs:
   deployTestingpage:
+    if: github.repository == 'Catrobat/Catblocks'
     name: Deploy Testpage to GH-Pages
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - name: Build Project and push to gh-pages
-      uses: ./gh-pages-deploy-action/
+      uses: ./github_actions/gh-pages-deploy-action/
 
   rerunTests:
+    if: github.repository == 'Catrobat/Catblocks'
     name: Restart all Pull Request Tests
     runs-on: ubuntu-latest
     steps:

.github/workflows/merge_actions_master.yaml

@@ -0,0 +1,17 @@
+name: Merge Action Master
+
+on:
+  push:
+    branches: [ master ] # merge creates commit + push
+
+jobs:
+  deployToShare:
+    if: github.repository == 'Catrobat/Catblocks'
+    name: Deploy Catblocks to Share
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Create Pull Request with Release of Catblocks to Share
+        uses: ./github_actions/gh-deploy-new-develop-on-webtest/
+        with:
+          github-token: ${{ secrets.PAT }}

.github/workflows/pull_request_actions.yml

@@ -8,13 +8,14 @@ on:
 
 jobs:
   runTests:
+    if: github.repository == 'Catrobat/Catblocks'
     name: Run Auto-Tests
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
       - name: Run jest test action
-        uses: ./jest-testing-action/       
+        uses: ./github_actions/jest-testing-action/
       - name: Prepare test report
         if: always()
         run: cd /home/runner/work/Catblocks/Catblocks && mkdir -p ./catblocksTestReport/ && cp ./jest_html_reporters.html ./catblocksTestReport/rep_${GITHUB_SHA}.html
@@ -26,6 +27,7 @@ jobs:
           path: /home/runner/work/Catblocks/Catblocks/catblocksTestReport/
 
   uploadDocker:
+    if: github.repository == 'Catrobat/Catblocks'
     name: Create new artifact for PO review
     runs-on: ubuntu-latest
     steps:
@@ -38,3 +40,18 @@ jobs:
         with:
           name: DockerCatblocks
           path: ./docker/po-review/
+
+
+  lintCode:
+    if: github.repository == 'Catrobat/Catblocks'
+    name: Lint Code
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: borales/[email protected]
+        with:
+          cmd: install
+      - uses: borales/[email protected]
+        with:
+          cmd: lint
+

.gitignore

@@ -3,7 +3,6 @@ dist/
 node_modules/
 *.log
 i18n/json
-\.vscode/
 ./jenkins/testresults/*
 jest_html_reporters.html
 release/

.prettierignore

@@ -0,0 +1,4 @@
+**/*config.js
+dist/
+release/
+tools/

.prettierrc

@@ -0,0 +1,7 @@
+{
+    "printWidth": 120,
+    "useTabs": false,
+    "singleQuote": true,
+    "arrowParens": "avoid",
+    "trailingComma": "none"
+}

.vscode/launch.json

@@ -0,0 +1,45 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "chrome",
+            "request": "launch",
+            "name": "Launch Chrome (http://localhost:8080)",
+            "url": "http://localhost:8080",
+            "webRoot": "${workspaceFolder}",
+            "sourceMapPathOverrides": {
+                "webpack://CatBlocks/./*": "${workspaceFolder}/*"
+            }
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Debug Jest Tests",
+            "program": "${workspaceRoot}/node_modules/jest/bin/jest.js",
+            "env": {
+                "CI": "true"
+            },
+            "args": [
+                "-c",
+                "./test/jest_debug_config.js",
+                "--verbose",
+                "-i",
+                "--no-cache",
+                "--runInBand"
+            ],
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "neverOpen"
+        },
+        {
+            "type": "chrome",
+            "request": "launch",
+            "name": "Launch Chromium Ubuntu (http://localhost:8080)",
+            "url": "http://localhost:8080",
+            "webRoot": "${workspaceFolder}",
+            "runtimeExecutable": "/snap/bin/chromium"
+        }
+    ]
+}