From 02bca34725be72915b93e3e3e5d726781146e6ff Mon Sep 17 00:00:00 2001 From: Harmen Date: Sat, 18 Apr 2020 09:14:55 +0200 Subject: [PATCH 01/31] update travis npm to something more recent --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 21dd22db7..ac31b01a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: node_js -node_js: 6 +node_js: 10 script: - npm run-script build - npm test From 5a51d4a63975e7de2b6f1e04775f614127a73e6e Mon Sep 17 00:00:00 2001 From: Harmen Date: Sat, 18 Apr 2020 10:19:19 +0200 Subject: [PATCH 02/31] restructure build process to use `rollup` Files are still concatted, but they are now converted to something the browser understands via `rollup`. --- .travis.yml | 3 +-- Gruntfile.js | 21 +---------------- Makefile | 59 +++++++++++++++++++++++++++++++++++++++++++++--- package.json | 9 +++++--- rollup.config.js | 22 ++++++++++++++++++ src/header.js | 14 ++++++++++++ src/pzpr/core.js | 15 ------------ 7 files changed, 100 insertions(+), 43 deletions(-) create mode 100644 rollup.config.js create mode 100644 src/header.js delete mode 100644 src/pzpr/core.js diff --git a/.travis.yml b/.travis.yml index ac31b01a0..eaaedce15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: node_js node_js: 10 script: -- npm run-script build -- npm test +- make lint test build - npm run-script check-format diff --git a/Gruntfile.js b/Gruntfile.js index daf5f8174..e0a117e5b 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -33,14 +33,6 @@ module.exports = function(grunt){ banner: banner_full, process: true, }, - pzpr: { - options: { - sourceMap: !PRODUCTION - }, - files: [ - { src: require('./src/pzpr.js').files, dest: 'dist/js/pzpr.concat.js' } - ] - }, ui: { options:{ sourceMap: !PRODUCTION @@ -56,16 +48,6 @@ module.exports = function(grunt){ banner: banner_min, report: 'min' }, - pzpr:{ - options: (PRODUCTION ? {} : { - sourceMap : 'dist/js/pzpr.js.map', - sourceMapIn : 'dist/js/pzpr.concat.js.map', - sourceMapIncludeSources : true - }), - files: [ - { src: 'dist/js/pzpr.concat.js', dest: 'dist/js/pzpr.js'} - ] - }, variety:{ options: (PRODUCTION ? {} : { sourceMap : function(filename){ return filename+'.map';} @@ -98,8 +80,7 @@ module.exports = function(grunt){ grunt.registerTask('default', ['build']); grunt.registerTask('release', ['build']); - grunt.registerTask('build', ['build:pzpr', 'build:variety', 'build:samples', 'build:ui']); - grunt.registerTask('build:pzpr', ['newer:concat:pzpr', 'newer:uglify:pzpr']); + grunt.registerTask('build', ['build:variety', 'build:samples', 'build:ui']); grunt.registerTask('build:ui', ['newer:copy:ui', 'newer:concat:ui', 'newer:uglify:ui']); grunt.registerTask('build:variety',['newer:uglify:variety']); grunt.registerTask('build:samples',['newer:uglify:samples']); diff --git a/Makefile b/Makefile index ea3c750c3..7e01ec346 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,11 @@ -.PHONY: build test serve format +.PHONY: default build test serve serve-all format install lint candle bundle rollup -build: +default: lint test + +build: candle rollup npm run-script build -test: +test: bundle npm test serve: @@ -14,3 +16,54 @@ serve-all: format: npm run-script format + +install: + npm install + +lint: + npx eslint --quiet src src-ui test sample + +candle: + mkdir -p ./dist/js/ + cp ./node_modules/pzpr-canvas/dist/candle.js ./dist/js/candle.js + +bundle: + mkdir -p ./dist/js/ + cat \ + ./src/header.js \ + ./src/pzpr/env.js \ + ./src/pzpr/event.js \ + ./src/pzpr/classmgr.js \ + ./src/pzpr/variety.js \ + ./src/pzpr/parser.js \ + ./src/pzpr/metadata.js \ + ./src/pzpr/util.js \ + ./src/puzzle/Puzzle.js \ + ./src/puzzle/Config.js \ + ./src/puzzle/Address.js \ + ./src/puzzle/Piece.js \ + ./src/puzzle/PieceList.js \ + ./src/puzzle/Board.js \ + ./src/puzzle/BoardExec.js \ + ./src/puzzle/GraphBase.js \ + ./src/puzzle/LineManager.js \ + ./src/puzzle/AreaManager.js \ + ./src/puzzle/Graphic.js \ + ./src/puzzle/MouseInput.js \ + ./src/puzzle/KeyInput.js \ + ./src/puzzle/Encode.js \ + ./src/puzzle/FileData.js \ + ./src/puzzle/Answer.js \ + ./src/puzzle/Operation.js \ + ./src/variety-common/Graphic.js \ + ./src/variety-common/KeyInput.js \ + ./src/variety-common/MouseInput.js \ + ./src/variety-common/Answer.js \ + ./src/variety-common/BoardExec.js \ + ./src/variety-common/Encode.js \ + ./src/variety-common/FileData.js \ + > "./dist/js/pzpr.concat.js" + +rollup: bundle + mkdir -p ./dist/js/ + npx rollup -c ./rollup.config.js diff --git a/package.json b/package.json index 9f130b7e5..95054fdcd 100644 --- a/package.json +++ b/package.json @@ -21,25 +21,28 @@ "node": ">= 5.6.0" }, "scripts": { - "build": "eslint --cache --quiet src src-ui && ./git-hash.sh && grunt default", + "build": "./git-hash.sh && grunt default", "release": "npm run clean && eslint --cache --quiet src && grunt release", "clean": "del dist/* pzpr-*.{zip,tar.gz,tar.bz2,tgz}", "format": "prettier --write '{src,src-ui,test}/**/*.{js,css}'", "check-format": "prettier --check '{src,src-ui,test}/**/*.{js,css}'", "lint": "eslint src src-ui test sample", - "test": "eslint --quiet src src-ui test sample && mocha -r source-map-support/register -R progress --recursive test", + "test": "mocha -r esm -r pzpr-canvas -r source-map-support/register -R progress --recursive test", "prepublishOnly": "npm test" }, "devDependencies": { "del-cli": "^2.0.0", "eslint": "^5.16.0", + "esm": "^3.2.25", "grunt": "^1.0.4", "grunt-contrib-concat": "^1.0.1", "grunt-contrib-copy": "^1.0.0", "grunt-contrib-uglify": "^2.0.0", "grunt-newer": "^1.1.1", "mocha": "^6.1.4", - "prettier": "^1.19.1" + "prettier": "^1.19.1", + "rollup": "^2.6.0", + "rollup-plugin-terser": "^5.3.0" }, "dependencies": { "pzpr-canvas": "^0.8.2", diff --git a/rollup.config.js b/rollup.config.js new file mode 100644 index 000000000..f371a0ae1 --- /dev/null +++ b/rollup.config.js @@ -0,0 +1,22 @@ +import { terser } from 'rollup-plugin-terser'; + +// `npm run build` -> `production` is true +// `npm run dev` -> `production` is false +const production = !process.env.ROLLUP_WATCH; + +export default { + input: 'dist/js/pzpr.concat.js', + output: { + file: 'dist/js/pzpr.js', + name: 'pzpr', + format: 'iife', + sourcemap: true, + globals: { + "pzpr-canvas": "Candle" + } + }, + context: "window", + plugins: [ + production && terser() // minify, but only in production + ] +}; diff --git a/src/header.js b/src/header.js new file mode 100644 index 000000000..fc865184e --- /dev/null +++ b/src/header.js @@ -0,0 +1,14 @@ +var pzpr = { + version: "<%= git.hash %>" +}; +export default pzpr; + +import Candle from 'pzpr-canvas'; +pzpr.Candle = Candle; + +//eslint-disable-next-line no-unused-vars +var document = this.document || pzpr.Candle.document; +//eslint-disable-next-line no-unused-vars +var DOMParser = this.DOMParser || pzpr.Candle.DOMParser; +//eslint-disable-next-line no-unused-vars +var XMLSerializer = this.XMLSerializer || pzpr.Candle.XMLSerializer; diff --git a/src/pzpr/core.js b/src/pzpr/core.js deleted file mode 100644 index e782f36d9..000000000 --- a/src/pzpr/core.js +++ /dev/null @@ -1,15 +0,0 @@ -// core.js v3.5.2 - -//---------------------------------------------------------------------------- -// ★pzprオブジェクト -//--------------------------------------------------------------------------- -/* extern */ -var pzpr = { - version: "<%= git.hash %>" -}; - -if (typeof module === "object" && module.exports) { - module.exports = pzpr; -} else { - this.pzpr = pzpr; -} From a91ebd2c050f5b1e60c2ff247235249139da3b13 Mon Sep 17 00:00:00 2001 From: Harmen Date: Sat, 18 Apr 2020 10:27:04 +0200 Subject: [PATCH 03/31] fix lint and remove unused files --- src/.eslintrc.json | 3 ++- src/common/intro.js | 3 --- src/common/outro.js | 3 --- src/lib/candle-intro.js | 13 ------------- src/lib/candle-outro.js | 14 -------------- src/pzpr.js | 41 ----------------------------------------- src/pzpr/util.js | 4 +--- 7 files changed, 3 insertions(+), 78 deletions(-) delete mode 100644 src/common/intro.js delete mode 100644 src/common/outro.js delete mode 100644 src/lib/candle-intro.js delete mode 100644 src/lib/candle-outro.js delete mode 100644 src/pzpr.js diff --git a/src/.eslintrc.json b/src/.eslintrc.json index 1d6d6e300..062d8fa88 100644 --- a/src/.eslintrc.json +++ b/src/.eslintrc.json @@ -4,7 +4,8 @@ "node": true // Allow to use node defined variable (require, process etc.) }, "parserOptions": { - "ecmaVersion": 5 + "ecmaVersion": 5, + "sourceType": "module" }, "globals": { "pzpr": "readonly" diff --git a/src/common/intro.js b/src/common/intro.js deleted file mode 100644 index 29d249881..000000000 --- a/src/common/intro.js +++ /dev/null @@ -1,3 +0,0 @@ -// intro.js - -(function(){ diff --git a/src/common/outro.js b/src/common/outro.js deleted file mode 100644 index bf0df2f87..000000000 --- a/src/common/outro.js +++ /dev/null @@ -1,3 +0,0 @@ -// outro.js - -})(); diff --git a/src/lib/candle-intro.js b/src/lib/candle-intro.js deleted file mode 100644 index 06d750e89..000000000 --- a/src/lib/candle-intro.js +++ /dev/null @@ -1,13 +0,0 @@ -// candle-intro.js - -(function(){ - - -//--------------------------------------------------------------------------- -// node.js環境向けの対策 -//--------------------------------------------------------------------------- -var document = this.document; - -var module = {exports:{}}, exports = module.exports; - -(function(module,exports){ diff --git a/src/lib/candle-outro.js b/src/lib/candle-outro.js deleted file mode 100644 index a5e744a70..000000000 --- a/src/lib/candle-outro.js +++ /dev/null @@ -1,14 +0,0 @@ -// candle-outro.js - -})(module,exports); - -pzpr.Candle = module.exports; - -})(); - -//--------------------------------------------------------------------------- -// node.js環境向けの対策 -//--------------------------------------------------------------------------- - document = this.document || pzpr.Candle.document; -var DOMParser = this.DOMParser || pzpr.Candle.DOMParser; -var XMLSerializer = this.XMLSerializer || pzpr.Candle.XMLSerializer; diff --git a/src/pzpr.js b/src/pzpr.js deleted file mode 100644 index d50625f96..000000000 --- a/src/pzpr.js +++ /dev/null @@ -1,41 +0,0 @@ -exports.files = [ - "common/intro", - "pzpr/core", - "lib/candle-intro", - "../node_modules/pzpr-canvas/dist/candle", - "lib/candle-outro", - "pzpr/env", - "pzpr/event", - "pzpr/classmgr", - "pzpr/variety", - "pzpr/parser", - "pzpr/metadata", - "pzpr/util", - "puzzle/Puzzle", - "puzzle/Config", - "puzzle/Address", - "puzzle/Piece", - "puzzle/PieceList", - "puzzle/Board", - "puzzle/BoardExec", - "puzzle/GraphBase", - "puzzle/LineManager", - "puzzle/AreaManager", - "puzzle/Graphic", - "puzzle/MouseInput", - "puzzle/KeyInput", - "puzzle/Encode", - "puzzle/FileData", - "puzzle/Answer", - "puzzle/Operation", - "variety-common/Graphic", - "variety-common/KeyInput", - "variety-common/MouseInput", - "variety-common/Answer", - "variety-common/BoardExec", - "variety-common/Encode", - "variety-common/FileData", - "common/outro" -].map(function(mod) { - return "src/" + mod + ".js"; -}); diff --git a/src/pzpr/util.js b/src/pzpr/util.js index 0f83adc36..8e02efd70 100644 --- a/src/pzpr/util.js +++ b/src/pzpr/util.js @@ -47,9 +47,7 @@ } } else { return ( - require("path").dirname(__filename) + - "/" + - (__filename.match("pzpr.js") ? "" : "../") + require("path").dirname(__filename) + "/" ); } return ""; From 1a183a3a8dd657913c60e722a23e363e7ab8a445 Mon Sep 17 00:00:00 2001 From: Harmen Date: Sat, 18 Apr 2020 10:28:07 +0200 Subject: [PATCH 04/31] fix read-only-object errors These are now executed in strict context. --- src/puzzle/Piece.js | 8 ++++++-- src/puzzle/PieceList.js | 4 +++- src/pzpr/util.js | 4 +--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/puzzle/Piece.js b/src/puzzle/Piece.js index 26396d3a2..d1cd62f3f 100644 --- a/src/puzzle/Piece.js +++ b/src/puzzle/Piece.js @@ -158,7 +158,9 @@ pzpr.classmgr.makeCommon({ } this.addOpe(prop, this[prop], num); - this[prop] = num; + if (!Object.isFrozen(this)) { + this[prop] = num; + } var trialstage = this.board.trialstage; if (trialstage > 0) { @@ -292,7 +294,9 @@ pzpr.classmgr.makeCommon({ //--------------------------------------------------------------------------- seterr: function(num) { if (this.board.isenableSetError()) { - this.error = num; + if (!Object.isFrozen(this)) { + this.error = num; + } } }, setinfo: function(num) { diff --git a/src/puzzle/PieceList.js b/src/puzzle/PieceList.js index a3f7a3564..9bf1a3153 100644 --- a/src/puzzle/PieceList.js +++ b/src/puzzle/PieceList.js @@ -101,7 +101,9 @@ pzpr.classmgr.makeCommon({ return; } for (var i = 0; i < this.length; i++) { - this[i].error = num; + if (!Object.isFrozen(this[i])) { + this[i].error = num; + } } }, setnoerr: function() { diff --git a/src/pzpr/util.js b/src/pzpr/util.js index 8e02efd70..1a2ed80f4 100644 --- a/src/pzpr/util.js +++ b/src/pzpr/util.js @@ -46,9 +46,7 @@ } } } else { - return ( - require("path").dirname(__filename) + "/" - ); + return require("path").dirname(__filename) + "/"; } return ""; }, From da17a11893b5859906ae7f5e469eca362cd5c5e0 Mon Sep 17 00:00:00 2001 From: Harmen Date: Sat, 18 Apr 2020 10:30:09 +0200 Subject: [PATCH 05/31] update all tests to use `import`s --- test/.eslintrc.json | 3 ++- test/load_testdata.js | 4 ++-- test/puzzle/answer_test.js | 4 ++-- test/puzzle/boardexec_test.js | 4 ++-- test/puzzle/config_test.js | 2 +- test/puzzle/encode_test.js | 4 ++-- test/puzzle/filedata_test.js | 4 ++-- test/puzzle/input_test.js | 4 ++-- test/puzzle/operation_test.js | 2 +- test/puzzle/render_test.js | 4 ++-- test/pzpr/parser_test.js | 2 +- test/variety/aho_test.js | 2 +- test/variety/amibo_test.js | 2 +- test/variety/ayeheya_test.js | 2 +- test/variety/cbblock_test.js | 2 +- test/variety/curvedata_test.js | 2 +- test/variety/fivecells_test.js | 2 +- test/variety/gokigen_test.js | 2 +- test/variety/herugolf_test.js | 2 +- test/variety/lits_test.js | 2 +- test/variety/onsen_test.js | 2 +- test/variety/pipelink_test.js | 2 +- test/variety/ringring_test.js | 2 +- test/variety/slalom_test.js | 2 +- test/variety/tapa_test.js | 2 +- test/variety/tentaisho_test.js | 2 +- test/variety/yajilin_test.js | 2 +- 27 files changed, 35 insertions(+), 34 deletions(-) diff --git a/test/.eslintrc.json b/test/.eslintrc.json index 32ea65e99..54bb65d1a 100644 --- a/test/.eslintrc.json +++ b/test/.eslintrc.json @@ -4,7 +4,8 @@ "node": true }, "parserOptions": { - "ecmaVersion": 6 + "ecmaVersion": 6, + "sourceType": "module" }, "globals": { "describe": "readonly", diff --git a/test/load_testdata.js b/test/load_testdata.js index 7b61fd2f8..3e7d01c8b 100644 --- a/test/load_testdata.js +++ b/test/load_testdata.js @@ -1,6 +1,6 @@ // test/load_testdata.js -var pzpr = require("../dist/js/pzpr.js"); +import pzpr from "../dist/js/pzpr.concat.js"; // Load test data var testdata = {}; @@ -16,4 +16,4 @@ pzpr.variety.each(function(pid) { require("./script/" + pid + ".js"); }); -module.exports = testdata; +export default testdata; diff --git a/test/puzzle/answer_test.js b/test/puzzle/answer_test.js index 43299f190..eb1f11f48 100644 --- a/test/puzzle/answer_test.js +++ b/test/puzzle/answer_test.js @@ -2,9 +2,9 @@ var assert = require("assert"); -var pzpr = require("../../dist/js/pzpr.js"); +import pzpr from "../../dist/js/pzpr.concat.js"; -var testdata = require("../load_testdata.js"); +import testdata from "../load_testdata.js"; pzpr.variety.each(function(pid) { describe(pid + " answer test", function() { diff --git a/test/puzzle/boardexec_test.js b/test/puzzle/boardexec_test.js index 6df0a3154..50751de10 100644 --- a/test/puzzle/boardexec_test.js +++ b/test/puzzle/boardexec_test.js @@ -2,9 +2,9 @@ var assert = require("assert"); -var pzpr = require("../../dist/js/pzpr.js"); +import pzpr from "../../dist/js/pzpr.concat.js"; -var testdata = require("../load_testdata.js"); +import testdata from "../load_testdata.js"; function assert_equal_board(bd1, bd2) { bd1.compareData(bd2, function(group, c, a) { diff --git a/test/puzzle/config_test.js b/test/puzzle/config_test.js index 6eb0fed52..2d47a0bb1 100644 --- a/test/puzzle/config_test.js +++ b/test/puzzle/config_test.js @@ -2,7 +2,7 @@ var assert = require("assert"); -var pzpr = require("../../dist/js/pzpr.js"); +import pzpr from "../../dist/js/pzpr.concat.js"; describe("Config test", function() { var puzzle = new pzpr.Puzzle(); diff --git a/test/puzzle/encode_test.js b/test/puzzle/encode_test.js index 5703eac85..be793b26c 100644 --- a/test/puzzle/encode_test.js +++ b/test/puzzle/encode_test.js @@ -2,9 +2,9 @@ var assert = require("assert"); -var pzpr = require("../../dist/js/pzpr.js"); +import pzpr from "../../dist/js/pzpr.concat.js"; -var testdata = require("../load_testdata.js"); +import testdata from "../load_testdata.js"; function assert_equal_board(bd1, bd2) { bd1.compareData(bd2, function(group, c, a) { diff --git a/test/puzzle/filedata_test.js b/test/puzzle/filedata_test.js index ea8b9d919..60102e59a 100644 --- a/test/puzzle/filedata_test.js +++ b/test/puzzle/filedata_test.js @@ -2,9 +2,9 @@ var assert = require("assert"); -var pzpr = require("../../dist/js/pzpr.js"); +import pzpr from "../../dist/js/pzpr.concat.js"; -var testdata = require("../load_testdata.js"); +import testdata from "../load_testdata.js"; function assert_equal_board(bd1, bd2, iskanpen) { var pid = bd1.pid; diff --git a/test/puzzle/input_test.js b/test/puzzle/input_test.js index e93ef8a9a..731d5bf0b 100644 --- a/test/puzzle/input_test.js +++ b/test/puzzle/input_test.js @@ -2,9 +2,9 @@ var assert = require("assert"); -var pzpr = require("../../dist/js/pzpr.js"); +import pzpr from "../../dist/js/pzpr.concat.js"; -var testdata = require("../load_testdata.js"); +import testdata from "../load_testdata.js"; function execmouse(puzzle, strs) { var matches = (strs[1].match(/(left|right)(.*)/)[2] || "").match(/x([0-9]+)/); diff --git a/test/puzzle/operation_test.js b/test/puzzle/operation_test.js index 978a6b021..e1941c780 100644 --- a/test/puzzle/operation_test.js +++ b/test/puzzle/operation_test.js @@ -2,7 +2,7 @@ var assert = require("assert"); -var pzpr = require("../../dist/js/pzpr.js"); +import pzpr from "../../dist/js/pzpr.concat.js"; describe("Trial mode test", function() { it("Enter test", function() { diff --git a/test/puzzle/render_test.js b/test/puzzle/render_test.js index 6693a5e36..84e56f5ee 100644 --- a/test/puzzle/render_test.js +++ b/test/puzzle/render_test.js @@ -2,9 +2,9 @@ // jshint node:true, browser:false, esnext:true /* global describe:false, it:false */ -var pzpr = require("../../dist/js/pzpr.js"); +import pzpr from "../../dist/js/pzpr.concat.js"; -var testdata = require("../load_testdata.js"); +import testdata from "../load_testdata.js"; pzpr.variety.each(function(pid) { describe(pid + " render test", function() { diff --git a/test/pzpr/parser_test.js b/test/pzpr/parser_test.js index 79408024c..66fd8a12f 100644 --- a/test/pzpr/parser_test.js +++ b/test/pzpr/parser_test.js @@ -2,7 +2,7 @@ var assert = require("assert"); -var pzpr = require("../../"); +import pzpr from "../../dist/js/pzpr.concat.js"; var puzzle = new pzpr.Puzzle(); diff --git a/test/variety/aho_test.js b/test/variety/aho_test.js index 3636fdc91..11d322d5a 100644 --- a/test/variety/aho_test.js +++ b/test/variety/aho_test.js @@ -2,7 +2,7 @@ var assert = require("assert"); -var pzpr = require("../../"); +import pzpr from "../../dist/js/pzpr.concat.js"; var puzzle = new pzpr.Puzzle(); diff --git a/test/variety/amibo_test.js b/test/variety/amibo_test.js index 6888c816e..6d2fbe205 100644 --- a/test/variety/amibo_test.js +++ b/test/variety/amibo_test.js @@ -2,7 +2,7 @@ var assert = require("assert"); -var pzpr = require("../../"); +import pzpr from "../../dist/js/pzpr.concat.js"; var puzzle = new pzpr.Puzzle(); diff --git a/test/variety/ayeheya_test.js b/test/variety/ayeheya_test.js index 54fe51330..bf2af8bfb 100644 --- a/test/variety/ayeheya_test.js +++ b/test/variety/ayeheya_test.js @@ -2,7 +2,7 @@ var assert = require("assert"); -var pzpr = require("../../"); +import pzpr from "../../dist/js/pzpr.concat.js"; var puzzle = new pzpr.Puzzle(); diff --git a/test/variety/cbblock_test.js b/test/variety/cbblock_test.js index 7f03b05bc..ffd3730c6 100644 --- a/test/variety/cbblock_test.js +++ b/test/variety/cbblock_test.js @@ -2,7 +2,7 @@ var assert = require("assert"); -var pzpr = require("../../"); +import pzpr from "../../dist/js/pzpr.concat.js"; var puzzle = new pzpr.Puzzle(); diff --git a/test/variety/curvedata_test.js b/test/variety/curvedata_test.js index cf809d7b4..c4618be48 100644 --- a/test/variety/curvedata_test.js +++ b/test/variety/curvedata_test.js @@ -2,7 +2,7 @@ var assert = require("assert"); -var pzpr = require("../../"); +import pzpr from "../../dist/js/pzpr.concat.js"; var puzzle = new pzpr.Puzzle(); diff --git a/test/variety/fivecells_test.js b/test/variety/fivecells_test.js index 4e03c2fa6..dd43cd8eb 100644 --- a/test/variety/fivecells_test.js +++ b/test/variety/fivecells_test.js @@ -2,7 +2,7 @@ var assert = require("assert"); -var pzpr = require("../../"); +import pzpr from "../../dist/js/pzpr.concat.js"; var puzzle = new pzpr.Puzzle(); diff --git a/test/variety/gokigen_test.js b/test/variety/gokigen_test.js index e1adc1142..561dde250 100644 --- a/test/variety/gokigen_test.js +++ b/test/variety/gokigen_test.js @@ -2,7 +2,7 @@ var assert = require("assert"); -var pzpr = require("../../"); +import pzpr from "../../dist/js/pzpr.concat.js"; var puzzle = new pzpr.Puzzle(); diff --git a/test/variety/herugolf_test.js b/test/variety/herugolf_test.js index fca2b5069..dc4941cfe 100644 --- a/test/variety/herugolf_test.js +++ b/test/variety/herugolf_test.js @@ -1,6 +1,6 @@ var assert = require("assert"); -var pzpr = require("../../"); +import pzpr from "../../dist/js/pzpr.concat.js"; var puzzle = new pzpr.Puzzle(); diff --git a/test/variety/lits_test.js b/test/variety/lits_test.js index 107df18b6..5a46b2b1e 100644 --- a/test/variety/lits_test.js +++ b/test/variety/lits_test.js @@ -2,7 +2,7 @@ var assert = require("assert"); -var pzpr = require("../../"); +import pzpr from "../../dist/js/pzpr.concat.js"; var puzzle = new pzpr.Puzzle(); diff --git a/test/variety/onsen_test.js b/test/variety/onsen_test.js index b063da972..9846698b8 100644 --- a/test/variety/onsen_test.js +++ b/test/variety/onsen_test.js @@ -2,7 +2,7 @@ var assert = require("assert"); -var pzpr = require("../../"); +import pzpr from "../../dist/js/pzpr.concat.js"; var puzzle = new pzpr.Puzzle(); diff --git a/test/variety/pipelink_test.js b/test/variety/pipelink_test.js index 5b04aff5c..6bdf82726 100644 --- a/test/variety/pipelink_test.js +++ b/test/variety/pipelink_test.js @@ -2,7 +2,7 @@ var assert = require("assert"); -var pzpr = require("../../"); +import pzpr from "../../dist/js/pzpr.concat.js"; var puzzle = new pzpr.Puzzle(); diff --git a/test/variety/ringring_test.js b/test/variety/ringring_test.js index d0654a994..0a9b7fde8 100644 --- a/test/variety/ringring_test.js +++ b/test/variety/ringring_test.js @@ -2,7 +2,7 @@ var assert = require("assert"); -var pzpr = require("../../"); +import pzpr from "../../dist/js/pzpr.concat.js"; var puzzle = new pzpr.Puzzle(); diff --git a/test/variety/slalom_test.js b/test/variety/slalom_test.js index 61fe8e00b..4369c7599 100644 --- a/test/variety/slalom_test.js +++ b/test/variety/slalom_test.js @@ -2,7 +2,7 @@ var assert = require("assert"); -var pzpr = require("../../"); +import pzpr from "../../dist/js/pzpr.concat.js"; var puzzle = new pzpr.Puzzle(); diff --git a/test/variety/tapa_test.js b/test/variety/tapa_test.js index d61340272..985df46e2 100644 --- a/test/variety/tapa_test.js +++ b/test/variety/tapa_test.js @@ -2,7 +2,7 @@ var assert = require("assert"); -var pzpr = require("../../"); +import pzpr from "../../dist/js/pzpr.concat.js"; var puzzle = new pzpr.Puzzle(); diff --git a/test/variety/tentaisho_test.js b/test/variety/tentaisho_test.js index 46550fde5..a542518f3 100644 --- a/test/variety/tentaisho_test.js +++ b/test/variety/tentaisho_test.js @@ -2,7 +2,7 @@ var assert = require("assert"); -var pzpr = require("../../"); +import pzpr from "../../dist/js/pzpr.concat.js"; var puzzle = new pzpr.Puzzle(); diff --git a/test/variety/yajilin_test.js b/test/variety/yajilin_test.js index 765e93ead..351fde1f7 100644 --- a/test/variety/yajilin_test.js +++ b/test/variety/yajilin_test.js @@ -2,7 +2,7 @@ var assert = require("assert"); -var pzpr = require("../../"); +import pzpr from "../../dist/js/pzpr.concat.js"; var puzzle = new pzpr.Puzzle(); From 5ab22fd467c20d2acc2ca65fa42345ee13d4e361 Mon Sep 17 00:00:00 2001 From: Harmen Date: Sat, 18 Apr 2020 10:30:28 +0200 Subject: [PATCH 06/31] load stand-alone candle.js file --- src-ui/list.html | 1 + src-ui/p.html | 1 + src-ui/rules.html | 1 + 3 files changed, 3 insertions(+) diff --git a/src-ui/list.html b/src-ui/list.html index ed2940444..3ae538432 100644 --- a/src-ui/list.html +++ b/src-ui/list.html @@ -5,6 +5,7 @@ puzz.link list of puzzle types + diff --git a/src-ui/p.html b/src-ui/p.html index 50fb44037..bec073982 100644 --- a/src-ui/p.html +++ b/src-ui/p.html @@ -11,6 +11,7 @@ + puzz.link player diff --git a/src-ui/rules.html b/src-ui/rules.html index f10b430a1..ea91443bc 100644 --- a/src-ui/rules.html +++ b/src-ui/rules.html @@ -39,6 +39,7 @@ } +