Use production builds of react libraries (#4482)
And remove patching that doesn't seem to be required anymore
This commit is contained in:
parent
11a5853657
commit
144f2caed8
7 changed files with 9 additions and 26 deletions
2
.babelrc
2
.babelrc
|
@ -9,8 +9,6 @@
|
||||||
"chrome/content/zotero/xpcom/citeproc.js",
|
"chrome/content/zotero/xpcom/citeproc.js",
|
||||||
"chrome/content/ace/*",
|
"chrome/content/ace/*",
|
||||||
"chrome/content/scaffold/templates/*",
|
"chrome/content/scaffold/templates/*",
|
||||||
"resource/react.js",
|
|
||||||
"resource/react-dom.js",
|
|
||||||
"resource/react-virtualized.js",
|
"resource/react-virtualized.js",
|
||||||
"test/resource/*.js"
|
"test/resource/*.js"
|
||||||
],
|
],
|
||||||
|
|
|
@ -30,19 +30,8 @@ async function babelWorker(ev) {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
let contents = await fs.readFile(sourcefile, 'utf8');
|
let contents = await fs.readFile(sourcefile, 'utf8');
|
||||||
// Patch react
|
|
||||||
if (comparePaths(sourcefile, 'resource/react.js')) {
|
|
||||||
transformed = contents.replace('instanceof Error', '.constructor.name == "Error"')
|
|
||||||
}
|
|
||||||
// Patch react-dom
|
|
||||||
else if (comparePaths(sourcefile, 'resource/react-dom.js')) {
|
|
||||||
transformed = contents.replace(/ ownerDocument\.createElement\((.*?)\)/gi, 'ownerDocument.createElementNS(HTML_NAMESPACE, $1)')
|
|
||||||
.replace('element instanceof win.HTMLIFrameElement',
|
|
||||||
'typeof element != "undefined" && element.tagName.toLowerCase() == "iframe"')
|
|
||||||
.replace("isInputEventSupported = false", 'isInputEventSupported = true');
|
|
||||||
}
|
|
||||||
// Patch react-virtualized
|
// Patch react-virtualized
|
||||||
else if (comparePaths(sourcefile, 'resource/react-virtualized.js')) {
|
if (comparePaths(sourcefile, 'resource/react-virtualized.js')) {
|
||||||
transformed = contents.replace('scrollDiv = document.createElement("div")', 'scrollDiv = document.createElementNS("http://www.w3.org/1999/xhtml", "div")')
|
transformed = contents.replace('scrollDiv = document.createElement("div")', 'scrollDiv = document.createElementNS("http://www.w3.org/1999/xhtml", "div")')
|
||||||
.replace('document.body.appendChild(scrollDiv)', 'document.documentElement.appendChild(scrollDiv)')
|
.replace('document.body.appendChild(scrollDiv)', 'document.documentElement.appendChild(scrollDiv)')
|
||||||
.replace('document.body.removeChild(scrollDiv)', 'document.documentElement.removeChild(scrollDiv)');
|
.replace('document.body.removeChild(scrollDiv)', 'document.documentElement.removeChild(scrollDiv)');
|
||||||
|
|
|
@ -26,14 +26,12 @@ const copyDirs = [
|
||||||
// list of files from root folder to symlink
|
// list of files from root folder to symlink
|
||||||
const symlinkFiles = [
|
const symlinkFiles = [
|
||||||
'chrome.manifest',
|
'chrome.manifest',
|
||||||
// React needs to be patched by babel-worker.js, so symlink all files in resource/ except for
|
// react-virtualized needs to be patched by babel-worker.js, so symlink all files in resource/ except for
|
||||||
// those. Babel transpilation for React is still disabled in .babelrc.
|
// those. Babel transpilation is still disabled in .babelrc.
|
||||||
'resource/**/*',
|
'resource/**/*',
|
||||||
'!resource/react.js',
|
|
||||||
'!resource/react-dom.js',
|
|
||||||
'!resource/react-virtualized.js',
|
'!resource/react-virtualized.js',
|
||||||
// Only include dist directory of singleFile
|
// Only include dist directory of singleFile
|
||||||
// Also do a little bit of manipulation similar to React
|
// Also do a little bit of manipulation similar to react-virtualized
|
||||||
'!resource/SingleFile/**/*',
|
'!resource/SingleFile/**/*',
|
||||||
'resource/SingleFile/lib/**/*',
|
'resource/SingleFile/lib/**/*',
|
||||||
'!resource/SingleFile/lib/single-file.js',
|
'!resource/SingleFile/lib/single-file.js',
|
||||||
|
@ -116,9 +114,7 @@ const jsFiles = [
|
||||||
`{${dirs.join(',')}}/**/*.jsx`,
|
`{${dirs.join(',')}}/**/*.jsx`,
|
||||||
`!{${symlinkDirs.concat(copyDirs).join(',')}}/**/*.js`,
|
`!{${symlinkDirs.concat(copyDirs).join(',')}}/**/*.js`,
|
||||||
`!{${symlinkDirs.concat(copyDirs).join(',')}}/**/*.jsx`,
|
`!{${symlinkDirs.concat(copyDirs).join(',')}}/**/*.jsx`,
|
||||||
// Special handling for React -- see note above
|
// Special handling for react-virtualized and others -- see note above
|
||||||
'resource/react.js',
|
|
||||||
'resource/react-dom.js',
|
|
||||||
'resource/react-virtualized.js',
|
'resource/react-virtualized.js',
|
||||||
'resource/SingleFile/lib/single-file.js',
|
'resource/SingleFile/lib/single-file.js',
|
||||||
'resource/citeproc_rs_wasm.js',
|
'resource/citeproc_rs_wasm.js',
|
||||||
|
|
2
resource/react-dom-server.js
vendored
2
resource/react-dom-server.js
vendored
|
@ -1 +1 @@
|
||||||
../node_modules/react-dom/umd/react-dom-server.browser.development.js
|
../node_modules/react-dom/umd/react-dom-server.browser.production.min.js
|
2
resource/react-dom.js
vendored
2
resource/react-dom.js
vendored
|
@ -1 +1 @@
|
||||||
../node_modules/react-dom/umd/react-dom.development.js
|
../node_modules/react-dom/umd/react-dom.production.min.js
|
2
resource/react-intl.js
vendored
2
resource/react-intl.js
vendored
|
@ -1 +1 @@
|
||||||
../node_modules/react-intl/dist/react-intl.js
|
../node_modules/react-intl/dist/react-intl.min.js
|
2
resource/react.js
vendored
2
resource/react.js
vendored
|
@ -1 +1 @@
|
||||||
../node_modules/react/umd/react.development.js
|
../node_modules/react/umd/react.production.min.js
|
Loading…
Reference in a new issue