Merge pull request #21 from johnsyweb/paj/new-stuff

Volunteers on top!

.gitignore

@@ -1,11 +1,8 @@
 /.amo-upload-uuid
 /.web-extension-id
 /chromium*
+/dist/
 /eventuate*
 /node_modules
 /target
 /web-ext-artifacts
-
-# managed by crackle
-/dist
-# end managed by crackle

Dockerfile

@@ -5,10 +5,8 @@ RUN corepack enable
 RUN apt-get update && apt-get -y install jq zip
 COPY . /eventuate
 WORKDIR /eventuate
-RUN pnpm i
-RUN pnpm t
-RUN pnpm build
-RUN pnpm web-ext:lint
+RUN pnpm it
+RUN pnpm package
 
 FROM scratch AS export-stage
 COPY --from=build-stage /eventuate/chromium/ /chromium

amo.json

@@ -16,7 +16,7 @@
   ],
   "version": {
     "license": "MIT",
-    "version": "0.0.11"
+    "version": "0.0.12"
   },
   "homepage": {
     "en-US": "https://johnsy.com/eventuate/"

eslint.config.mjs

@@ -0,0 +1,13 @@
+import globals from "globals";
+import pluginJs from "@eslint/js";
+import tseslint from "typescript-eslint";
+
+export default [
+  {files: ["**/*.{js,mjs,cjs,ts}"]},
+  {languageOptions: { globals: globals.browser }},
+  {ignores: ["webpack.config.js", "dist/*.js"]},
+  pluginJs.configs.recommended,
+  ...tseslint.configs.strict,
+  ...tseslint.configs.stylistic,
+]
+

manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Eventuate",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "author": "Pete Johns",
   "homepage_url": "https://github.com/johnsyweb/eventuate/",
   "description": "Extracts information from parkrun results pages for inclusion in reports.",
@@ -42,10 +42,12 @@
         "*://www.parkrun.us/*/results/latestresults/"
       ],
       "js": [
-        "./dist/index.js"
+        "./dist/eventuate.js"
+      ],
+      "css": [
+        "./style/eventuate.css"
       ],
-      "css": ["./style/eventuate.css"],
       "run_at": "document_end"
     }
   ]
-}
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eventuate",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "Extracts information from parkrun results pages for inclusion in reports.",
   "keywords": [
     "parkrun",
@@ -18,43 +18,34 @@
   },
   "license": "MIT",
   "author": "Pete Johns",
-  "exports": {
-    ".": {
-      "types": {
-        "import": "./dist/index.d.mts",
-        "require": "./dist/index.d.ts"
-      },
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.cjs"
-    },
-    "./package.json": "./package.json"
-  },
-  "main": "./dist/index.cjs",
-  "module": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
-  "files": [
-    "dist"
-  ],
   "scripts": {
-    "build": "pnpm crackle:package ; pnpm rename && pnpm web-ext:build && pnpm repack-for-chromium",
-    "crackle:package": "crackle package",
-    "rename": "bash -c 'mv ./dist/index.cjs ./dist/index.js'",
+    "build": "webpack",
+    "package": "pnpm lint && pnpm build && pnpm web-ext:lint && pnpm web-ext:build && pnpm repack-for-chromium",
     "repack-for-chromium": "bash './script/repack-for-chromium'",
+    "start": "web-ext run -v -u https://www.parkrun.com.au/brimbank/results/latestresults/",
     "test": "jest",
+    "lint": "eslint .",
     "web-ext:build": "web-ext build -o",
-    "web-ext:lint": "web-ext lint",
-    "start": "web-ext run -v -u https://www.parkrun.com.au/coburg/results/latestresults/"
+    "web-ext:lint": "web-ext lint"
   },
   "devDependencies": {
-    "@crackle/cli": "^0.15.5",
+    "@eslint/js": "^9.13.0",
+    "@types/eslint__js": "^8.42.3",
     "@types/jest": "^29.5.13",
-    "@types/node": "^22.7.5",
+    "@types/node": "^22.7.7",
+    "copy-webpack-plugin": "^12.0.2",
+    "eslint": "^9.13.0",
+    "globals": "^15.11.0",
     "jest": "^29.7.0",
     "prettier": "^3.3.3",
     "ts-jest": "^29.2.5",
+    "ts-loader": "^9.5.1",
     "ts-node-dev": "^2.0.0",
     "typescript": "^5.6.3",
-    "web-ext": "^8.3.0"
+    "typescript-eslint": "^8.10.0",
+    "web-ext": "^8.3.0",
+    "webpack": "^5.95.0",
+    "webpack-cli": "^5.1.4"
   },
   "packageManager": "[email protected]",
   "webExt": {
@@ -66,9 +57,6 @@
       "LICENSE.txt",
       "README.md",
       "chromium*",
-      "crackle.config.ts",
-      "dist/index.mjs",
-      "dist/index.d.*",
       "jest.config.ts",
       "package.json",
       "pnpm-lock.yaml",
@@ -79,4 +67,4 @@
       "tsconfig.json"
     ]
   }
-}
+}