diff --git a/publicodes/example/publicode-react/package.json b/publicodes/example/publicode-react/package.json index 8bedc16c3..6baf186fe 100644 --- a/publicodes/example/publicode-react/package.json +++ b/publicodes/example/publicode-react/package.json @@ -6,9 +6,8 @@ "@testing-library/jest-dom": "^5.11.4", "@testing-library/react": "^11.1.0", "@testing-library/user-event": "^12.1.10", - "i18next": "^20.2.1", - "publicodes": "../../core/publicodes-v1.0.0-beta.13.tgz", - "publicodes-react": "../../ui-react/publicodes-react-v1.0.0-beta.13.tgz", + "publicodes": "../../core/publicodes-1.0.0-beta.13.tgz", + "publicodes-react": "../../ui-react/publicodes-react-1.0.0-beta.13.tgz", "react": "^17.0.2", "react-dom": "^17.0.2", "react-router": "^5.2.0", @@ -17,7 +16,8 @@ "web-vitals": "^1.0.1" }, "scripts": { - "preinstall": "yarn pack --install-if-needed --cwd ../../core && yarn pack --install-if-needed --cwd ../../ui-react", + "preinstall": "cd ../../core && npm pack && cd ../ui-react && npm pack", + "refresh-publicodes": "yarn preinstall && yarn upgrade publicodes publicodes-react", "start": "react-scripts start", "build": "react-scripts build", "test": "react-scripts test", diff --git a/publicodes/example/publicode-react/public/favicon.ico b/publicodes/example/publicode-react/public/favicon.ico deleted file mode 100644 index a11777cc4..000000000 Binary files a/publicodes/example/publicode-react/public/favicon.ico and /dev/null differ diff --git a/publicodes/example/publicode-react/public/index.html b/publicodes/example/publicode-react/public/index.html index aa069f27c..8538e4f40 100644 --- a/publicodes/example/publicode-react/public/index.html +++ b/publicodes/example/publicode-react/public/index.html @@ -2,19 +2,17 @@ - - + - - React App + Publicode demo diff --git a/publicodes/example/publicode-react/public/logo192.png b/publicodes/example/publicode-react/public/logo192.png deleted file mode 100644 index fc44b0a37..000000000 Binary files a/publicodes/example/publicode-react/public/logo192.png and /dev/null differ diff --git a/publicodes/example/publicode-react/public/logo512.png b/publicodes/example/publicode-react/public/logo512.png deleted file mode 100644 index a4e47a654..000000000 Binary files a/publicodes/example/publicode-react/public/logo512.png and /dev/null differ diff --git a/publicodes/example/publicode-react/public/manifest.json b/publicodes/example/publicode-react/public/manifest.json deleted file mode 100644 index 080d6c77a..000000000 --- a/publicodes/example/publicode-react/public/manifest.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "short_name": "React App", - "name": "Create React App Sample", - "icons": [ - { - "src": "favicon.ico", - "sizes": "64x64 32x32 24x24 16x16", - "type": "image/x-icon" - }, - { - "src": "logo192.png", - "type": "image/png", - "sizes": "192x192" - }, - { - "src": "logo512.png", - "type": "image/png", - "sizes": "512x512" - } - ], - "start_url": ".", - "display": "standalone", - "theme_color": "#000000", - "background_color": "#ffffff" -} diff --git a/publicodes/example/publicode-react/src/Publicodes.js b/publicodes/example/publicode-react/src/Publicodes.js index bed1d81bd..4ab31d75c 100644 --- a/publicodes/example/publicode-react/src/Publicodes.js +++ b/publicodes/example/publicode-react/src/Publicodes.js @@ -21,7 +21,7 @@ export default function Publicodes() { return ( - + ) } diff --git a/publicodes/example/publicode-react/yarn.lock b/publicodes/example/publicode-react/yarn.lock index e3a121cfd..fad2c0d06 100644 --- a/publicodes/example/publicode-react/yarn.lock +++ b/publicodes/example/publicode-react/yarn.lock @@ -1120,7 +1120,7 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.6", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": +"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": version "7.13.10" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.10.tgz#47d42a57b6095f4468da440388fdbad8bebf0d7d" integrity sha512-4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw== @@ -4348,9 +4348,9 @@ ejs@^2.6.1: integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== electron-to-chromium@^1.3.564, electron-to-chromium@^1.3.712: - version "1.3.713" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.713.tgz#4583efb17f2d1e9ec07a44c8004ea73c013ad146" - integrity sha512-HWgkyX4xTHmxcWWlvv7a87RHSINEcpKYZmDMxkUlHcY+CJcfx7xEfBHuXVsO1rzyYs1WQJ7EgDp2CoErakBIow== + version "1.3.715" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.715.tgz#8fd002e79c13d711133565600f40cd80abfe5d55" + integrity sha512-VCWxo9RqTYhcCsHtG+l0TEOS6H5QmO1JyVCQB9nv8fllmAzj1VcCYH3qBCXP75/En6FeoepefnogLPE+5W7OiQ== elliptic@^6.5.3: version "6.5.4" @@ -5656,13 +5656,6 @@ html-minifier-terser@^5.0.1: relateurl "^0.2.7" terser "^4.6.3" -html-parse-stringify@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/html-parse-stringify/-/html-parse-stringify-3.0.0.tgz#28f10753e190af211d2c3c9a1191a4502e112c96" - integrity sha512-TrTKp/U0tACrpqalte/VhxepqMLii2mOfC8iuOt4+VA7Zdi6BUKKqNJvEsO17Cr3T3E7PpqLe3NdLII6bcYJgg== - dependencies: - void-elements "3.1.0" - html-to-react@^1.3.4: version "1.4.5" resolved "https://registry.yarnpkg.com/html-to-react/-/html-to-react-1.4.5.tgz#59091c11021d1ef315ef738460abb6a4a41fe1ce" @@ -5790,20 +5783,6 @@ human-signals@^1.1.1: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== -i18next@^19.4.4: - version "19.9.2" - resolved "https://registry.yarnpkg.com/i18next/-/i18next-19.9.2.tgz#ea5a124416e3c5ab85fddca2c8e3c3669a8da397" - integrity sha512-0i6cuo6ER6usEOtKajUUDj92zlG+KArFia0857xxiEHAQcUwh/RtOQocui1LPJwunSYT574Pk64aNva1kwtxZg== - dependencies: - "@babel/runtime" "^7.12.0" - -i18next@^20.2.1: - version "20.2.1" - resolved "https://registry.yarnpkg.com/i18next/-/i18next-20.2.1.tgz#8aedfdc596f7d54b9d3f6d87bcb89214467cb785" - integrity sha512-JLruWDEQ3T6tKT6P7u+DsNtToMHUwUcQIYOMRcnNBdUhSfKkoIDUKdVDKgGtmqr//LrirxjADUdr3d5Gwbow6g== - dependencies: - "@babel/runtime" "^7.12.0" - iconv-lite@0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" @@ -9153,25 +9132,23 @@ public-encrypt@^4.0.0: randombytes "^2.0.1" safe-buffer "^5.1.2" -publicodes-react@../../ui-react/publicodes-react-v1.0.0-beta.13.tgz: +publicodes-react@../../ui-react/publicodes-react-1.0.0-beta.13.tgz: version "1.0.0-beta.13" - resolved "../../ui-react/publicodes-react-v1.0.0-beta.13.tgz#d918f693c2b4f0df6213817921a455f5ff905368" + resolved "../../ui-react/publicodes-react-1.0.0-beta.13.tgz#9c510aaef72417dc548bf88baab54da8aab6e540" dependencies: classnames "^2.2.6" focus-trap-react "^3.1.2" - i18next "^19.4.4" publicodes "1.0.0-beta.13" ramda "^0.27.0" react-easy-emoji "^1.4.0" react-helmet "^6.1.0" - react-i18next "^11.4.0" react-markdown "^4.3.1" styled-components "^5.1.0" yaml "^1.9.2" -publicodes@../../core/publicodes-v1.0.0-beta.13.tgz, publicodes@1.0.0-beta.13: +publicodes@../../core/publicodes-1.0.0-beta.13.tgz, publicodes@1.0.0-beta.13: version "1.0.0-beta.13" - resolved "../../core/publicodes-v1.0.0-beta.13.tgz#30ad7267d7948a8b174ac454cb7f142b28189d71" + resolved "../../core/publicodes-1.0.0-beta.13.tgz#c139c5be7f1176112f832ddcb55fb71db3e91fa4" dependencies: moo "^0.5.1" nearley "^2.19.2" @@ -9399,14 +9376,6 @@ react-helmet@^6.1.0: react-fast-compare "^3.1.1" react-side-effect "^2.1.0" -react-i18next@^11.4.0: - version "11.8.13" - resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.8.13.tgz#9560376f8655b9aaa04f685da8eca0b032034ff9" - integrity sha512-KTNuLYnEwI9y54nSEal4yBxXBnfCCfh7t/0p/UHfhlGNcIMu+V4x/y5zGKzbOEK4noQrUzZ+J47RPYH7rMs2ZQ== - dependencies: - "@babel/runtime" "^7.13.6" - html-parse-stringify "^3.0.0" - react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.6: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" @@ -10868,9 +10837,9 @@ tabbable@^1.0.3: integrity sha512-nOWwx35/JuDI4ONuF0ZTo6lYvI0fY0tZCH1ErzY2EXfu4az50ZyiUX8X073FLiZtmWUVlkRnuXsehjJgCw9tYg== table@^6.0.4: - version "6.0.9" - resolved "https://registry.yarnpkg.com/table/-/table-6.0.9.tgz#790a12bf1e09b87b30e60419bafd6a1fd85536fb" - integrity sha512-F3cLs9a3hL1Z7N4+EkSscsel3z55XT950AvB05bwayrNg5T1/gykXtigioTAjbltvbMSJvvhFCbnf6mX+ntnJQ== + version "6.1.0" + resolved "https://registry.yarnpkg.com/table/-/table-6.1.0.tgz#676a0cfb206008b59e783fcd94ef8ba7d67d966c" + integrity sha512-T4G5KMmqIk6X87gLKWyU5exPpTjLjY5KyrFWaIjv3SvgaIUGXV7UEzGEnZJdTA38/yUS6f9PlKezQ0bYXG3iIQ== dependencies: ajv "^8.0.1" is-boolean-object "^1.1.0" @@ -11577,11 +11546,6 @@ vm-browserify@^1.0.1: resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== -void-elements@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09" - integrity sha1-YU9/v42AHwu18GYfWy9XhXUOTwk= - w3c-hr-time@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" diff --git a/publicodes/site/components/App.tsx b/publicodes/site/components/App.tsx index e125f9be8..d97139643 100644 --- a/publicodes/site/components/App.tsx +++ b/publicodes/site/components/App.tsx @@ -1,7 +1,3 @@ -// TODO: This is need to display the documentation UI, because the translations -// for UI components are handled in the mon-entreprise site and not in the -// publicodes-react package. This should be fixed. -import '../../../mon-entreprise/source/locales/i18n' import 'Components/ui/index.css' import { useEffect } from 'react' import { hot } from 'react-hot-loader' diff --git a/yarn.lock b/yarn.lock index 2812672bf..046e53620 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7409,7 +7409,7 @@ i18next-parser@^3.3.0: vue-template-compiler "^2.6.11" yamljs "^0.3.0" -i18next@^19.0.1, i18next@^19.4.4: +i18next@^19.0.1: version "19.7.0" resolved "https://registry.yarnpkg.com/i18next/-/i18next-19.7.0.tgz#e637bbbf36481d34b7d5e6d3b04e1bb654bf2a26" integrity sha512-sxZhj6u7HbEYOMx81oGwq5MiXISRBVg2wRY3n6YIbe+HtU8ydzlGzv6ErHdrRKYxATBFssVXYbc3lNZoyB4vfA== @@ -11139,7 +11139,7 @@ react-hot-loader@^4.12.15: shallowequal "^1.1.0" source-map "^0.7.3" -react-i18next@^11.0.0, react-i18next@^11.4.0: +react-i18next@^11.0.0: version "11.7.1" resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.7.1.tgz#80c993bf7c4f07937ce0e5ff4e2d7d97bfe3f42f" integrity sha512-K7qWaQ03Nc25BqSqdKz1iGU5inwNQnDVcen/tpiILEXyd0w/z+untrsuUy5Y3PqAkwJ7m1FACwBttSSitxDKQA==