Merge pull request #30 from SVG-Edit/V7-preview

V7 preview

README.md

@@ -50,6 +50,12 @@ We also build a systemJS version at [`master`](https://svg-edit.github.io/svgedi
 
 You may also obtain URLs for specific [releases](https://github.com/SVG-Edit/svgedit/releases).
 
+Thanks to netlify, you can test the following versions: 
+
+latest master build (V6): https://svgedit.netlify.app/editor/index.html
+
+V7 preview (under development): https://deploy-preview-465--svgedit.netlify.app/editor/index.html
+
 ## Installation
 
 ### Quick install

dist/editor/index.html

@@ -12,7 +12,7 @@
 
   <!-- STYLESHEETS (others loaded dynamically) -->
   <style id="styleoverrides" media="screen"></style>
-  <link href="svgedit.css" rel="stylesheet" media="all">
+  <link href="./svgedit.css" rel="stylesheet" media="all">
   </link>
 
   <!-- SCRIPTS -->
@@ -22,7 +22,7 @@
 
   <!-- If you do not wish to add extensions by URL, you can add calls
       within the following file to svgEditor.setConfig -->
-  <script type="module" src="index.js"></script>
+  <script type="module" src="./index.js"></script>
 
   <title>SVG-edit</title>
 </head>

dist/editor/system/index.html

@@ -12,7 +12,7 @@
 
   <!-- STYLESHEETS (others loaded dynamically) -->
   <style id="styleoverrides" media="screen"></style>
-  <link href="svgedit.css" rel="stylesheet" media="all">
+  <link href="./svgedit.css" rel="stylesheet" media="all">
   </link>
 
   <!-- SCRIPTS -->
@@ -22,14 +22,7 @@
 
   <!-- If you do not wish to add extensions by URL, you can add calls
       within the following file to svgEditor.setConfig -->
-  <script>
+  <script type="module" src="./index.js"></script>
-              const systemJsLoaderTag = document.createElement('script');
-              systemJsLoaderTag.src = './s.min.js';
-              systemJsLoaderTag.addEventListener('load', function () {
-                System.import('./index.js');
-                });
-              document.head.appendChild(systemJsLoaderTag);
-              </script>
 
   <title>SVG-edit</title>
 </head>

dist/editor/xdomain-index.html

@@ -12,7 +12,7 @@
 
   <!-- STYLESHEETS (others loaded dynamically) -->
   <style id="styleoverrides" media="screen"></style>
-  <link href="svgedit.css" rel="stylesheet" media="all">
+  <link href="./svgedit.css" rel="stylesheet" media="all">
   </link>
 
   <!-- SCRIPTS -->
@@ -22,7 +22,7 @@
 
   <!-- If you do not wish to add extensions by URL, you can add calls
       within the following file to svgEditor.setConfig -->
-  <script type="module" src="xdomain-index.js"></script>
+  <script type="module" src="./index.js"></script>
 
   <title>SVG-edit</title>
 </head>

netlify.toml

@@ -16,12 +16,17 @@
 
 # Production context: all deploys from the Production branch set in your site's
 # deploy contexts will inherit these settings.
+[context."v7-preview"]
+  publish = "/"
+
+[context."release-v6.0.0"]
+  publish = "/"
+  command = "echo 'branch release-v6.0.0 already built'"
+
 [context."release-v5.1.0"]
   publish = "/"
   command = "echo 'branch release-v5.1.0 already built'"
 
-# Production context: all deploys from the Production branch set in your site's
-# deploy contexts will inherit these settings.
 [context.master]
   publish = "/"
   command = "echo 'already built'"

package-lock.json

@@ -3448,6 +3448,16 @@
         }
       }
     },
+    "@rollup/plugin-inject": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-inject/-/plugin-inject-4.0.2.tgz",
+      "integrity": "sha512-TSLMA8waJ7Dmgmoc8JfPnwUwVZgLjjIAM6MqeIFqPO2ODK36JqE0Cf2F54UTgCUuW8da93Mvoj75a6KAVWgylw==",
+      "requires": {
+        "@rollup/pluginutils": "^3.0.4",
+        "estree-walker": "^1.0.1",
+        "magic-string": "^0.25.5"
+      }
+    },
     "@rollup/plugin-node-resolve": {
       "version": "11.0.1",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.0.1.tgz",
@@ -3516,7 +3526,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
       "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
-      "dev": true,
       "requires": {
         "@types/estree": "0.0.39",
         "estree-walker": "^1.0.1",
@@ -3665,8 +3674,7 @@
     "@types/estree": {
       "version": "0.0.39",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
-      "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
+      "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="
-      "dev": true
     },
     "@types/express": {
       "version": "4.17.9",
@@ -7369,14 +7377,14 @@
       }
     },
     "core-js": {
-      "version": "3.7.0",
+      "version": "3.8.2",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.8.2.tgz",
-      "integrity": "sha512-NwS7fI5M5B85EwpWuIwJN4i/fbisQUwLwiSNUWeXlkAZ0sbBjLEvLvFLf1uzAUV66PcEPt4xCGCmOZSxVf3xzA=="
+      "integrity": "sha512-FfApuSRgrR6G5s58casCBd9M2k+4ikuu4wbW6pJyYU7bd9zvFc9qf7vr5xmrZOhT9nn+8uwlH1oRR9jTnFoA3A=="
     },
     "core-js-bundle": {
-      "version": "3.7.0",
+      "version": "3.8.2",
-      "resolved": "https://registry.npmjs.org/core-js-bundle/-/core-js-bundle-3.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/core-js-bundle/-/core-js-bundle-3.8.2.tgz",
-      "integrity": "sha512-dxWbbGslTVI8RP2wFGw6llMbw7LD+R0NJHj7WnLrdtpLiZ6YcTdn/7uNEVBIfxi1PH7q4Kt48TbB8gwwZFvrJQ==",
+      "integrity": "sha512-pTwrW41+ISaAY9JbJISKdTpOCZ+vMdM9ygd6hG9yolYwbOLb8UqTLsZwpRH9/Nv14pdKgMtJXd7Tn3xDsuhRBA==",
       "dev": true
     },
     "core-js-compat": {
@@ -9989,8 +9997,7 @@
     "estree-walker": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
-      "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
+      "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg=="
-      "dev": true
     },
     "esutils": {
       "version": "2.0.3",
@@ -14031,7 +14038,6 @@
       "version": "0.25.7",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
       "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
-      "dev": true,
       "requires": {
         "sourcemap-codec": "^1.4.4"
       }
@@ -17074,7 +17080,7 @@
       "dev": true
     },
     "qr-manipulation": {
-      "version": "git+https://github.com/brettz9/qr-manipulation.git#f3dd92f4db007b2195ab1477757db74d598c3fdc",
+      "version": "git+https://github.com/brettz9/qr-manipulation.git#fc28c633c6b4caf3489508dc42c013dd0d8a43f8",
       "from": "git+https://github.com/brettz9/qr-manipulation.git",
       "dev": true
     },
@@ -18086,6 +18092,14 @@
         "rollup-plugin-inject": "^3.0.0"
       }
     },
+    "rollup-plugin-polyfill-node": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-polyfill-node/-/rollup-plugin-polyfill-node-0.4.1.tgz",
+      "integrity": "sha512-PxON/asmp3BuBaJPUToUQSq3RA6MpDma0zlK+NuQoBgxImMOPjVeelkdLYh0EWo9ZSJbCqDDkckAAM0wOwvysQ==",
+      "requires": {
+        "@rollup/plugin-inject": "^4.0.0"
+      }
+    },
     "rollup-plugin-progress": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/rollup-plugin-progress/-/rollup-plugin-progress-1.1.2.tgz",
@@ -18768,8 +18782,7 @@
     "sourcemap-codec": {
       "version": "1.4.8",
       "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
-      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
-      "dev": true
     },
     "spawn-wrap": {
       "version": "2.0.0",

package.json

@@ -137,10 +137,11 @@
     "@babel/polyfill": "7.12.1",
     "@web/dev-server-rollup": "0.3.1",
     "canvg": "3.0.7",
-    "core-js": "3.7.0",
+    "core-js": "3.8.2",
     "jspdf": "2.1.1",
     "pathseg": "1.2.0",
     "regenerator-runtime": "0.13.7",
+    "rollup-plugin-polyfill-node": "^0.4.1",
     "svg2pdf.js": "2.0.0"
   },
   "devDependencies": {
@@ -163,7 +164,7 @@
     "axe-core": "4.1.1",
     "babel-plugin-transform-object-rest-spread": "7.0.0-beta.3",
     "copyfiles": "2.4.0",
-    "core-js-bundle": "3.7.0",
+    "core-js-bundle": "3.8.2",
     "coveradge": "0.6.0",
     "cp-cli": "2.0.0",
     "cross-var": "1.1.0",

rollup.config.js

@@ -9,7 +9,7 @@ import babel from '@rollup/plugin-babel';
 import copy from 'rollup-plugin-copy';
 import {nodeResolve} from '@rollup/plugin-node-resolve';
 import commonjs from '@rollup/plugin-commonjs';
-import nodePolyfills from 'rollup-plugin-node-polyfills';
+import nodePolyfills from 'rollup-plugin-polyfill-node';
 import url from '@rollup/plugin-url'; // for XML/SVG files
 import dynamicImportVars from '@rollup/plugin-dynamic-import-vars';
 import {terser} from 'rollup-plugin-terser';

src/editor/index.html

@@ -12,7 +12,7 @@
 
   <!-- STYLESHEETS (others loaded dynamically) -->
   <style id="styleoverrides" media="screen"></style>
-  <link href="svgedit.css" rel="stylesheet" media="all">
+  <link href="./svgedit.css" rel="stylesheet" media="all">
   </link>
 
   <!-- SCRIPTS -->
@@ -22,7 +22,7 @@
 
   <!-- If you do not wish to add extensions by URL, you can add calls
       within the following file to svgEditor.setConfig -->
-  <script type="module" src="index.js"></script>
+  <script type="module" src="./index.js"></script>
 
   <title>SVG-edit</title>
 </head>