Merge pull request #477 from foretagsplatsen/32129139/Remove_webpack_…

…from_widgetjs

32129139: Remove webpack from widgetjs

.eslintrc.js

@@ -12,7 +12,6 @@ module.exports = {
 					"src/widgetjs.js",
 					// List of files not exporting anything:
 					"**/.eslintrc.js",
-					"webpack*",
 					"src/router/optionalParameterSegment.js",
 					"src/router/staticSegment.js",
 				],

.github/workflows/test.yml

@@ -26,6 +26,5 @@ jobs:
         node-version: ${{ matrix.node-version }}
         cache: 'yarn'
     - run: yarn install --frozen-lockfile
-    - run: yarn build-test
     - run: yarn run lint
-    - run: xvfb-run yarn run test
+    - run: yarn run test:run

jasmine-browser.json

@@ -1,8 +1,18 @@
 {
   "srcDir": ".",
   "specDir": ".",
-  "specFiles": ["dist/jasmine.js"],
+  "specFiles": ["src/test/**/*Test.js"],
+  "esmFilenameExtension": ".js",
   "browser": {
     "name": "headlessChrome"
+  },
+  "importMap": {
+    "moduleRootDir": "node_modules",
+    "imports": {
+       "classnames":"classnames/index.js",
+      "jquery":"jquery/dist/jquery.js",
+      "klassified":"klassified/src/klassified.js",
+      "yaem":"yaem/index.js"
+    }
   }
 }

package.json

@@ -37,19 +37,16 @@
     "klassified": "^4.0.0"
   },
   "scripts": {
-    "build": "webpack --config webpack.config.js",
-    "build-test": "webpack --config webpack.jasmine.config.js",
     "lint": "eslint --max-warnings 0 --format unix --report-unused-disable-directives .",
-    "test": "jasmine-browser-runner runSpecs --config=jasmine-browser.json"
+    "test:run": "jasmine-browser-runner runSpecs --config=jasmine-browser.json",
+    "test:serve": "jasmine-browser-runner serve --config=jasmine-browser.json --port=8881"
   },
   "devDependencies": {
     "@foretagsplatsen/eslint-plugin": "^6.0.0",
     "eslint": "^8.57.0",
-    "jasmine": "^5.1.0",
+    "jasmine-core": "^5.1.2",
     "jasmine-browser-runner": "^2.4.0",
     "jasmine-reporters": "^2.5.2",
-    "webpack": "^5.91.0",
-    "webpack-cli": "^5.1.4",
     "yaem": "foretagsplatsen/yaem#1.0.0"
   },
   "peerDependencies": {

src/Widget2.js

@@ -1,7 +1,7 @@
 import router from "./router.js";
 import { eventCategory } from "yaem";
 import htmlCanvas from "./htmlCanvas.js";
-import jQuery from "jquery";
+import jQuery from "./lib-wrappers/jquery.js";
 import { getCurrentWidget, withCurrentWidget } from "./currentWidget.js";
 import { newId } from "./idGenerator.js";
 

src/htmlCanvas.js

@@ -1,5 +1,5 @@
-import jQuery from "jquery";
-import classNames from "classnames";
+import jQuery from "./lib-wrappers/jquery.js";
+import classNames from "./lib-wrappers/classnames.js";
 
 /**
  * @typedef {function} renderer

src/lib-wrappers/README.md

@@ -0,0 +1,2 @@
+This directory contains a JS module for each external library that
+doesn't provide any ES module.

src/lib-wrappers/classnames.js

@@ -0,0 +1,3 @@
+import "classnames";
+
+export default window.classNames;

src/lib-wrappers/jquery.js

@@ -0,0 +1,3 @@
+import "jquery";
+
+export default window.jQuery;

src/router/hashLocation.js

@@ -1,4 +1,4 @@
-import jQuery from "jquery";
+import jQuery from "../lib-wrappers/jquery.js";
 import { eventCategory } from "yaem";
 import url from "./url.js";
 import { object } from "klassified";

src/test/htmlCanvasTest.js

@@ -1,5 +1,5 @@
 import htmlCanvas from "../htmlCanvas.js";
-import jQuery from "jquery";
+import jQuery from "../lib-wrappers/jquery.js";
 
 function withCanvas(callback) {
 	$("BODY").append('<div id="sandbox"></div>');

src/test/router/hashLocationTest.js

@@ -1,4 +1,4 @@
-import jQuery from "jquery";
+import jQuery from "../../lib-wrappers/jquery.js";
 import hashLocationModel from "../../router/hashLocation.js";
 
 // Helpers

src/test/widgetTest.js

@@ -1,6 +1,6 @@
 import widget from "../widget.js";
 import htmlCanvas from "../htmlCanvas.js";
-import jQuery from "jquery";
+import jQuery from "../lib-wrappers/jquery.js";
 
 let widgetSubclass = widget.subclass((that) => {
 	that.renderContentOn = function (html) {

src/widget.js

@@ -3,7 +3,7 @@ import widgetExtensions from "./widget-extensions.js";
 import router from "./router.js";
 import { eventCategory } from "yaem";
 import htmlCanvas from "./htmlCanvas.js";
-import jQuery from "jquery";
+import jQuery from "./lib-wrappers/jquery.js";
 import { getCurrentWidget, withCurrentWidget } from "./currentWidget.js";
 import { newId } from "./idGenerator.js";