From ba916728f00ca0e4caf3d6e4faa43e353a755083 Mon Sep 17 00:00:00 2001 From: Steven Hugg Date: Sat, 1 Aug 2020 12:35:27 -0500 Subject: [PATCH] updated npm, copy deps from node_modules/ to lib/ --- .gitmodules | 6 - FileSaver.js | 1 - Makefile | 12 +- electron.html | 9 +- index.html | 9 +- lib/FileSaver.min.js | 3 + lib/browser-detect.umd.js | 652 -------------------------------------- lib/clipboard.min.js | 6 +- lib/jszip.min.js | 8 +- lib/localforage.min.js | 7 + lib/mousetrap.min.js | 22 +- lib/split.min.js | 5 +- localForage | 1 - package-lock.json | 113 +++++-- package.json | 15 +- src/ide/ui.ts | 1 - 16 files changed, 150 insertions(+), 720 deletions(-) delete mode 160000 FileSaver.js create mode 100644 lib/FileSaver.min.js delete mode 100644 lib/browser-detect.umd.js create mode 100644 lib/localforage.min.js delete mode 160000 localForage diff --git a/.gitmodules b/.gitmodules index 63acb6df..f8488a10 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,15 +7,9 @@ [submodule "tss"] path = tss url = https://github.com/sehugg/tss -[submodule "FileSaver.js"] - path = FileSaver.js - url = https://github.com/eligrey/FileSaver.js [submodule "gif.js"] path = gif.js url = https://github.com/sehugg/gif.js -[submodule "localForage"] - path = localForage - url = https://github.com/localForage/localForage [submodule "jsnes"] path = jsnes url = https://github.com/sehugg/jsnes diff --git a/FileSaver.js b/FileSaver.js deleted file mode 160000 index aa9f4e0e..00000000 --- a/FileSaver.js +++ /dev/null @@ -1 +0,0 @@ -Subproject commit aa9f4e0e03bd1892482ff5e24ca91d42312dbf18 diff --git a/Makefile b/Makefile index c602cd48..231b2c5d 100644 --- a/Makefile +++ b/Makefile @@ -3,11 +3,19 @@ TSC=./node_modules/typescript/bin/tsc --build TMP=./tmp/dist all: + patch -i electron.diff -o electron.html cp nanoasm/src/assembler.ts src/worker/ + cp node_modules/bootstrap-tourist/*.css node_modules/bootstrap-tourist/*.js ./lib/ + cp node_modules/clipboard/dist/clipboard.min.js ./lib/ + cp node_modules/mousetrap/mousetrap*.min.js ./lib/ + #cp node_modules/octokat/dist/octokat.js ./lib/ + cp node_modules/split.js/dist/split.min.js ./lib/ + cp node_modules/localforage/dist/localforage.min.js ./lib/ + cp node_modules/jszip/dist/jszip.min.js ./lib/ + cp node_modules/file-saver/dist/*.min.js ./lib/ + cd jsnes && npm i $(TSC) -v $(TSC) - cd jsnes && npm i - patch -i electron.diff -o electron.html dist: rm -fr $(TMP) && mkdir -p $(TMP) diff --git a/electron.html b/electron.html index 9ce918f9..23591966 100644 --- a/electron.html +++ b/electron.html @@ -349,9 +349,6 @@ body { - - - @@ -375,11 +372,13 @@ body { - - + + + + - - - @@ -570,11 +567,13 @@ if (window.location.host.endsWith('8bitworkshop.com')) { - - + + + +