diff options
| -rw-r--r-- | life2/simulator/package.json | 3 | ||||
| -rw-r--r-- | life2/simulator/src/index.js | 7 | ||||
| -rw-r--r-- | life2/simulator/src/style.css | 0 | ||||
| -rw-r--r-- | package-lock.json | 6 |
4 files changed, 16 insertions, 0 deletions
diff --git a/life2/simulator/package.json b/life2/simulator/package.json index 349ed00..859dea9 100644 --- a/life2/simulator/package.json +++ b/life2/simulator/package.json @@ -33,7 +33,10 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "devDependencies": { +<<<<<<< HEAD +======= "typescript": "5.3.3", +>>>>>>> 2ec513dd3a4e416d1acf3e8c573f52896d1bf764 "webpack": "5.90.3", "webpack-cli": "5.1.4" } diff --git a/life2/simulator/src/index.js b/life2/simulator/src/index.js new file mode 100644 index 0000000..07b6a60 --- /dev/null +++ b/life2/simulator/src/index.js @@ -0,0 +1,7 @@ +<!DOCTYPE html> +<title>Life 2 Simulator</title> +<script src="./life2.js"></script> +<header></header> +<main></main> +<aside></aside> +<footer></footer> diff --git a/life2/simulator/src/style.css b/life2/simulator/src/style.css new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/life2/simulator/src/style.css diff --git a/package-lock.json b/package-lock.json index 3ca4139..c9f399c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,10 @@ "version": "1.0.0", "license": "SEE LICENSE IN COPYRIGHT", "devDependencies": { +<<<<<<< HEAD +======= "typescript": "5.3.3", +>>>>>>> 2ec513dd3a4e416d1acf3e8c573f52896d1bf764 "webpack": "5.90.3", "webpack-cli": "5.1.4" }, @@ -1175,6 +1178,8 @@ } } }, +<<<<<<< HEAD +======= "node_modules/typescript": { "version": "5.3.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", @@ -1188,6 +1193,7 @@ "node": ">=14.17" } }, +>>>>>>> 2ec513dd3a4e416d1acf3e8c573f52896d1bf764 "node_modules/undici-types": { "version": "5.26.5", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", |