From 0b0529d5218b14bc277e2e9f0b5ea0ed0c90e75d Mon Sep 17 00:00:00 2001 From: Matthew Conlen Date: Mon, 15 Feb 2021 23:38:59 -0800 Subject: [PATCH] update dependencies --- package-lock.json | 114 +++++++++++++----- package.json | 6 +- .../components/component-editor/code-cell.js | 1 + 3 files changed, 86 insertions(+), 35 deletions(-) diff --git a/package-lock.json b/package-lock.json index 45e0142..71afe5d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6305,11 +6305,11 @@ }, "dependencies": { "resolve": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz", - "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==", + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", + "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", "requires": { - "is-core-module": "^2.1.0", + "is-core-module": "^2.2.0", "path-parse": "^1.0.6" } } @@ -11079,9 +11079,9 @@ } }, "idyll": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/idyll/-/idyll-5.2.2.tgz", - "integrity": "sha512-+/J3vVva43brLp1NwE8aSoQ1ffb/5lUDA9GXkSlrtodFZ0O0L8mw90ii+b3n67JPntF9ltWUpOipnoxkPXZO9w==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/idyll/-/idyll-5.2.4.tgz", + "integrity": "sha512-CP4Bj7l7Nl8Exgpxw7+UoDBHgcviCC37skYsDNi1DriaefpxaXsEN062CMFlEyDjp/BvuW9s6V1u104pnTL8Cw==", "requires": { "babel-preset-env": "^1.6.0", "babel-preset-react": "^6.22.0", @@ -11102,13 +11102,13 @@ "dev-null": "^0.1.1", "fs-extra": "^5.0.0", "html-tags": "^1.1.1", - "idyll-ast": "^2.2.1", - "idyll-compiler": "^4.0.20", - "idyll-components": "^4.1.2", - "idyll-document": "^3.4.2", + "idyll-ast": "^2.2.2", + "idyll-compiler": "^4.0.21", + "idyll-components": "^4.1.4", + "idyll-document": "^3.4.4", "idyll-layouts": "^3.0.6", - "idyll-template-projects": "^2.2.4", - "idyll-themes": "^3.1.2", + "idyll-template-projects": "^2.2.5", + "idyll-themes": "^3.1.3", "inquirer": "^5.2.0", "insert-css": "^2.0.0", "mkdirp": "^0.5.1", @@ -11146,6 +11146,26 @@ "jsonfile": "^4.0.0", "universalify": "^0.1.0" } + }, + "idyll-ast": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/idyll-ast/-/idyll-ast-2.2.2.tgz", + "integrity": "sha512-iymBNlelfLuGpsQe65Yq0VfRpqv/p0/iXKN4621z61gTgRAojZjOb4cX61KaOsRphS37EINNi37zLCjFnVfS3g==", + "requires": { + "ajv": "^6.5.2" + } + }, + "idyll-compiler": { + "version": "4.0.21", + "resolved": "https://registry.npmjs.org/idyll-compiler/-/idyll-compiler-4.0.21.tgz", + "integrity": "sha512-rP0o3rJbTgIzGU1MXIn/VtDdnHuJuOvgAESywyw+gbBZArPqsjS1cbcQYKLmtpGDZ1jHKymxnM610N7GGNJT8Q==", + "requires": { + "gray-matter": "^3.1.1", + "idyll-ast": "^2.2.2", + "lex": "^1.7.9", + "nearley": "^2.15.0", + "smartquotes": "^2.0.0" + } } } }, @@ -11175,15 +11195,15 @@ "integrity": "sha512-D1DgjXtdf+kIrjmO5jPGitoDVRh698Sxl1R3R2cwEFXAkRTRKsOU0UD8UAZcVeYy8MAB28WXvwv1i7tvueuWZA==" }, "idyll-components": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/idyll-components/-/idyll-components-4.1.2.tgz", - "integrity": "sha512-e/lF840oI6GIXveHehs3zDgUZ3ZGOi+KD9A3mCOGEtMa0g8yqa7fU8mYZ5hPkF35IgxovcdPq8bTt5CHQshWXQ==", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/idyll-components/-/idyll-components-4.1.4.tgz", + "integrity": "sha512-8CsGaAYjomNmTbk0es6LGwcN+RMcjxjcmiG53gdMGmbR7busdsGLsbPwDWbRmKVmTcao1yW+MVeVL+LKEM6sLA==", "requires": { "d3-array": "^1.2.0", "d3-drag": "^1.1.1", "d3-format": "^1.2.0", "d3-selection": "^1.1.0", - "idyll-ast": "^2.2.1", + "idyll-ast": "^2.2.2", "idyll-component-children": "^1.0.7", "intersection-observer": "^0.5.0", "prop-types": "^15.5.10", @@ -11194,12 +11214,22 @@ "react-youtube": "^7.6.0", "scrollama": "^1.4.1", "victory": "^0.23.0" + }, + "dependencies": { + "idyll-ast": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/idyll-ast/-/idyll-ast-2.2.2.tgz", + "integrity": "sha512-iymBNlelfLuGpsQe65Yq0VfRpqv/p0/iXKN4621z61gTgRAojZjOb4cX61KaOsRphS37EINNi37zLCjFnVfS3g==", + "requires": { + "ajv": "^6.5.2" + } + } } }, "idyll-document": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/idyll-document/-/idyll-document-3.4.2.tgz", - "integrity": "sha512-bfotEMgiatqBfNe8ZkYV9EgNYZnE1XKA/Uu9spyff81eXM3mYT4tfWZTBV3zLwPZpTVfDMBJ63nioUQZKio7/A==", + "version": "3.4.4", + "resolved": "https://registry.npmjs.org/idyll-document/-/idyll-document-3.4.4.tgz", + "integrity": "sha512-pDK4H3nTkXkdfoSVh6pvPpbL5LZwLgL80dSNssNLygpX+cOCuAClOk7v4bkP33jc5+nVVN2r6MmiPQf2C+b0DQ==", "requires": { "change-case": "^3.0.1", "cross-env": "^5.2.0", @@ -11207,9 +11237,9 @@ "falafel": "^2.1.0", "fast-deep-equal": "^2.0.1", "html-tags": "^2.0.0", - "idyll-compiler": "^4.0.20", + "idyll-compiler": "^4.0.21", "idyll-layouts": "^3.0.6", - "idyll-themes": "^3.1.2", + "idyll-themes": "^3.1.3", "object.entries": "^1.0.4", "object.values": "^1.0.4", "react-dom-factories": "^1.0.1", @@ -11236,6 +11266,26 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz", "integrity": "sha1-ELMKOGCF9Dzt41PMj6fLDe7qZos=" + }, + "idyll-ast": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/idyll-ast/-/idyll-ast-2.2.2.tgz", + "integrity": "sha512-iymBNlelfLuGpsQe65Yq0VfRpqv/p0/iXKN4621z61gTgRAojZjOb4cX61KaOsRphS37EINNi37zLCjFnVfS3g==", + "requires": { + "ajv": "^6.5.2" + } + }, + "idyll-compiler": { + "version": "4.0.21", + "resolved": "https://registry.npmjs.org/idyll-compiler/-/idyll-compiler-4.0.21.tgz", + "integrity": "sha512-rP0o3rJbTgIzGU1MXIn/VtDdnHuJuOvgAESywyw+gbBZArPqsjS1cbcQYKLmtpGDZ1jHKymxnM610N7GGNJT8Q==", + "requires": { + "gray-matter": "^3.1.1", + "idyll-ast": "^2.2.2", + "lex": "^1.7.9", + "nearley": "^2.15.0", + "smartquotes": "^2.0.0" + } } } }, @@ -11245,14 +11295,14 @@ "integrity": "sha512-FOrsbaBakriX/DN1iILnj4eCzTjvjbV0ETmcCBH00Gnelj2ipPCleynOCBXjTxNyu+pgbK/fnEh3cjI04t8iaA==" }, "idyll-template-projects": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/idyll-template-projects/-/idyll-template-projects-2.2.4.tgz", - "integrity": "sha512-6/AVoCxOptCJXifjUKaazsdUXYb16bHQV/KvoipFU9fOBkI/ny5lI3sCQbU0mSzwMyivI+iMn0a7u0P9YMVktA==" + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/idyll-template-projects/-/idyll-template-projects-2.2.5.tgz", + "integrity": "sha512-mn/bI/voblKbT2rhJ4hw0eOLrTZu4GVxGghbO1fFa6S0jRh4RjuNWG9pLzH5cUTvAEHW9GYZJFBlAG61UvqpGQ==" }, "idyll-themes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/idyll-themes/-/idyll-themes-3.1.2.tgz", - "integrity": "sha512-IE0SAdEX29uMIoQnl0v4ogdQj2+jOfJ4oM/0LqbtsMnCQQXiD6JW1MI1qAvWKzb77sqaRi540rG9rV1yw7gJUA==" + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/idyll-themes/-/idyll-themes-3.1.3.tgz", + "integrity": "sha512-U61KMZ5frwRIvmmuGp03OzLE+jaROcAC5Aif7h/+Ss93vwmSs9iMuesWTr+0pPWDXmF97ip0z9QlvBlGZIQnfg==" }, "ieee754": { "version": "1.2.1", @@ -14565,11 +14615,11 @@ }, "dependencies": { "resolve": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz", - "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==", + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", + "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", "requires": { - "is-core-module": "^2.1.0", + "is-core-module": "^2.2.0", "path-parse": "^1.0.6" } } diff --git a/package.json b/package.json index 33a918a..aab6320 100644 --- a/package.json +++ b/package.json @@ -48,11 +48,11 @@ "electron-squirrel-startup": "^1.0.0", "fast-copy": "^2.1.1", "fix-path": "^3.0.0", - "idyll": "^5.2.2", + "idyll": "^5.2.4", "idyll-ast": "^2.2.1", "idyll-compiler": "^4.0.20", - "idyll-components": "^4.1.2", - "idyll-document": "^3.4.2", + "idyll-components": "^4.1.4", + "idyll-document": "^3.4.4", "lodash.throttle": "^4.1.1", "postcss": "^8.2.4", "postcss-js": "^3.0.3", diff --git a/src/render/idyll-display/components/component-editor/code-cell.js b/src/render/idyll-display/components/component-editor/code-cell.js index 0390e3d..3ef8452 100644 --- a/src/render/idyll-display/components/component-editor/code-cell.js +++ b/src/render/idyll-display/components/component-editor/code-cell.js @@ -66,6 +66,7 @@ export default class EditableCodeCell extends React.Component { ref={this._cellCodeRef} contentEditable={editing} suppressContentEditableWarning={true} + style={{minHeight: '1.33em'}} onKeyDown={this.handleKeyDown} onBlur={this.onBlur}> {this.props.markup}