Merge branch 'develop' into feature/build-css

packages/assets/html/manual.html

@@ -122,6 +122,10 @@ <h2>注意</h2>
                     <li>メッセージ表示中の物体パーツのアニメーション</li>
                 </ul>
                 <p>WWA作成ツールは作者NAO氏の許可を得て再配布しております。</p>
+                <p>
+                    wwa.jsを更新したにも関わらず、古いバージョンの挙動をする場合には、wwa.jsの名前をバージョンごとに変更し、script要素で読み込むwwa.jsのファイル名を変更すると解決できるかもしれません、
+                    将来的には、ブラウザにWWA Wingのエンジン本体をキャッシュさせない機構も検討したいと考えています。
+                </p>
             </section>
 
             <section>

packages/build-utils/package.json

@@ -36,6 +36,6 @@
 		"jszip": "^3.1.5",
 		"shelljs": "^0.8.2",
 		"shx": "^0.3.2",
-		"typescript": "^2.9.2"
+		"typescript": "^3.6.3"
 	}
 }

packages/debug-server/package.json

@@ -18,6 +18,6 @@
     "nexe": "^3.0.0-beta.15",
     "shelljs": "^0.8.2",
     "shx": "^0.3.2",
-    "typescript": "^3.3.3333"
+    "typescript": "^3.6.3"
   }
 }

packages/debug-server/src/index.ts

@@ -1,4 +1,4 @@
-import * as express from "express";
+import express from "express";
 
 const baseDir = process.argv.length < 3 ? "." : process.argv[2];
 

packages/engine/package.json

@@ -10,7 +10,7 @@
     "version_up:minor": "npm version minor && npm run build",
     "version_up:major": "npm version major && npm run build",
     "build": "npm-run-all clean build:*",
-    "build:webpack": "webpack --config webpack.config.js && webpack --config webpack.config.prod.js",
+    "build:webpack": "webpack --config webpack.config.ts && webpack --config webpack.config.prod.ts",
     "build:webpack:dev": "webpack -w",
     "deploy": "shx mkdir -p lib && npm-run-all deploy:*",
     "deploy:audio": "shx cp -R ./node_modules/@wwawing/assets/audio lib/",
@@ -38,6 +38,8 @@
   "homepage": "https://github.com/WWAWing/WWAWing#readme",
   "devDependencies": {
     "@types/crypto-js": "^3.1.43",
+    "@types/uglifyjs-webpack-plugin": "^1.1.0",
+    "@types/webpack": "^4.39.1",
     "@wwawing/assets": "0.0.0",
     "@wwawing/common-interface": "0.0.0",
     "@wwawing/debug-server": "0.0.0",
@@ -48,10 +50,11 @@
     "shelljs": "^0.8.2",
     "shx": "^0.3.2",
     "ts-loader": "^4.3.0",
-    "typescript": "^2.9.2",
+    "ts-node": "^8.4.1",
+    "typescript": "^3.6.3",
     "uglify-js": "^3.3.27",
     "uglifyjs-webpack-plugin": "^1.2.5",
-    "webpack": "^4.20.2",
-    "webpack-cli": "^3.1.1"
+    "webpack": "^4.40.2",
+    "webpack-cli": "^3.3.9"
   }
 }

packages/engine/webpack.config.prod.ts

@@ -0,0 +1,24 @@
+import * as webpack from "webpack";
+import config from "./webpack.config";
+import UglifyJsPlugin from "uglifyjs-webpack-plugin";
+
+export default {
+    ...config,
+    output: {
+        ...config.output,
+        pathinfo: false,
+        filename: "wwa.js"
+    },
+    plugins: [
+        ...config.plugins,
+        new UglifyJsPlugin({
+            uglifyOptions:{
+                keep_fnames: false,
+                compress: {
+                    warnings: false
+                }
+            },
+            extractComments: false
+        })
+    ],
+} as webpack.Configuration;

packages/engine/webpack.config.js → packages/engine/webpack.config.ts

@@ -1,6 +1,6 @@
-const webpack = require("webpack");
-const path = require("path");
-const package = require("./package.json");
+import * as webpack from "webpack";
+import * as path from "path";
+import * as packageJson from "./package.json";
 
 const cryptoJsLicenseComment = `crypto-js\
  (c) Jeff Mott / Evan Vosberg /\
@@ -10,7 +10,7 @@ const wwaWingEngineLicenseComment = `WWA Wing Engine\
  (c) NAO / WWA Wing Team /\
  MIT License https://github.com/WWAWing/WWAWing/blob/develop/packages/engine/LICENSE`;
 
-module.exports = {
+const config: webpack.Configuration = {
     mode: "development",
     entry: "./src/wwa_main.ts",
     output: {
@@ -31,7 +31,7 @@ module.exports = {
     },
     plugins: [
         new webpack.DefinePlugin({
-            VERSION_WWAJS: JSON.stringify(package.version)
+            VERSION_WWAJS: JSON.stringify(packageJson.version)
         }),
         new webpack.BannerPlugin({
             banner: `@license ${wwaWingEngineLicenseComment}\n@license ${cryptoJsLicenseComment}`
@@ -41,3 +41,5 @@ module.exports = {
         ignored: ["node_modules", 'lib/**/*.js']
     }
 };
+
+export default config;

packages/loader/package.json

@@ -13,10 +13,10 @@
     "build": "npm run clean && npm run build:worker && npm run build:noworker",
     "build:worker": "npm run build:worker:dev && npm run build:worker:prod",
     "build:worker:dev": "webpack",
-    "build:worker:prod": "webpack --config ./webpack.config.prod.js",
+    "build:worker:prod": "webpack --config ./webpack.config.prod.ts",
     "build:noworker": "npm run build:noworker:dev && npm run build:noworker:prod",
-    "build:noworker:dev": "webpack --config ./webpack.config.noworker.js",
-    "build:noworker:prod": "webpack --config ./webpack.config.prod.noworker.js",
+    "build:noworker:dev": "webpack --config ./webpack.config.noworker.ts",
+    "build:noworker:prod": "webpack --config ./webpack.config.prod.noworker.ts",
     "clean": "shx rm -rf lib"
   },
   "repository": {
@@ -30,16 +30,18 @@
   },
   "homepage": "https://github.com/WWAWing/WWALoader#readme",
   "devDependencies": {
+    "@types/uglifyjs-webpack-plugin": "^1.1.0",
     "@wwawing/common-interface": "0.0.0",
     "http-server": "^0.10.0",
     "npm-run-all": "^4.1.5",
     "shelljs": "^0.8.2",
     "shx": "^0.3.2",
     "ts-loader": "^4.3.0",
-    "typescript": "^2.9.2",
+    "ts-node": "^8.4.1",
+    "typescript": "^3.6.3",
     "uglify-js": "^3.3.27",
     "uglifyjs-webpack-plugin": "^1.2.5",
-    "webpack": "^4.20.2",
-    "webpack-cli": "^3.1.1"
+    "webpack": "^4.40.2",
+    "webpack-cli": "^3.3.9"
   }
 }

packages/loader/webpack.config.noworker.ts

@@ -0,0 +1,16 @@
+import config from "./webpack.config";
+import * as webpack from "webpack";
+
+export default {
+    ...config,
+    plugins: [
+        ...config.plugins,
+        new webpack.DefinePlugin({
+            IS_WEB_WORKER_MODE: JSON.stringify(false)
+        })
+    ],
+    output: {
+        ...config.output,
+        filename: "wwaload.long.noworker.js"
+    }
+} as webpack.Configuration;

packages/loader/webpack.config.prod.noworker.ts

@@ -0,0 +1,16 @@
+import config from "./webpack.config.prod";
+import * as webpack from "webpack";
+
+export default {
+    ...config,
+    plugins: [
+        ...config.plugins,
+        new webpack.DefinePlugin({
+            IS_WEB_WORKER_MODE: JSON.stringify(false)
+        })
+    ],
+    output: {
+        ...config.output,
+        filename: "wwaload.noworker.js"
+    }
+} as webpack.Configuration;

packages/loader/webpack.config.prod.ts

@@ -0,0 +1,24 @@
+import * as webpack from "webpack";
+import config from "./webpack.config";
+import UglifyJsPlugin from "uglifyjs-webpack-plugin";
+
+export default {
+    ...config,
+    output: {
+        ...config.output,
+        pathinfo: false,
+        filename: "wwaload.js"
+    },
+    plugins: [
+        ...config.plugins,
+        new UglifyJsPlugin({
+            uglifyOptions:{
+                keep_fnames: false,
+                compress: {
+                    warnings: false
+                }
+            },
+            extractComments: false
+        })
+    ],
+} as webpack.Configuration;

packages/loader/webpack.config.js → packages/loader/webpack.config.ts

@@ -1,7 +1,7 @@
-const webpack = require("webpack");
-const path = require("path");
+import * as webpack from "webpack";
+import * as path from "path";
 
-module.exports = {
+const config: webpack.Configuration =  {
     mode: "development",
     entry: "./src/index.ts",
     output: {
@@ -26,3 +26,5 @@ module.exports = {
         })
     ]
 };
+
+export default config;

tsconfig.json

@@ -15,5 +15,7 @@
       "removeComments": true,
       "experimentalDecorators": true,
       "noLib": false,
+      "esModuleInterop": true,
+      "resolveJsonModule": true
     },
   }