From 4c14de143bbf9c61f59be0d8105da6f6dd773d3a Mon Sep 17 00:00:00 2001 From: Brett Zamir Date: Wed, 5 Aug 2020 18:05:34 +0800 Subject: [PATCH] - Build: Fix build input for xdomain; update external files per latest - Docs: Update dev. license badge per latest - Linting (LGTM): Fix paths - Linting (ESLint): Fix ignore path - npm: Fix copy file paths --- .eslintignore | 2 +- badges/licenses-badge-dev.svg | 2 +- lgtm.yml | 4 +-- package.json | 2 +- rollup-config.config.js | 2 +- src/editor/xdomain-svg-editor-es.html | 2 +- src/editor/xdomain-svg-editor.html | 2 +- src/external/jamilih/jml-es.js | 6 ++-- src/external/regenerator-runtime/runtime.js | 35 ++++++++++++++++----- 9 files changed, 39 insertions(+), 18 deletions(-) diff --git a/.eslintignore b/.eslintignore index a76bdcd1..b752006a 100644 --- a/.eslintignore +++ b/.eslintignore @@ -26,7 +26,7 @@ src/editor/extensions/mathjax # Todo: We should at least check `compat/compat` in our other files, however ## Two "external" items are modified locally, so we undo their ignoring -src/external/* +src/external/**/* !src/external/dom-polyfill src/external/dom-polyfill/* !src/external/dom-polyfill/dom-polyfill.js diff --git a/badges/licenses-badge-dev.svg b/badges/licenses-badge-dev.svg index dfbbe764..677529f4 100644 --- a/badges/licenses-badge-dev.svg +++ b/badges/licenses-badge-dev.svg @@ -1 +1 @@ -License typesLicense types(all devDeps)(all devDeps)PublicPublicdomaindomain1. (MIT OR CC0-1.0)1. (MIT OR CC0-1.0)2. CC0-1.02. CC0-1.03. Unlicense3. UnlicensePermissivePermissive1. (AFL-2.1 OR BSD-3-Clause)1. (AFL-2.1 OR BSD-3-Clause)2. (BSD-2-Clause OR (MIT OR Apache-2.0))2. (BSD-2-Clause OR (MIT OR Apache-2.0))3. (GPL-3.0-or-later OR MIT)3. (GPL-3.0-or-later OR MIT)4. (MIT OR Apache-2.0)4. (MIT OR Apache-2.0)5. (MPL-2.0 OR Apache-2.0)5. (MPL-2.0 OR Apache-2.0)6. (WTFPL OR MIT)6. (WTFPL OR MIT)7. 0BSD7. 0BSD8. Apache8. Apache9. Apache-2.09. Apache-2.010. Artistic-2.010. Artistic-2.011. BSD11. BSD12. BSD-2-Clause12. BSD-2-Clause13. BSD-3-Clause13. BSD-3-Clause14. CC-BY-3.014. CC-BY-3.015. CC-BY-4.015. CC-BY-4.016. ISC16. ISC17. MIT17. MIT18. Zlib18. ZlibWeaklyWeaklyprotectiveprotective1. LGPL-3.01. LGPL-3.02. MPL-2.02. MPL-2.0UncategorizedUncategorized1. jsonify (0.0.0)1. jsonify (0.0.0)MissingMissing1. boundary (1.0.1)1. boundary (1.0.1)2. structured-source (3.0.2)2. structured-source (3.0.2)3. taffydb (2.6.2)3. taffydb (2.6.2) \ No newline at end of file +License typesLicense types(all devDeps)(all devDeps)PublicPublicdomaindomain1. (MIT OR CC0-1.0)1. (MIT OR CC0-1.0)2. CC0-1.02. CC0-1.03. Unlicense3. UnlicensePermissivePermissive1. (AFL-2.1 OR BSD-3-Clause)1. (AFL-2.1 OR BSD-3-Clause)2. (BSD-2-Clause OR (MIT OR Apache-2.0))2. (BSD-2-Clause OR (MIT OR Apache-2.0))3. (GPL-3.0-or-later OR MIT)3. (GPL-3.0-or-later OR MIT)4. (MIT OR Apache-2.0)4. (MIT OR Apache-2.0)5. (MPL-2.0 OR Apache-2.0)5. (MPL-2.0 OR Apache-2.0)6. (WTFPL OR MIT)6. (WTFPL OR MIT)7. 0BSD7. 0BSD8. Apache-2.08. Apache-2.09. Artistic-2.09. Artistic-2.010. BSD10. BSD11. BSD-2-Clause11. BSD-2-Clause12. BSD-3-Clause12. BSD-3-Clause13. CC-BY-3.013. CC-BY-3.014. CC-BY-4.014. CC-BY-4.015. ISC15. ISC16. MIT16. MIT17. Zlib17. ZlibWeaklyWeaklyprotectiveprotective1. LGPL-3.01. LGPL-3.02. MPL-2.02. MPL-2.0UncategorizedUncategorized1. jsonify (0.0.0)1. jsonify (0.0.0)MissingMissing1. boundary (1.0.1)1. boundary (1.0.1)2. structured-source (3.0.2)2. structured-source (3.0.2)3. taffydb (2.6.2)3. taffydb (2.6.2) \ No newline at end of file diff --git a/lgtm.yml b/lgtm.yml index 4508ed1c..6a35056f 100644 --- a/lgtm.yml +++ b/lgtm.yml @@ -2,7 +2,7 @@ extraction: javascript: index: filters: - - exclude: "src/editor/xdomain-svgedit-config-iife.js" - - exclude: "src/editor/redirect-on-no-module-support.js" + - exclude: "src/xdomain-svgedit-config-iife.js" - exclude: "src/svgedit-config-iife.js" + - exclude: "src/editor/redirect-on-no-module-support.js" - exclude: "dist" diff --git a/package.json b/package.json index db3de27c..710a7afc 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "license-badges": "run-s license-badge license-badge-dev", "coverage-badge": "coveradge badges/coverage-badge", "compress-images": "imageoptim \"src/editor/extensions/*.png\" \"src/editor/spinbtn/*.png\" \"src/editor/jgraduate/images/*.{png,gif}\" \"src/editor/images/*.png\"", - "copy": "copyfiles -f node_modules/load-stylesheets/dist/index-es.js src/external/load-stylesheets && copyfiles -f node_modules/jamilih/dist/jml-es.js editor/external/jamilih && copyfiles -f node_modules/query-result/esm/index.js editor/external/query-result/esm && copyfiles -f node_modules/qr-manipulation/dist/index-es.js editor/external/qr-manipulation/dist && copyfiles -f node_modules/stackblur-canvas/dist/stackblur-es.js editor/external/stackblur-canvas/dist && copyfiles -f node_modules/regenerator-runtime/runtime.js editor/external/regenerator-runtime && copyfiles -f \"node_modules/core-js-bundle//minified*\" editor/external/core-js-bundle && copyfiles -f \"node_modules/underscore/underscore-*\" editor/jspdf && copyfiles -f \"node_modules/deparam/dist/deparam.esm.js\" editor/external/deparam", + "copy": "copyfiles -f node_modules/load-stylesheets/dist/index-es.js src/external/load-stylesheets && copyfiles -f node_modules/jamilih/dist/jml-es.js src/external/jamilih && copyfiles -f node_modules/query-result/esm/index.js src/external/query-result/esm && copyfiles -f node_modules/qr-manipulation/dist/index-es.js src/external/qr-manipulation/dist && copyfiles -f node_modules/stackblur-canvas/dist/stackblur-es.js src/external/stackblur-canvas/dist && copyfiles -f node_modules/regenerator-runtime/runtime.js src/external/regenerator-runtime && copyfiles -f \"node_modules/core-js-bundle//minified*\" src/external/core-js-bundle && copyfiles -f \"node_modules/underscore/underscore-*\" src/editor/jspdf && copyfiles -f \"node_modules/deparam/dist/deparam.esm.js\" src/external/deparam", "remark": "remark -q -f .", "build-html": "babel-node --plugins @babel/plugin-transform-modules-commonjs build/build-html.js", "install-offline": "npm install --prefer-offline --no-audit", diff --git a/rollup-config.config.js b/rollup-config.config.js index b7848782..66769961 100644 --- a/rollup-config.config.js +++ b/rollup-config.config.js @@ -44,7 +44,7 @@ export default [ plugins }, { - input: 'src/editor/xdomain-svgedit-config-es.js', + input: 'src/xdomain-svgedit-config-es.js', output: { format: 'iife', file: 'src/xdomain-svgedit-config-iife.js' diff --git a/src/editor/xdomain-svg-editor-es.html b/src/editor/xdomain-svg-editor-es.html index 3f601e44..6cd0e3d9 100644 --- a/src/editor/xdomain-svg-editor-es.html +++ b/src/editor/xdomain-svg-editor-es.html @@ -39,7 +39,7 @@ - + - +