Latest ink (0.9.0), latest inkjs (1.10.2)

inkle · Jun 10, 2019 · 3358ea2 · 3358ea2
1 parent ad16a98
commit 3358ea2
Show file tree

Hide file tree

Showing 21 changed files with 40 additions and 7,033 deletions.
diff --git a/app/export-for-web-template/hacked-inkjs-1.7.1.js b/app/export-for-web-template/hacked-inkjs-1.7.1.js
diff --git a/app/main-process/ink/ink-engine-runtime.dll b/app/main-process/ink/ink-engine-runtime.dll
diff --git a/app/main-process/ink/ink-engine-runtime.pdb b/app/main-process/ink/ink-engine-runtime.pdb
diff --git a/app/main-process/ink/ink_compiler.dll b/app/main-process/ink/ink_compiler.dll
diff --git a/app/main-process/ink/ink_compiler.pdb b/app/main-process/ink/ink_compiler.pdb
diff --git a/app/main-process/ink/inkjs-compatible/ink-engine-runtime.dll b/app/main-process/ink/inkjs-compatible/ink-engine-runtime.dll
diff --git a/app/main-process/ink/inkjs-compatible/ink-engine-runtime.pdb b/app/main-process/ink/inkjs-compatible/ink-engine-runtime.pdb
diff --git a/app/main-process/ink/inkjs-compatible/ink_compiler.dll b/app/main-process/ink/inkjs-compatible/ink_compiler.dll
diff --git a/app/main-process/ink/inkjs-compatible/ink_compiler.dll.mdb b/app/main-process/ink/inkjs-compatible/ink_compiler.dll.mdb
diff --git a/app/main-process/ink/inkjs-compatible/ink_compiler.pdb b/app/main-process/ink/inkjs-compatible/ink_compiler.pdb
diff --git a/app/main-process/ink/inkjs-compatible/inkjs-version.txt b/app/main-process/ink/inkjs-compatible/inkjs-version.txt
@@ -1,4 +1,4 @@
-inkjs is currently:     1.7.1
-compatible with ink:    0.8.1 + 9c7c6552653104f853652f3f3ad86249cde5e106
+inkjs is currently:     1.10.0
+compatible with ink:    1.10.0
 
 ..which is the version of inklecate in this folder.
diff --git a/app/main-process/ink/inkjs-compatible/inklecate.pdb b/app/main-process/ink/inkjs-compatible/inklecate.pdb
diff --git a/app/main-process/ink/inkjs-compatible/inklecate_mac b/app/main-process/ink/inkjs-compatible/inklecate_mac
diff --git a/app/main-process/ink/inkjs-compatible/inklecate_win.exe b/app/main-process/ink/inkjs-compatible/inklecate_win.exe
diff --git a/app/main-process/ink/inklecate.pdb b/app/main-process/ink/inklecate.pdb
diff --git a/app/main-process/ink/inklecate_mac b/app/main-process/ink/inklecate_mac
diff --git a/app/main-process/ink/inklecate_win.exe b/app/main-process/ink/inklecate_win.exe
diff --git a/app/main-process/ink/version.txt b/app/main-process/ink/version.txt
@@ -1 +1 @@
-0.8.2
+0.9.0
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "inky",
   "productName": "Inky",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "An editor for ink",
   "main": "main-process/main.js",
   "scripts": {
@@ -35,7 +35,7 @@
   "dependencies": {
     "chokidar": "^2.0.4",
     "fuzzaldrin-plus": "^0.5",
-    "inkjs": "^1.7.1",
+    "inkjs": "^1.10.2",
     "lodash": "^4.17.10",
     "mkdirp": "^0.5.1",
     "randomstring": "^1.1.5"

diff --git a/app/renderer/inkProject.js b/app/renderer/inkProject.js
@@ -426,13 +426,9 @@ InkProject.prototype.buildForWeb = function(jsonFilePath, targetDirectory) {
         return fileContent;
     });
 
-
-
     // Copy other files verbatim
-    // copyFile(path.join(__dirname, "../node_modules/inkjs/dist/ink.js"), 
-    //          path.join(targetDirectory, "ink.js"));
-    copyFile(path.join(templateDir, "hacked-inkjs-1.7.1.js"), 
-            path.join(targetDirectory, "ink.js"));
+    copyFile(path.join(__dirname, "../node_modules/inkjs/dist/ink.js"),
+             path.join(targetDirectory, "ink.js"));
 
     copyFile(path.join(templateDir, "style.css"), 
              path.join(targetDirectory, "style.css"));