Merge branch 'release/v2.2.1'

Author: kobalab

ChangeLog.md

@@ -1,3 +1,14 @@
+### v2.2.1 / 2023-12-26
+
+  - フラグメントでドラなしを指定された場合も動作するよう修正
+  - @kobalab/majiang-core 1.1.1 → 1.1.2
+  - @kobalab/majiang-ai 1.0.7 → 1.0.8
+  - @kobalab/majiang-ui 1.0.7 → 1.0.8
+  - パッケージを最新化
+    - webpack-cli 4.9.1 → 5.1.4
+    - stylus 0.59.0 → 0.62.0
+    - jquery 3.6.0 → 3.7.1
+
 ## v2.2.0 / 2023-12-24
 
   - #113 「点数計算ドリル」のページを追加

package-lock.json

@@ -1,11 +1,11 @@
 {
   "name": "majiang",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "HTML5 + JavaScript で動作する麻雀アプリ「電脳麻将」",
   "private": true,
   "scripts": {
     "build:html": "pug -o dist -P src/html/page/",
-    "build:css": "stylus src/css/index.styl -o dist/css/majiang-2.2.0.css",
+    "build:css": "stylus src/css/index.styl -o dist/css/majiang-2.2.1.css",
     "build:js": "webpack --mode development --devtool inline-source-map",
     "build": "npm run build:html && npm run build:css && npm run build:js",
     "release": "npm run build:html && npm run build:css && webpack --mode production",
@@ -27,13 +27,13 @@
   },
   "devDependencies": {
     "pug-cli": "^1.0.0-alpha6",
-    "stylus": "^0.59.0",
-    "webpack-cli": "^4.9.1"
+    "stylus": "^0.62.0",
+    "webpack-cli": "^5.1.4"
   },
   "dependencies": {
-    "@kobalab/majiang-ai": "^1.0.7",
-    "@kobalab/majiang-core": "^1.1.1",
-    "@kobalab/majiang-ui": "^1.0.7",
-    "jquery": "^3.6.0"
+    "@kobalab/majiang-ai": "^1.0.8",
+    "@kobalab/majiang-core": "^1.1.2",
+    "@kobalab/majiang-ui": "^1.0.8",
+    "jquery": "^3.7.1"
   }
 }

package.json

@@ -1 +1 @@
-- var version = '2.2.0'
+- var version = '2.2.1'

src/html/inc/version.pug

@@ -1,5 +1,5 @@
 /*!
- *  電脳麻将: 自動対戦 v2.2.0
+ *  電脳麻将: 自動対戦 v2.2.1
  *
  *  Copyright(C) 2017 Satoshi Kobayashi
  *  Released under the MIT license

src/js/autoplay.js

@@ -1,5 +1,5 @@
 /*!
- *  電脳麻将: 何切る解答機 v2.2.0
+ *  電脳麻将: 何切る解答機 v2.2.1
  *
  *  Copyright(C) 2017 Satoshi Kobayashi
  *  Released under the MIT license

src/js/dapai.js

@@ -1,5 +1,5 @@
 /*!
- *  電脳麻将: 点数計算ドリル v2.2.0
+ *  電脳麻将: 点数計算ドリル v2.2.1
  *
  *  Copyright(C) 2017 Satoshi Kobayashi
  *  Released under the MIT license
@@ -124,10 +124,6 @@ function parse_fragment(hash) {
     let [ paistr, baopai, fubaopai, zimo, zhuangfeng, menfeng, lizhi ]
             = hash.split('/');
     let shoupai = Majiang.Shoupai.fromString(paistr);
-    baopai      = (baopai || '').split(',');
-    fubaopai    = fubaopai ? fubaopai.split(',') : null;
-    zhuangfeng  = +(zhuangfeng || 0);
-    menfeng     = +(menfeng || 0);
     let rongpai;
     if (zimo != '1' && shoupai._zimo) {
         rongpai = shoupai._zimo + '=';
@@ -136,6 +132,11 @@ function parse_fragment(hash) {
     if (lizhi == '1') {
         shoupai._lizhi = true;
     }
+    baopai      = baopai ? baopai.split(',') : [];
+    fubaopai    = fubaopai ? fubaopai.split(',')
+                : shoupai.lizhi ? [] : null;
+    zhuangfeng  = +(zhuangfeng || 0);
+    menfeng     = +(menfeng || 0);
     return {
         shoupai:    shoupai,
         rongpai:    rongpai,

src/js/drill.js

@@ -1,5 +1,5 @@
 /*!
- *  電脳麻将: 和了点計算 v2.2.0
+ *  電脳麻将: 和了点計算 v2.2.1
  *
  *  Copyright(C) 2017 Satoshi Kobayashi
  *  Released under the MIT license

src/js/hule.js

@@ -1,5 +1,5 @@
 /*!
- *  電脳麻将 v2.2.0
+ *  電脳麻将 v2.2.1
  *
  *  Copyright(C) 2017 Satoshi Kobayashi
  *  Released under the MIT license

src/js/index.js

@@ -1,5 +1,5 @@
 /*!
- *  電脳麻将 v2.2.0
+ *  電脳麻将 v2.2.1
  *
  *  Copyright(C) 2017 Satoshi Kobayashi
  *  Released under the MIT license
@@ -9,6 +9,6 @@
 global.Majiang = require('@kobalab/majiang-core');
 global.Majiang.AI = require('@kobalab/majiang-ai');
 global.Majiang.UI = require('@kobalab/majiang-ui');
-global.Majiang.VERSION = '2.2.0';
+global.Majiang.VERSION = '2.2.1';
 global.jQuery  = require('jquery');
 global.$ = jQuery;