Merge

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Twine",
-  "version": "2.1.3",
+  "version": "2.2.0-beta1",
   "author": "Chris Klimas <[email protected]>",
   "description": "a GUI for creating nonlinear stories",
   "license": "GPL-3.0",
@@ -21,12 +21,12 @@
     "build:release": "webpack -p --progress --config webpack.config.release.js && webpack -p --progress --config webpack.config.cdn.js",
     "clean": "rimraf build/ dist/",
     "lint": "eslint src/ || exit 0",
-    "lint:noisy": "eslint src/",        
+    "lint:noisy": "eslint src/",
     "nw": "node scripts/build-nw.js",
     "package": "npm run build:release && npm run nw && node scripts/package.js",
     "pot": "node scripts/extract-pot.js",
     "start": "webpack-dev-server --inline --hot",
-    "test": "karma start",
+    "test": "mocha-webpack --webpack-config webpack.config.test.js -r \"jsdom-global/register\"  -r mock-local-storage \"src/**/*.spec.js\"",
     "watch": "webpack -d --progress --watch"
   },
   "dependencies": {
@@ -41,68 +41,71 @@
     "font-awesome": "^4.3.0",
     "html-webpack-plugin": "^2.28.0",
     "jed": "^1.1.0",
-    "jquery": "^2.1.4",
+    "jsonp": "^0.2.1",
     "jszip": "^2.5.0",
-    "karma-webpack": "^1.8.1",
+    "karma-webpack": "^2.0.4",
+    "lodash.escape": "^4.0.1",
+    "lodash.uniq": "^4.5.0",
+    "lodash.values": "^4.3.0",
+    "lodash.without": "^4.4.0",
     "mkdirp": "^0.5.1",
     "moment": "^2.10.3",
     "osenv": "^0.1.3",
-    "scroll-to-element": "^2.0.0",
+    "scroll": "^2.0.0",
     "segseg": "^0.2.2",
     "semver-utils": "^1.1.1",
-    "svg.js": "^1.0.1",
     "tether-drop": "^1.4.2",
     "tiny-uuid": "^1.0.0",
-    "underscore": "^1.8.3",
+    "unfetch": "^3.0.0",
     "vue": "^1.0.18",
     "vue-router": "^0.7.13",
-    "vuex": "^1.0.0",
-    "webpack": "^2.2.1",
-    "webpack-dev-server": "^1.16.3"
+    "vuex": "^1.0.0"
   },
   "devDependencies": {
     "acorn": "^4.0.3",
-    "babel-core": "^6.18.2",
-    "babel-loader": "^6.2.8",
+    "babel-core": "^6.26.0",
+    "babel-loader": "^7.1.0",
     "babel-preset-es2015": "^6.18.0",
     "base64-font-loader": "0.0.4",
     "chai": "^3.5.0",
+    "cheerio": "^1.0.0-rc.2",
     "chmodr": "^1.0.2",
     "copy-webpack-plugin": "^4.0.1",
-    "css-loader": "^0.26.0",
+    "css-loader": "^0.28.7",
     "ejs": "^2.5.2",
     "ejs-loader": "^0.3.0",
     "eslint": "^3.10.2",
     "estraverse": "^4.2.0",
-    "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.9.0",
+    "extract-text-webpack-plugin": "^2.1.2",
+    "file-loader": "^0.11.2",
     "fs-extra": "^1.0.0",
     "glob": "^7.1.1",
-    "html-loader": "^0.4.4",
-    "html-webpack-plugin": "^2.24.1",
+    "html-loader": "^0.5.1",
+    "html-webpack-plugin": "^2.30.1",
     "htmlparser2": "^3.9.2",
-    "json-loader": "^0.5.4",
-    "karma": "^1.3.0",
-    "karma-cli": "^1.0.1",
-    "karma-mocha": "^1.3.0",
-    "karma-mocha-reporter": "^2.2.2",
-    "karma-phantomjs-launcher": "^1.0.2",
-    "karma-webpack": "^1.8.0",
+    "jsdom": "^11.2.0",
+    "jsdom-global": "^3.0.2",
+    "json-loader": "^0.5.7",
+    "karma-webpack": "^2.0.4",
     "less": "^2.7.1",
-    "less-loader": "^2.2.3",
+    "less-loader": "^4.0.5",
     "less-plugin-autoprefix": "^1.5.1",
     "less-plugin-clean-css": "^1.5.1",
     "mocha": "^3.2.0",
+    "mocha-webpack": "^0.7.0",
+    "mock-local-storage": "^1.0.4",
+    "null-loader": "^0.1.1",
     "nw-builder": "^3.2.0",
     "po2json": "^0.4.5",
     "pofile": "^1.0.2",
     "raw-loader": "^0.5.1",
     "rimraf": "^2.5.4",
-    "sinon": "^2.0.0-pre.4",
-    "style-loader": "^0.13.1",
-    "url-loader": "^0.5.7",
-    "webpack": "^2.2.0",
-    "webpack-dev-server": "^1.16.2",
+    "sinon": "^3.2.1",
+    "style-loader": "^0.18.2",
+    "url-loader": "^0.5.9",
+    "webpack": "^3.5.5",
+    "webpack-dev-server": "^2.7.1",
+    "webpack-node-externals": "^1.6.0",
     "yargs": "^6.6.0"
   }
 }

scripts/build-nw.js

@@ -13,7 +13,7 @@ fsExtra.copySync('package.json', 'dist/web/package.json');
 var nw = new NwBuilder({
 	files: 'dist/web/**',
 	platforms: platforms,
-	version: '0.21.3',
+	version: '0.25.4',
 	buildDir: 'dist/nw',
 	cacheDir: 'nw-cache/',
 	macIcns: 'src/common/img/logo.icns',

src/common/app/index.js

@@ -3,7 +3,8 @@
 'use strict';
 const Vue = require('vue');
 const ui = require('../../ui');
-const { repairFormats, repairStories } = require('../../data/actions');
+const { repairFormats } = require('../../data/actions/story-format');
+const { repairStories } = require('../../data/actions/story');
 const store = require('../../data/store');
 
 module.exports = Vue.extend({

src/common/app/update-check.js

@@ -1,7 +1,7 @@
 /**
  Checks for a newer version of the Twine app against
- https://twinery.org/latestversion/2.json, using build numbers which
- are automatically generated by Grunt.
+ https://twinery.org/latestversion/2.json, using build numbers which are
+ automatically generated.
 
  If retrieving this information fails, then this does nothing.
 
@@ -17,12 +17,14 @@
 	 URL the download is available at.
 **/
 
-const $ = require('jquery');
+const fetch = require('unfetch').default;
 
 module.exports = function(latestBuildNumber, callback) {
-	$.getJSON('https://twinery.org/latestversion/2.json', data => {
-		if (data.buildNumber > latestBuildNumber) {
-			callback(data);
-		}
-	});
+	fetch('https://twinery.org/latestversion/2.json')
+		.then(r => r.json())
+		.then(data => {
+			if (data.buildNumber > latestBuildNumber) {
+				callback(data);
+			}
+		});
 };

src/common/colors.less

@@ -30,3 +30,12 @@
 /* color used for borders around form elements */
 @color-form-line: lighten(@color-text, 55%);
 @color-form-line-dark: darken(@color-text-dark, 25%);
+
+/* tag colors */
+@color-tag-blue: @color-link;
+@color-tag-red: @color-danger;
+@color-tag-orange: spin(@color-tag-red, 25);
+@color-tag-yellow: spin(@color-tag-orange, 25);
+@color-tag-green: @color-create;
+@color-tag-purple: spin(@color-tag-blue, 60);
+@color-tag-gray: lighten(desaturate(@color-tag-blue, 100), 20);

src/common/router.js

@@ -6,7 +6,7 @@ const LocaleView = require('../locale/view');
 const StoryEditView = require('../story-edit-view');
 const StoryListView = require('../story-list-view');
 const WelcomeView = require('../welcome');
-const { loadFormat } = require('../data/actions');
+const { loadFormat } = require('../data/actions/story-format');
 const { publishStoryWithFormat } = require('../data/publish');
 const replaceUI = require('../ui/replace');
 const store = require('../data/store');