Skip to content

Commit

Permalink
Merge pull request #25 from wordpress-mobile/feature/update-from-gb-m…
Browse files Browse the repository at this point in the history
…aster

Update from GB master
  • Loading branch information
maxme authored Mar 30, 2018
2 parents 8c13d6e + 89bedf6 commit 2a6b6f3
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 1 deletion.
2 changes: 2 additions & 0 deletions App.test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
/** @format */

import './globals';

import React from 'react';
import renderer from 'react-test-renderer';

Expand Down
7 changes: 7 additions & 0 deletions globals.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/** @format */

import * as element from '@gutenberg/element';

global.wp = {
element, // load the element creation function, needed by Gutenberg-web
};
2 changes: 1 addition & 1 deletion gutenberg
Submodule gutenberg updated 317 files
1 change: 1 addition & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ if ( process.env.TEST_RN_PLATFORM ) {
module.exports = {
preset: 'jest-react-native',
testEnvironment: 'jsdom',
testPathIgnorePatterns: [ '/node_modules/', '/gutenberg/' ],
moduleNameMapper: {
'@wordpress/hooks': '<rootDir>/wordpress/hooks',
'@wordpress/i18n': '<rootDir>/gutenberg/i18n',
Expand Down
4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@
"private": true,
"devDependencies": {
"@wordpress/babel-preset-default": "^1.1.2",
"babel-plugin-transform-async-generator-functions": "^6.24.1",
"babel-preset-react-native-stage-0": "^1.0.1",
"cross-env": "^5.1.4",
"flow-bin": "0.56.0",
"jest": "^22.4.3",
"jest-react-native": "^18.0.0",
"prettier": "git+https://github.com/Automattic/calypso-prettier.git#calypso-1.9",
"react-dom": "^16.2.0",
"react-test-renderer": "16.2.0",
"remote-redux-devtools": "^0.5.12"
},
Expand All @@ -18,6 +20,7 @@
"android": "react-native run-android",
"ios": "react-native run-ios",
"test": "cross-env NODE_ENV=test node node_modules/jest/bin/jest.js --verbose --config jest.config.js",
"test-debug": "cross-env NODE_ENV=test node --inspect-brk node_modules/jest/bin/jest.js --runInBand --verbose --config jest.config.js",
"flow": "flow",
"prettier": "prettier --write *.js *block-management/*.js",
"prettier-check": "prettier -l *.js *block-management/*.js"
Expand All @@ -26,6 +29,7 @@
"babel-plugin-module-resolver": "^3.1.0",
"classnames": "^2.2.5",
"jed": "^1.1.1",
"memize": "^1.0.5",
"react": "16.2.0",
"react-native": "0.52.0",
"react-redux": "^5.0.7",
Expand Down
25 changes: 25 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -533,6 +533,10 @@ babel-plugin-syntax-async-functions@^6.5.0, babel-plugin-syntax-async-functions@
version "6.13.0"
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"

babel-plugin-syntax-async-generators@^6.5.0:
version "6.13.0"
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz#6bc963ebb16eccbae6b92b596eb7f35c342a8b9a"

babel-plugin-syntax-class-constructor-call@^6.18.0:
version "6.18.0"
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-constructor-call/-/babel-plugin-syntax-class-constructor-call-6.18.0.tgz#9cb9d39fe43c8600bec8146456ddcbd4e1a76416"
Expand Down Expand Up @@ -581,6 +585,14 @@ babel-plugin-syntax-trailing-function-commas@^6.20.0, babel-plugin-syntax-traili
version "6.22.0"
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"

babel-plugin-transform-async-generator-functions@^6.24.1:
version "6.24.1"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz#f058900145fd3e9907a6ddf28da59f215258a5db"
dependencies:
babel-helper-remap-async-to-generator "^6.24.1"
babel-plugin-syntax-async-generators "^6.5.0"
babel-runtime "^6.22.0"

[email protected]:
version "6.16.0"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.16.0.tgz#19ec36cb1486b59f9f468adfa42ce13908ca2999"
Expand Down Expand Up @@ -3774,6 +3786,10 @@ [email protected], mem@^1.1.0:
dependencies:
mimic-fn "^1.0.0"

memize@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/memize/-/memize-1.0.5.tgz#51d89e8407643dbc8cab98c6d56b889f9a3954e3"

merge-stream@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
Expand Down Expand Up @@ -4658,6 +4674,15 @@ [email protected]:
shell-quote "^1.6.1"
ws "^2.0.3"

react-dom@^16.2.0:
version "16.2.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044"
dependencies:
fbjs "^0.8.16"
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.0"

[email protected]:
version "0.52.0"
resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.52.0.tgz#9784663a2aa40b30c87d4c9c06ef26cf8d419d91"
Expand Down

0 comments on commit 2a6b6f3

Please sign in to comment.