diff --git a/embed.html b/embed.html
index 582ddb70..dc693321 100644
--- a/embed.html
+++ b/embed.html
@@ -56,10 +56,9 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
-
-
+
diff --git a/package-lock.json b/package-lock.json
index 5e6847a4..879ff93d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -268,9 +268,9 @@
"optional": true
},
"@types/node": {
- "version": "14.14.10",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.10.tgz",
- "integrity": "sha512-J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ==",
+ "version": "14.14.20",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.20.tgz",
+ "integrity": "sha512-Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A==",
"dev": true
},
"@types/sizzle": {
@@ -678,18 +678,26 @@
}
},
"chokidar": {
- "version": "3.4.3",
- "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz",
- "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==",
+ "version": "3.5.0",
+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.0.tgz",
+ "integrity": "sha512-JgQM9JS92ZbFR4P90EvmzNpSGhpPBGBSj10PILeDyYFwp4h2/D9OM03wsJ4zW1fEp4ka2DGrnUeD7FuvQ2aZ2Q==",
"requires": {
"anymatch": "~3.1.1",
"braces": "~3.0.2",
- "fsevents": "~2.1.2",
+ "fsevents": "~2.3.1",
"glob-parent": "~5.1.0",
"is-binary-path": "~2.1.0",
"is-glob": "~4.0.1",
"normalize-path": "~3.0.0",
"readdirp": "~3.5.0"
+ },
+ "dependencies": {
+ "fsevents": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.1.tgz",
+ "integrity": "sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==",
+ "optional": true
+ }
}
},
"chromium-pickle-js": {
@@ -1130,9 +1138,9 @@
}
},
"electron": {
- "version": "9.3.5",
- "resolved": "https://registry.npmjs.org/electron/-/electron-9.3.5.tgz",
- "integrity": "sha512-EPmDsp7sO0UPtw7nLD1ufse/nBskP+ifXzBgUg9psCUlapkzuwYi6pmLAzKLW/bVjwgyUKwh1OKWILWfOeLGcQ==",
+ "version": "9.4.0",
+ "resolved": "https://registry.npmjs.org/electron/-/electron-9.4.0.tgz",
+ "integrity": "sha512-hOC4q0jkb+UDYZRy8vrZ1IANnq+jznZnbkD62OEo06nU+hIbp2IrwDRBNuSLmQ3cwZMVir0WSIA1qEVK0PkzGA==",
"dev": true,
"requires": {
"@electron/get": "^1.0.1",
@@ -1141,9 +1149,9 @@
},
"dependencies": {
"@types/node": {
- "version": "12.19.8",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.8.tgz",
- "integrity": "sha512-D4k2kNi0URNBxIRCb1khTnkWNHv8KSL1owPmS/K5e5t8B2GzMReY7AsJIY1BnP5KdlgC4rj9jk2IkDMasIE7xg==",
+ "version": "12.19.12",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.12.tgz",
+ "integrity": "sha512-UwfL2uIU9arX/+/PRcIkT08/iBadGN2z6ExOROA2Dh5mAuWTBj6iJbQX4nekiV5H8cTrEG569LeX+HRco9Cbxw==",
"dev": true
}
}
@@ -1732,6 +1740,7 @@
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
"integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+ "dev": true,
"optional": true
},
"function-bind": {
diff --git a/package.json b/package.json
index a5c71ee8..93275bcb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "8bitworkshop",
- "version": "3.7.0",
+ "version": "3.7.1",
"author": "Steven Hugg",
"description": "8bitworkshop.com",
"repository": {
@@ -9,7 +9,7 @@
},
"license": "GPL-3.0",
"dependencies": {
- "chokidar": "^3.4.3",
+ "chokidar": "^3.5.0",
"electron-store": "^6.0.1",
"jquery": "^3.5.1",
"reflect-metadata": "^0.1.13",
@@ -20,13 +20,13 @@
"@types/bootstrap": "^3.4.0",
"@types/file-saver": "^2.0.1",
"@types/jquery": "^3.5.5",
- "@types/node": "^14.14.10",
+ "@types/node": "^14.14.20",
"atob": "^2.1.x",
"bootstrap": "^3.4.1",
"bootstrap-tourist": "^0.2.1",
"btoa": "^1.2.x",
"clipboard": "^2.0.6",
- "electron": "^9.3.5",
+ "electron": "^9.4.0",
"electron-packager": "^15.2.0",
"file-saver": "^2.0.5",
"jsdom": "^12.2.0",
diff --git a/test/cli/testgithub.js b/test/cli/testgithub.js
index 338cbb9b..2d7a5a1d 100644
--- a/test/cli/testgithub.js
+++ b/test/cli/testgithub.js
@@ -45,6 +45,26 @@ describe('Store', function() {
});
});
+ it('Should import from Github (default branch)', function(done) {
+ var store = mstore.createNewPersistentStore('nes', function(store) {
+ var gh = newGH(store, 'nes');
+ gh.importAndPull('https://github.com/sehugg/mdf2020-nes').then( (sess) => {
+ console.log(sess.paths);
+ done();
+ });
+ });
+ });
+
+ it('Should import from Github (explicit branch)', function(done) {
+ var store = mstore.createNewPersistentStore('nes', function(store) {
+ var gh = newGH(store, 'nes');
+ gh.importAndPull('https://github.com/sehugg/mdf2020-nes/tree/main').then( (sess) => {
+ console.log(sess.paths);
+ done();
+ });
+ });
+ });
+
it('Should import from Github (binary files)', function(done) {
var store = mstore.createNewPersistentStore('vcs', function(store) {
var gh = newGH(store, 'vcs');