From b7fccd59d522cd92eef562d9468516ae523ef2e8 Mon Sep 17 00:00:00 2001 From: JFH Date: Sat, 25 Jul 2020 15:32:59 +0200 Subject: [PATCH] adapt to new folder structure --- CHANGES.md | 1 + lgtm.yml | 4 ++-- licenseInfo.json | 2 +- package.json | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 46cfb1db..9d088c99 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -72,6 +72,7 @@ - Refactoring: Move `build-html` to `build` directory - Refactoring: Add favicon no-op to suppress favicon 404s until loaded dynamically (might make configurable in future) +- Refactoring: create a src folder and subfolders for svgcanvas, editor, common and externals. - Linting (ESLint): Simplify regexes - Linting (ESLint): Replace `innerHTML` with `textContent` from old demo - Linting (ESLint): Update as per latest ash-nazg diff --git a/lgtm.yml b/lgtm.yml index 544fd6e8..4bce3aa3 100644 --- a/lgtm.yml +++ b/lgtm.yml @@ -2,7 +2,7 @@ extraction: javascript: index: filters: - - exclude: "editor/xdomain-svgedit-config-iife.js" - - exclude: "editor/redirect-on-no-module-support.js" + - exclude: "src/editor/xdomain-svgedit-config-iife.js" + - exclude: "src/editor/redirect-on-no-module-support.js" - exclude: "svgedit-config-iife.js" - exclude: "dist" diff --git a/licenseInfo.json b/licenseInfo.json index 4744dc1e..9d97f1f3 100644 --- a/licenseInfo.json +++ b/licenseInfo.json @@ -14,7 +14,7 @@ "(MIT OR GPL-2.0)": ["src/editor/jquery-ui/jquery-ui-1.8.17.custom.min.js", "src/editor/jquerybbq/jquery.bbq.min.js", "src/editor/js-hotkeys/jquery.hotkeys.min.js"], "(MIT OR GPL-2.0-or-later)": ["src/editor/contextmenu/jQuery.contextMenu.js", "src/editor/extensions/ext-server_moinsave.js"], "Apache-2.0": ["src/editor/contextmenu.js", "src/editor/extensions/ext-foreignobject.js", "src/editor/extensions/ext-grid.js", "src/editor/extensions/ext-markers.js", "screencasts/svgopen2010/index.html", "src/editor/jgraduate/jQuery.jGraduate.js", "src/editor/extensions/mathjax/MathJax.min.js", "src/editor/extensions/mathjax/TeX-AMS-MML_SVG.js"], - "ISC": ["external/query-result/esm/index.js"], + "ISC": ["src/external/query-result/esm/index.js"], "LGPL-3.0-or-later": ["src/editor/jspdf/jspdf.plugin.svgToPdf.js"], "X11": ["src/editor/jspdf/jspdf.min.js"] } diff --git a/package.json b/package.json index 429fcbce..cba8af7a 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "prep": "run-s prep-no-core-rollup rollup", "prepublishOnly": "run-s license-badges copy prep build-docs", "cypress:open-no-start": "cypress open", - "cy:instrument": "rm -rf instrumented && cp -r src instrumented && nyc instrument --compact false src instrumented", + "cy:instrument": "rimraf instrumented && cp -r src instrumented && nyc instrument --compact false src instrumented", "cypress:open": "run-p start cypress:open-no-start", "open-tests": "run-s cy:instrument cypress:open", "cypress:merge": "mochawesome-merge \"cypress/results/mochaw*.json\" > mochawesome.json && marge mochawesome.json && mbg --file ./mochawesome.json --badge_output badges/tests-badge.svg",