Merge master
This commit is contained in:
commit
954d632276
4 changed files with 4392 additions and 2508 deletions
|
@ -1,7 +1,7 @@
|
||||||
sudo: required
|
sudo: required
|
||||||
language: node_js
|
language: node_js
|
||||||
node_js:
|
node_js:
|
||||||
- "10.15.0"
|
- "11.15.0"
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
directories:
|
directories:
|
||||||
|
|
|
@ -283,7 +283,9 @@ class SketchListRowBase extends React.Component {
|
||||||
SketchListRowBase.propTypes = {
|
SketchListRowBase.propTypes = {
|
||||||
sketch: PropTypes.shape({
|
sketch: PropTypes.shape({
|
||||||
id: PropTypes.string.isRequired,
|
id: PropTypes.string.isRequired,
|
||||||
name: PropTypes.string.isRequired
|
name: PropTypes.string.isRequired,
|
||||||
|
createdAt: PropTypes.string.isRequired,
|
||||||
|
updatedAt: PropTypes.string.isRequired
|
||||||
}).isRequired,
|
}).isRequired,
|
||||||
username: PropTypes.string.isRequired,
|
username: PropTypes.string.isRequired,
|
||||||
user: PropTypes.shape({
|
user: PropTypes.shape({
|
||||||
|
|
6762
package-lock.json
generated
6762
package-lock.json
generated
File diff suppressed because it is too large
Load diff
132
package.json
132
package.json
|
@ -38,57 +38,57 @@
|
||||||
"url": "git+https://github.com/catarak/p5.js-web-editor.git"
|
"url": "git+https://github.com/catarak/p5.js-web-editor.git"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/plugin-proposal-class-properties": "^7.4.4",
|
"@babel/plugin-proposal-class-properties": "^7.8.3",
|
||||||
"@babel/plugin-proposal-decorators": "^7.4.4",
|
"@babel/plugin-proposal-decorators": "^7.8.3",
|
||||||
"@babel/plugin-proposal-do-expressions": "^7.2.0",
|
"@babel/plugin-proposal-do-expressions": "^7.8.3",
|
||||||
"@babel/plugin-proposal-export-default-from": "^7.2.0",
|
"@babel/plugin-proposal-export-default-from": "^7.8.3",
|
||||||
"@babel/plugin-proposal-export-namespace-from": "^7.2.0",
|
"@babel/plugin-proposal-export-namespace-from": "^7.8.3",
|
||||||
"@babel/plugin-proposal-function-bind": "^7.2.0",
|
"@babel/plugin-proposal-function-bind": "^7.8.3",
|
||||||
"@babel/plugin-proposal-function-sent": "^7.2.0",
|
"@babel/plugin-proposal-function-sent": "^7.8.3",
|
||||||
"@babel/plugin-proposal-json-strings": "^7.2.0",
|
"@babel/plugin-proposal-json-strings": "^7.8.3",
|
||||||
"@babel/plugin-proposal-logical-assignment-operators": "^7.2.0",
|
"@babel/plugin-proposal-logical-assignment-operators": "^7.8.3",
|
||||||
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.4.4",
|
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
|
||||||
"@babel/plugin-proposal-numeric-separator": "^7.2.0",
|
"@babel/plugin-proposal-numeric-separator": "^7.8.3",
|
||||||
"@babel/plugin-proposal-optional-chaining": "^7.2.0",
|
"@babel/plugin-proposal-optional-chaining": "^7.8.3",
|
||||||
"@babel/plugin-proposal-pipeline-operator": "^7.3.2",
|
"@babel/plugin-proposal-pipeline-operator": "^7.8.3",
|
||||||
"@babel/plugin-proposal-throw-expressions": "^7.2.0",
|
"@babel/plugin-proposal-throw-expressions": "^7.8.3",
|
||||||
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
|
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
|
||||||
"@babel/plugin-syntax-import-meta": "^7.2.0",
|
"@babel/plugin-syntax-import-meta": "^7.8.3",
|
||||||
"@babel/plugin-transform-react-constant-elements": "^7.2.0",
|
"@babel/plugin-transform-react-constant-elements": "^7.8.3",
|
||||||
"@babel/plugin-transform-react-inline-elements": "^7.2.0",
|
"@babel/plugin-transform-react-inline-elements": "^7.8.3",
|
||||||
"@babel/preset-env": "^7.4.5",
|
"@babel/preset-env": "^7.8.3",
|
||||||
"@babel/preset-react": "^7.0.0",
|
"@babel/preset-react": "^7.8.3",
|
||||||
"babel-core": "^7.0.0-bridge.0",
|
"babel-core": "^7.0.0-bridge.0",
|
||||||
"babel-eslint": "^9.0.0",
|
"babel-eslint": "^9.0.0",
|
||||||
"babel-jest": "^24.8.0",
|
"babel-jest": "^24.9.0",
|
||||||
"babel-loader": "^8.0.0",
|
"babel-loader": "^8.0.0",
|
||||||
"babel-plugin-transform-react-remove-prop-types": "^0.2.12",
|
"babel-plugin-transform-react-remove-prop-types": "^0.2.12",
|
||||||
"css-loader": "^3.2.0",
|
"css-loader": "^3.4.2",
|
||||||
"cssnano": "^4.1.10",
|
"cssnano": "^4.1.10",
|
||||||
"enzyme": "^3.7.0",
|
"enzyme": "^3.11.0",
|
||||||
"enzyme-adapter-react-16": "^1.6.0",
|
"enzyme-adapter-react-16": "^1.15.2",
|
||||||
"eslint": "^4.19.1",
|
"eslint": "^4.19.1",
|
||||||
"eslint-config-airbnb": "^16.1.0",
|
"eslint-config-airbnb": "^16.1.0",
|
||||||
"eslint-plugin-import": "^2.14.0",
|
"eslint-plugin-import": "^2.20.0",
|
||||||
"eslint-plugin-jsx-a11y": "^6.1.2",
|
"eslint-plugin-jsx-a11y": "^6.2.3",
|
||||||
"eslint-plugin-react": "^7.12.3",
|
"eslint-plugin-react": "^7.18.0",
|
||||||
"file-loader": "^2.0.0",
|
"file-loader": "^2.0.0",
|
||||||
"jest": "^24.8.0",
|
"jest": "^24.9.0",
|
||||||
"mini-css-extract-plugin": "^0.8.0",
|
"mini-css-extract-plugin": "^0.8.2",
|
||||||
"node-sass": "^4.11.0",
|
"node-sass": "^4.13.1",
|
||||||
"nodemon": "^1.18.9",
|
"nodemon": "^1.19.4",
|
||||||
"optimize-css-assets-webpack-plugin": "^5.0.3",
|
"optimize-css-assets-webpack-plugin": "^5.0.3",
|
||||||
"postcss-cssnext": "^3.1.0",
|
"postcss-cssnext": "^3.1.0",
|
||||||
"postcss-focus": "^4.0.0",
|
"postcss-focus": "^4.0.0",
|
||||||
"postcss-loader": "^3.0.0",
|
"postcss-loader": "^3.0.0",
|
||||||
"postcss-reporter": "^6.0.1",
|
"postcss-reporter": "^6.0.1",
|
||||||
"react-test-renderer": "^16.6.0",
|
"react-test-renderer": "^16.12.0",
|
||||||
"rimraf": "^2.6.3",
|
"rimraf": "^2.7.1",
|
||||||
"sass-loader": "^6.0.7",
|
"sass-loader": "^6.0.7",
|
||||||
"style-loader": "^1.0.0",
|
"style-loader": "^1.1.3",
|
||||||
"terser-webpack-plugin": "^1.4.1",
|
"terser-webpack-plugin": "^1.4.3",
|
||||||
"webpack-cli": "^3.3.7",
|
"webpack-cli": "^3.3.10",
|
||||||
"webpack-manifest-plugin": "^2.0.4",
|
"webpack-manifest-plugin": "^2.2.0",
|
||||||
"webpack-node-externals": "^1.7.2"
|
"webpack-node-externals": "^1.7.2"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
|
@ -96,46 +96,46 @@
|
||||||
"npm": "6.7.0"
|
"npm": "6.7.0"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/core": "^7.4.5",
|
"@babel/core": "^7.8.3",
|
||||||
"@babel/polyfill": "^7.4.4",
|
"@babel/polyfill": "^7.8.3",
|
||||||
"@babel/register": "^7.4.4",
|
"@babel/register": "^7.8.3",
|
||||||
"archiver": "^1.1.0",
|
"archiver": "^1.1.0",
|
||||||
"async": "^2.6.1",
|
"async": "^2.6.3",
|
||||||
"axios": "^0.18.1",
|
"axios": "^0.18.1",
|
||||||
"bcrypt-nodejs": "0.0.3",
|
"bcrypt-nodejs": "0.0.3",
|
||||||
"blob-util": "^1.2.1",
|
"blob-util": "^1.2.1",
|
||||||
"body-parser": "^1.18.3",
|
"body-parser": "^1.18.3",
|
||||||
"bson-objectid": "^1.2.4",
|
"bson-objectid": "^1.3.0",
|
||||||
"classnames": "^2.2.6",
|
"classnames": "^2.2.6",
|
||||||
"clipboard": "^1.7.1",
|
"clipboard": "^1.7.1",
|
||||||
"codemirror": "^5.42.2",
|
"codemirror": "^5.51.0",
|
||||||
"connect-mongo": "^1.3.2",
|
"connect-mongo": "^1.3.2",
|
||||||
"console-feed": "^2.8.10",
|
"console-feed": "^2.8.11",
|
||||||
"cookie-parser": "^1.4.3",
|
"cookie-parser": "^1.4.3",
|
||||||
"cors": "^2.8.5",
|
"cors": "^2.8.5",
|
||||||
"cross-env": "^5.2.0",
|
"cross-env": "^5.2.1",
|
||||||
"csslint": "^0.10.0",
|
"csslint": "^0.10.0",
|
||||||
"date-fns": "^1.30.1",
|
"date-fns": "^1.30.1",
|
||||||
"decomment": "^0.8.7",
|
"decomment": "^0.8.7",
|
||||||
"dotenv": "^2.0.0",
|
"dotenv": "^2.0.0",
|
||||||
"dropzone": "^4.3.0",
|
"dropzone": "^4.3.0",
|
||||||
"escape-string-regexp": "^1.0.5",
|
"escape-string-regexp": "^1.0.5",
|
||||||
"eslint-loader": "^2.1.2",
|
"eslint-loader": "^2.2.1",
|
||||||
"express": "^4.16.4",
|
"express": "^4.17.1",
|
||||||
"express-basic-auth": "^1.2.0",
|
"express-basic-auth": "^1.2.0",
|
||||||
"express-session": "^1.15.6",
|
"express-session": "^1.17.0",
|
||||||
"friendly-words": "^1.1.3",
|
"friendly-words": "^1.1.10",
|
||||||
"htmlhint": "^0.10.1",
|
"htmlhint": "^0.10.1",
|
||||||
"is-url": "^1.2.4",
|
"is-url": "^1.2.4",
|
||||||
"jest-express": "^1.10.1",
|
"jest-express": "^1.11.0",
|
||||||
"js-beautify": "^1.8.9",
|
"js-beautify": "^1.10.3",
|
||||||
"jsdom": "^9.8.3",
|
"jsdom": "^9.8.3",
|
||||||
"jshint": "^2.10.2",
|
"jshint": "^2.11.0",
|
||||||
"lodash": "^4.17.15",
|
"lodash": "^4.17.15",
|
||||||
"loop-protect": "github:catarak/loop-protect",
|
"loop-protect": "github:catarak/loop-protect",
|
||||||
"mjml": "^3.3.2",
|
"mjml": "^3.3.2",
|
||||||
"mockingoose": "^2.13.0",
|
"mockingoose": "^2.13.2",
|
||||||
"mongoose": "^5.7.5",
|
"mongoose": "^5.8.10",
|
||||||
"node-uuid": "^1.4.7",
|
"node-uuid": "^1.4.7",
|
||||||
"nodemailer": "^2.6.4",
|
"nodemailer": "^2.6.4",
|
||||||
"nodemailer-mailgun-transport": "^1.4.0",
|
"nodemailer-mailgun-transport": "^1.4.0",
|
||||||
|
@ -148,15 +148,15 @@
|
||||||
"primer-tooltips": "^1.5.11",
|
"primer-tooltips": "^1.5.11",
|
||||||
"prop-types": "^15.6.2",
|
"prop-types": "^15.6.2",
|
||||||
"q": "^1.4.1",
|
"q": "^1.4.1",
|
||||||
"react": "^16.7.0",
|
"react": "^16.12.0",
|
||||||
"react-dom": "^16.7.0",
|
"react-dom": "^16.12.0",
|
||||||
"react-helmet": "^5.1.3",
|
"react-helmet": "^5.1.3",
|
||||||
"react-hot-loader": "^4.6.3",
|
"react-hot-loader": "^4.12.19",
|
||||||
"react-inlinesvg": "^0.7.5",
|
"react-inlinesvg": "^0.7.5",
|
||||||
"react-redux": "^5.1.1",
|
"react-redux": "^5.1.2",
|
||||||
"react-router": "^3.2.1",
|
"react-router": "^3.2.5",
|
||||||
"react-split-pane": "^0.1.85",
|
"react-split-pane": "^0.1.89",
|
||||||
"react-tabs": "^2.3.0",
|
"react-tabs": "^2.3.1",
|
||||||
"redux": "^3.7.2",
|
"redux": "^3.7.2",
|
||||||
"redux-auth-wrapper": "^2.1.0",
|
"redux-auth-wrapper": "^2.1.0",
|
||||||
"redux-devtools": "^3.4.2",
|
"redux-devtools": "^3.4.2",
|
||||||
|
@ -165,20 +165,20 @@
|
||||||
"redux-form": "^5.3.3",
|
"redux-form": "^5.3.3",
|
||||||
"redux-thunk": "^2.3.0",
|
"redux-thunk": "^2.3.0",
|
||||||
"request": "^2.88.0",
|
"request": "^2.88.0",
|
||||||
"request-promise": "^4.1.1",
|
"request-promise": "^4.2.5",
|
||||||
"reselect": "^4.0.0",
|
"reselect": "^4.0.0",
|
||||||
"s3": "^4.4.0",
|
"s3": "^4.4.0",
|
||||||
"s3-policy": "^0.2.0",
|
"s3-policy": "^0.2.0",
|
||||||
"sass-extract": "^2.1.0",
|
"sass-extract": "^2.1.0",
|
||||||
"sass-extract-js": "^0.4.0",
|
"sass-extract-js": "^0.4.0",
|
||||||
"sass-extract-loader": "^1.1.0",
|
"sass-extract-loader": "^1.1.0",
|
||||||
"shortid": "^2.2.14",
|
"shortid": "^2.2.15",
|
||||||
"sinon": "^7.3.2",
|
"sinon": "^7.5.0",
|
||||||
"sinon-mongoose": "^2.3.0",
|
"sinon-mongoose": "^2.3.0",
|
||||||
"slugify": "^1.3.4",
|
"slugify": "^1.3.6",
|
||||||
"srcdoc-polyfill": "^0.2.0",
|
"srcdoc-polyfill": "^0.2.0",
|
||||||
"url": "^0.11.0",
|
"url": "^0.11.0",
|
||||||
"webpack": "^4.39.2",
|
"webpack": "^4.41.5",
|
||||||
"webpack-dev-middleware": "^2.0.6",
|
"webpack-dev-middleware": "^2.0.6",
|
||||||
"webpack-hot-middleware": "^2.24.3",
|
"webpack-hot-middleware": "^2.24.3",
|
||||||
"xhr": "^2.5.0"
|
"xhr": "^2.5.0"
|
||||||
|
|
Loading…
Reference in a new issue