From d0f84df01bd0beb29954803f07a9f5eb30fb7b14 Mon Sep 17 00:00:00 2001
From: Ponlawat W <ponlawat_w@outlook.co.th>
Date: Sat, 25 Nov 2023 09:25:08 +0700
Subject: [PATCH] 0.2.0 - Built to ESModule (#3)

* Moved to ESModule

* Bumped node version in GitHub Workflows

* Added job when unit tests are finished
---
 .github/workflows/publish.yml    |  2 +-
 .github/workflows/unit-tests.yml | 14 ++++++++++++--
 examples/index.html              |  2 +-
 package-lock.json                |  4 ++--
 package.json                     |  8 ++++----
 tests/overpass-api.test.ts       |  2 +-
 tests/overpass-osm.test.ts       |  7 ++++---
 tests/source-node.test.ts        |  6 +++---
 tests/source-way.test.ts         |  8 ++++----
 tsconfig.json                    |  5 +++--
 webpack.config.js                | 18 +++++++++++++++---
 11 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index aba5d4c..4a22f93 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Setup Node
       uses: actions/setup-node@v3
       with:
-        node-version: 16
+        node-version: 20
         registry-url: https://registry.npmjs.org/
     - name: Install
       run: npm ci
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 5401941..611eef7 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -2,7 +2,11 @@ name: Unit Tests
 on: workflow_call
 jobs:
   unit-tests:
-    name: Unit Tests
+    strategy:
+      fail-fast: true
+      matrix:
+        node: [16, 18, 20]
+    name: Unit Tests Node ${{ matrix.node }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -12,8 +16,14 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: ${{ matrix.node }}
       - name: Install
         run: npm ci
       - name: Test
         run: npm run test
+  unit-tests-finished:
+    name: Unit Tests Finished
+    needs: unit-tests
+    runs-on: ubuntu-latest
+    steps:
+      - run: exit 0
diff --git a/examples/index.html b/examples/index.html
index 6b030f7..65d82cf 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -22,7 +22,7 @@
       <span id="way-status"></span>
     </div>
     <script src="https://cdn.jsdelivr.net/npm/ol@v8.2.0/dist/ol.js"></script>
-    <script src="https://www.unpkg.com/ol-osmoverpass/dist/webpack/index.js"></script>
+    <script src="https://www.unpkg.com/ol-osmoverpass/dist/bundle/index.js"></script>
     <script lang="js">
       const basemap = new ol.layer.Tile({ source: new ol.source.OSM() });
 
diff --git a/package-lock.json b/package-lock.json
index de54f46..673c12c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ol-osmoverpass",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "ol-osmoverpass",
-      "version": "0.1.0",
+      "version": "0.2.0",
       "license": "ISC",
       "devDependencies": {
         "happy-dom": "^12.10.3",
diff --git a/package.json b/package.json
index 9b9edfc..df3a184 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,7 @@
 {
   "name": "ol-osmoverpass",
-  "version": "0.1.0",
+  "type": "module",
+  "version": "0.2.0",
   "description": "OverLayers vector layer source for OpenStreetMap elements using Overpass API",
   "main": "dist/index.js",
   "keywords": [
@@ -8,12 +9,11 @@
     "openstreetmap",
     "openlayers",
     "gis",
-    "map",
-    "road-snapping"
+    "map"
   ],
   "scripts": {
     "build": "npx tsc && npx webpack",
-    "test": "npx vitest run --config ./vitest.config.ts"
+    "test": "npm run build && npx vitest run --config ./vitest.config.ts"
   },
   "repository": {
     "type": "git",
diff --git a/tests/overpass-api.test.ts b/tests/overpass-api.test.ts
index f3f093d..c47488a 100644
--- a/tests/overpass-api.test.ts
+++ b/tests/overpass-api.test.ts
@@ -1,6 +1,6 @@
 import { describe, beforeAll, it, expect } from 'vitest';
 import { boundingExtent, containsXY } from 'ol/extent';
-import { Overpass, type OSMNode } from '../src';
+import { Overpass, type OSMNode } from '../dist';
 import type { Coordinate } from 'ol/coordinate';
 
 
diff --git a/tests/overpass-osm.test.ts b/tests/overpass-osm.test.ts
index 5168681..de3c1b2 100644
--- a/tests/overpass-osm.test.ts
+++ b/tests/overpass-osm.test.ts
@@ -1,10 +1,11 @@
 import { beforeAll, describe, expect, it } from 'vitest';
-import { type OSMElementConverter, OSMOverpass, Overpass, OSMNode, OSMWay } from '../src';
+import { Feature } from 'ol';
 import { boundingExtent, containsCoordinate } from 'ol/extent';
+import { LineString } from 'ol/geom';
 import { Projection } from 'ol/proj';
+import { OSMOverpass, Overpass, OSMNode, OSMWay } from '../dist';
+import type { OSMElementConverter } from '../dist';
 import type { Coordinate } from 'ol/coordinate';
-import { LineString } from 'ol/geom';
-import { Feature } from 'ol';
 
 describe('Test OSMOverpass', () => {
   const coor1: Coordinate = [98.98017, 18.78764];
diff --git a/tests/source-node.test.ts b/tests/source-node.test.ts
index c89123a..28d5bf6 100644
--- a/tests/source-node.test.ts
+++ b/tests/source-node.test.ts
@@ -1,11 +1,11 @@
 import { beforeAll, beforeEach, describe, expect, it, vi, test } from 'vitest';
 import { Map, View } from 'ol';
-import { Vector as VectorLayer } from 'ol/layer';
-import { OSMOverpassNodeSource, Overpass } from '../src';
-import { Window } from 'happy-dom';
 import { boundingExtent, buffer, containsCoordinate } from 'ol/extent';
+import { Vector as VectorLayer } from 'ol/layer';
 import { Projection, transform, transformExtent } from 'ol/proj';
+import { Window } from 'happy-dom';
 import { OVERPASS_API_ENDPOINT, OVERPASS_FETCH_TIMEOUT } from './common';
+import { OSMOverpassNodeSource, Overpass } from '../dist';
 
 describe('Test OSMOverpassNodeSource', () => {
   const epsg4326 = new Projection({ code: 'EPSG:4326' });
diff --git a/tests/source-way.test.ts b/tests/source-way.test.ts
index 6429590..30fd869 100644
--- a/tests/source-way.test.ts
+++ b/tests/source-way.test.ts
@@ -1,11 +1,11 @@
-import { Window } from 'happy-dom';
+import { expect, test, vi } from 'vitest';
 import { OVERPASS_API_ENDPOINT, OVERPASS_FETCH_TIMEOUT } from './common';
 import { Map, View } from 'ol';
 import { boundingExtent, containsCoordinate } from 'ol/extent';
+import { Vector as VectorLayer } from 'ol/layer';
 import { Projection, transform } from 'ol/proj';
-import { expect, test, vi } from 'vitest';
-import { OSMOverpassWaySource } from '../src';
-import VectorLayer from 'ol/layer/Vector';
+import { Window } from 'happy-dom';
+import { OSMOverpassWaySource } from '../dist';
 
 test('Test OSMOverpassWaySource', async() => {
   const epsg4326 = new Projection({ code: 'EPSG:4326' });
diff --git a/tsconfig.json b/tsconfig.json
index fda781f..d46df14 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,7 +1,8 @@
 {
   "compilerOptions": {
-    "module": "CommonJS",
-    "target": "es6",
+    "module": "ES2020",
+    "moduleResolution": "Node",
+    "target": "ES2020",
     "rootDir": "./src",
     "declaration": true,
     "declarationMap": true,
diff --git a/webpack.config.js b/webpack.config.js
index ae2be0e..1e3e074 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,8 +1,20 @@
-const path = require('path');
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-module.exports = {
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+export default {
   mode: 'production',
   entry: './dist/index.js',
+  module: {
+    rules: [{
+      test: /\.(js)$/,
+      exclude: /node_modules/,
+      resolve: {
+        fullySpecified: false
+      }
+    }]
+  },
   resolve: {
     alias: { ol: false }
   },
@@ -17,7 +29,7 @@ module.exports = {
     'ol/style': 'ol.style'
   },
   output: {
-    path: path.resolve(__dirname, 'dist', 'webpack'),
+    path: path.resolve(__dirname, 'dist', 'bundle'),
     filename: 'index.js',
     library: {
       type: 'var',