Merge branch 'develop' into feature/js-unit-tests

# Conflicts:
#	assets/src/media-selector/index.js

.gitignore

@@ -7,6 +7,7 @@ assets/css/*
 assets/js/*.js
 assets/js/*.asset.php
 assets/js/*.map
+assets/js/blocks/**/*.json
 bin/local-dev/mysql/
 bin/local-dev/wordpress/html/
 build/

.travis.yml

@@ -42,6 +42,7 @@ before_install:
 
 install:
   - npm install
+  - npm run build:js
   - export DEV_LIB_PATH=vendor/xwp/wp-dev-lib/scripts
   - export DIFF_HEAD=HEAD
   - source "$DEV_LIB_PATH/travis.install.sh"
@@ -81,7 +82,6 @@ jobs:
         - npm run env:start
         - npm run wp -- wp core install --title=WordPress --admin_user=admin --admin_password=password --admin_email=admin@example.com --skip-email --url=http://localhost:8088 --quiet
         - npm run wp -- wp plugin activate unsplash
-        - npm run build:js
         - npm run test:e2e:coveralls
       after_script:
         - echo "E2E tests complete"
@@ -93,7 +93,6 @@ jobs:
         - sudo service mysql stop
         - echo "Running JS unit tests with code coverage ..."
       script:
-        - npm run build:js
         - npm run test:js:coveralls
       after_script:
         - echo "JS unit tests complete"
@@ -130,7 +129,6 @@ jobs:
       php: "5.6"
       env: WP_VERSION=4.9 DEV_LIB_ONLY=phpunit
       script:
-        - npm run build:js
         - source "$DEV_LIB_PATH/travis.script.sh"
 
     - name: PHP unit tests (7.4, WordPress trunk)

assets/src/block-editor/blocks/image/block.json

@@ -0,0 +1,63 @@
+{
+  "name": "unsplash/image",
+  "category": "common",
+  "supports": {
+    "lightBlockWrapper": true,
+    "align": true
+  },
+  "attributes": {
+    "align": {
+      "type": "string"
+    },
+    "url": {
+      "type": "string",
+      "source": "attribute",
+      "selector": "img",
+      "attribute": "src"
+    },
+    "alt": {
+      "type": "string",
+      "default": ""
+    },
+    "caption": {
+      "type": "string"
+    },
+    "title": {
+      "type": "string"
+    },
+    "href": {
+      "type": "string"
+    },
+    "rel": {
+      "type": "string"
+    },
+    "linkClass": {
+      "type": "string"
+    },
+    "id": {
+      "type": "number"
+    },
+    "unsplashId": {
+      "type": "string"
+    },
+    "width": {
+      "type": "number"
+    },
+    "height": {
+      "type": "number"
+    },
+    "sizeSlug": {
+      "type": "string"
+    },
+    "linkDestination": {
+      "type": "string",
+      "default": "none"
+    },
+    "linkTarget": {
+      "type": "string",
+      "source": "attribute",
+      "selector": "figure > a",
+      "attribute": "target"
+    }
+  }
+}