scratchfoundation/scratch-paint
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-paint.git synced 2024-12-23 05:52:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #1514 from fsih/peerDepSvgRend

Browse source 
Move scratch render fonts to peer dependencies since gui will supply it
This commit is contained in:
DD Liu 2021-04-07 16:30:48 -04:00 committed by GitHub
commit 433dca54f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
package.json
View file

@ -31,8 +31,7 @@
"lodash.omit": "4.5.0", "lodash.omit": "4.5.0",
"minilog": "3.1.0", "minilog": "3.1.0",
"parse-color": "1.0.0", "parse-color": "1.0.0",
"prop-types": "^15.5.10", "prop-types": "^15.5.10"
"scratch-render-fonts": "latest"
}, },
"peerDependencies": { "peerDependencies": {
"react": "^16", "react": "^16",
@ -44,7 +43,8 @@
"react-responsive": "^4", "react-responsive": "^4",
"react-style-proptype": "^3", "react-style-proptype": "^3",
"react-tooltip": "^3", "react-tooltip": "^3",
"redux": "^3" "redux": "^3",
"scratch-render-fonts": "^1.0.0-prerelease.20210401210003"
}, },
"devDependencies": { "devDependencies": {
"autoprefixer": "9.7.4", "autoprefixer": "9.7.4",
@ -92,6 +92,7 @@
"regenerator-runtime": "^0.13.3", "regenerator-runtime": "^0.13.3",
"rimraf": "^2.6.1", "rimraf": "^2.6.1",
"scratch-l10n": "3.11.20210308031514", "scratch-l10n": "3.11.20210308031514",
"scratch-render-fonts": "^1.0.0-prerelease.20210401210003",
"style-loader": "^1.0.0", "style-loader": "^1.0.0",
"svg-url-loader": "^3.0.0", "svg-url-loader": "^3.0.0",
"tap": "^14.4.3", "tap": "^14.4.3",

1
src/containers/paper-canvas.jsx
View file

@ -197,6 +197,7 @@ class PaperCanvas extends React.Component {
const paperCanvas = this; const paperCanvas = this;
// Pre-process SVG to prevent parsing errors (discussion from #213) // Pre-process SVG to prevent parsing errors (discussion from #213)
// 1. Remove svg: namespace on elements. // 1. Remove svg: namespace on elements.
// TODO: remove
svg = svg.split(/<\s*svg:/).join('<'); svg = svg.split(/<\s*svg:/).join('<');
svg = svg.split(/<\/\s*svg:/).join('</'); svg = svg.split(/<\/\s*svg:/).join('</');
// 2. Add root svg namespace if it does not exist. // 2. Add root svg namespace if it does not exist.