Merge pull request #338 from smalruby/294-mbit-more-v2

Microbit More V2

Author: takaokouji

.circleci/config.yml

@@ -167,7 +167,7 @@ jobs:
           path: dist
   integration:
     <<: *defaults
-    parallelism: 1
+    parallelism: 2
     environment:
       JEST_JUNIT_OUTPUT_NAME: results.txt
     steps:
@@ -201,6 +201,19 @@ jobs:
       - run: npm run deploy -- -x -r https://${GH_TOKEN}@github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME.git
       - run: npm run deploy:smalruby.app -- -x -r https://${GH_TOKEN}@github.com/$CIRCLE_PROJECT_USERNAME/smalruby.app.git
 
+  deploy-gh-pages-branch:
+    <<: *defaults
+    steps:
+      - *restore_git_cache
+      - checkout
+      - *restore_npm_cache
+      - *restore_build_cache
+      - run: |
+          git config --global user.email $(git log --pretty=format:"%ae" -n1)
+          git config --global user.name $(git log --pretty=format:"%an" -n1)
+      - run: npm run deploy -- -x -r https://${GH_TOKEN}@github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME.git -e $CIRCLE_BRANCH
+      - run: npm run deploy:smalruby.app -- -x -r https://${GH_TOKEN}@github.com/$CIRCLE_PROJECT_USERNAME/smalruby.app.git -e $CIRCLE_BRANCH
+
 workflows:
   version: 2
   commitlint:
@@ -236,7 +249,6 @@ workflows:
               only:
                 - master
                 - develop
-                - beta
                 - /^hotfix\/.*/
       - lint:
           context:
@@ -268,7 +280,6 @@ workflows:
               only:
                 - master
                 - develop
-                - beta
                 - /^hotfix\/.*/
       - store_dist:
           context:
@@ -280,7 +291,6 @@ workflows:
               only:
                 - master
                 - develop
-                - beta
                 - /^hotfix\/.*/
       - deploy-gh-pages:
           context:
@@ -290,6 +300,53 @@ workflows:
             - unit
             - integration
             - build
+          filters:
+            branches:
+              ignore:
+                - beta
+                - /^dependabot/.*/
+                - /^renovate/.*/
+                - /^pull/.*/ # don't deploy to  gh pages on PRs.
+  build-deploy-beta:
+    jobs:
+      - setup:
+          context:
+            - dockerhub-credentials
+          filters:
+            branches:
+              only:
+                - beta
+                - /^v[0-9]+\.[0-9]+\.[0-9]+$/
+      - build:
+          context:
+            - dockerhub-credentials
+          requires:
+            - setup
+      - store_build:
+          context:
+            - dockerhub-credentials
+          requires:
+            - build
+          filters:
+            branches:
+              only:
+                - beta
+                - /^v[0-9]+\.[0-9]+\.[0-9]+$/
+      - store_dist:
+          context:
+            - dockerhub-credentials
+          requires:
+            - build
+          filters:
+            branches:
+              only:
+                - beta
+                - /^v[0-9]+\.[0-9]+\.[0-9]+$/
+      - deploy-gh-pages-branch:
+          context:
+            - dockerhub-credentials
+          requires:
+            - build
           filters:
             branches:
               ignore:

LEGAL

@@ -54,10 +54,14 @@ opal/opal-parser.min.js
   These files are licensed under the MIT License
   (see https://github.com/opal/opal/blob/master/LICENSE ).
 
-src/lib/libraries/extensions/microbit_more/microbitMore.png
-src/lib/libraries/extensions/microbit_more/microbitMore-illustration.svg
-src/lib/libraries/extensions/microbit_more/microbitMore-small.svg
+src/lib/libraries/extensions/microbitMore/connection-icon.svg
+src/lib/libraries/extensions/microbitMore/connection-small-icon.svg
+src/lib/libraries/extensions/microbitMore/entry-icon.png
+src/lib/libraries/extensions/microbitMore/index.jsx
+src/lib/libraries/extensions/microbitMore/inset-icon.svg
+src/lib/libraries/extensions/microbitMore/mbit-more-v2-board.afdesign
+src/lib/libraries/extensions/microbitMore/mbit-more-v2-entry-icon.afdesign
+src/lib/libraries/extensions/microbitMore/translations.json
 
   These files are licensed under the MIT License
-  (see https://github.com/yokobond/scratch-microbit-more/blob/master/LICENSE ).
-
+  (see https://github.com/microbit-more/mbit-more-v2/blob/master/LICENSE ).

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "smalruby3-gui",
-  "version": "1.0.2",
+  "version": "2.0.0",
   "description": "GraphicaL User Interface for creating and running Smalruby 3.0 projects",
   "author": "Ruby Programming Shounendan",
   "license": "BSD-3-Clause",

package.json

@@ -25,6 +25,17 @@ const messages = defineMessages({
 class ExtensionLibrary extends React.PureComponent {
     constructor (props) {
         super(props);
+        extensionLibraryContent.forEach(extension => {
+            if (extension.setFormatMessage) {
+                extension.setFormatMessage(this.props.intl.formatMessage);
+            }
+            if (extension.translationMap) {
+                Object.assign(
+                    this.props.intl.messages,
+                    extension.translationMap[this.props.intl.locale]
+                );
+            }
+        });
         bindAll(this, [
             'handleItemSelect'
         ]);

src/containers/extension-library.jsx

@@ -582,8 +582,9 @@ class Generator {
         return this.getField(block, name).id;
     }
 
-    getFieldValue (block, name) {
-        return this.getField(block, name).value;
+    getFieldValue (block, name, defaultValue = null) {
+        const field = this.getField(block, name);
+        return field ? field.value : defaultValue;
     }
 
     isConnectedValue (block) {

src/lib/generator.js

@@ -400,7 +400,7 @@ const extensions = [
 ];
 
 // Injected for extra extensions
-import microbitMore from './microbitMore/entry.jsx';
+import microbitMore from './microbitMore/index.jsx';
 extensions.push(microbitMore);
 
 export default extensions;