Skip to content

Commit

Permalink
Merge branch 'dev' of github.com:ec-europa/ecl-ssg into ec-playground
Browse files Browse the repository at this point in the history
  • Loading branch information
planctus committed Jul 14, 2023
2 parents 4923487 + bda309a commit 9bf99fd
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 21 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@ecl/ckeditor5-ecl-webcomponents": "0.8.0",
"@ecl/ecl-webcomponents": "0.8.0",
"@ecl/ecl-webcomponents-react": "0.8.0",
"@ecl/ckeditor5-ecl-webcomponents": "0.8.1",
"@ecl/ecl-webcomponents": "0.8.1",
"@ecl/ecl-webcomponents-react": "0.8.1",
"@types/react-html-parser": "2.0.2",
"gatsby": "5.11.0",
"gatsby-plugin-babel-exclude": "2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion src/cms/components/ckeditor-netlify/control.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import PropTypes from "prop-types";
import React from "react";
import { CKEditor } from "@ckeditor/ckeditor5-react";
import Editor from "../../../../../ecl-webcomponents/playground/editor/ckeditor";
import Editor from "@ecl/ckeditor5-ecl-webcomponents/dist/ckeditor.js";

export class Control extends React.Component {
static propTypes = {
Expand Down
4 changes: 4 additions & 0 deletions src/cms/preview-templates/PagePreview.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ const PagePreview = ({ entry, getAsset }) => {
script.type = 'module';
script.src = 'ecl-webcomponents/ecl-webcomponents.esm.js';
iframeHead.appendChild(script);
const meta = document.createElement('meta');
meta.setAttribute('name', 'ecl-asset-path');
meta.setAttribute('content', '/');
iframeHead.appendChild(meta);

if (html) {
return (
Expand Down
2 changes: 1 addition & 1 deletion src/components/editor.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Editor from "../../../ecl-webcomponents/playground/editor/ckeditor";
import Editor from "@ecl/ckeditor5-ecl-webcomponents/dist/ckeditor.js";
import React from "react"
import { CKEditor } from "@ckeditor/ckeditor5-react"

Expand Down
3 changes: 0 additions & 3 deletions static/admin/index.html

This file was deleted.

26 changes: 13 additions & 13 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1159,22 +1159,22 @@
gonzales-pe "^4.3.0"
node-source-walk "^6.0.1"

"@ecl/ckeditor5-ecl-webcomponents@0.8.0":
version "0.8.0"
resolved "https://registry.yarnpkg.com/@ecl/ckeditor5-ecl-webcomponents/-/ckeditor5-ecl-webcomponents-0.8.0.tgz#16e9caf96bf14395fc57a8f92b7e00cecb14a29c"
integrity sha512-2QwuyGf5Uz1+WqZWOKu5sRmAehCrco3K3Tek3lr1uyLVr1/l78wRBSLGFLIKs3dlsgKf58ej8j/owOD4fDSjaw==
"@ecl/ckeditor5-ecl-webcomponents@0.8.1":
version "0.8.1"
resolved "https://registry.yarnpkg.com/@ecl/ckeditor5-ecl-webcomponents/-/ckeditor5-ecl-webcomponents-0.8.1.tgz#8c32a0ecb935274dee354b6ce0c1b93cb3659a71"
integrity sha512-pEeRjNWon3Sgzrhx8z4UG6kOvL0fqEqQPUgZXEEKRCQYACanKYZcnBBIhwR4uZ4Sb6vseBvSNZKI5vT4ywy5Dw==

"@ecl/ecl-webcomponents-react@0.8.0":
version "0.8.0"
resolved "https://registry.yarnpkg.com/@ecl/ecl-webcomponents-react/-/ecl-webcomponents-react-0.8.0.tgz#2c086edf97c45c06f5c88aac4cfffceecb6a0b92"
integrity sha512-+G8ISDtKgj1gVdhUbRzAqZKg0Ln7fOTk7dcDlhNNIITKuQFdS44plT3Ctnb1k8zHvJMmANfjDNmkXe55MPYRZw==
"@ecl/ecl-webcomponents-react@0.8.1":
version "0.8.1"
resolved "https://registry.yarnpkg.com/@ecl/ecl-webcomponents-react/-/ecl-webcomponents-react-0.8.1.tgz#8ee8135de1e177a2cac47aa437e04615a1841265"
integrity sha512-s+fB5yfmvh8OpERTewQqPX1lqFyxJIcAoFbxOcnX3S04lRzObEKESaOQf3UdzWqT8pZ1woRyNkd8/1WXqLq/Tw==
dependencies:
"@ecl/ecl-webcomponents" "0.8.0"
"@ecl/ecl-webcomponents" "0.8.1"

"@ecl/ecl-webcomponents@0.8.0":
version "0.8.0"
resolved "https://registry.yarnpkg.com/@ecl/ecl-webcomponents/-/ecl-webcomponents-0.8.0.tgz#58d316d5e7c12b750269259110b5856b423f5098"
integrity sha512-X3yL7pqxyEJy+WR4HL9YkBFNOScJS7oCOPFn9B+w5ZwZKYNYC3tFr7dhMbK2TAQM1b1tCNkkfModfJHm03sSKQ==
"@ecl/ecl-webcomponents@0.8.1":
version "0.8.1"
resolved "https://registry.yarnpkg.com/@ecl/ecl-webcomponents/-/ecl-webcomponents-0.8.1.tgz#fa4369a7a7a9dccbabb09ffe3ddd555b505deb36"
integrity sha512-3kyTc6sxe76l6BEKaKuk7vYQhY1EsGuZp+nqTdYM5duQpVTD+XtcSviubVkYWs5sW1D33GQufwtbrtAJ1F/CgQ==
dependencies:
"@stencil/core" "4.0.1"

Expand Down

1 comment on commit 9bf99fd

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.