Merge pull request #16 from confused-Techie/master

Implement automatic publishing to NPM

Author: savetheclocktower

.github/workflows/ci.yml

@@ -17,7 +17,6 @@ jobs:
         node_version:
           - 14
           - 16
-          - 18
         exclude:
           - os: windows-latest
             node_version: 14
@@ -80,6 +79,7 @@ jobs:
         if: ${{ runner.os != 'Windows' }}
         run: |
           source CI_venv/bin/activate
+          npm config set python "$(which python3)"
           npm install
 
       - name: Install dependencies (Windows)

.github/workflows/publish.yml

@@ -0,0 +1,35 @@
+name: NPM Publish
+
+on:
+  release:
+    types: [created]
+  workflow_dispatch:
+
+env:
+  NODE_VERSION: 16
+  NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          registry-url: https://registry.npmjs.org/
+      - name: Install Python setuptools
+        # Reasoning for this in `ci.yml`
+        run: |
+          python3 -m venv CI_venv
+          source CI_venv/bin/activate
+          python3 -m pip install setuptools
+      - name: Install Dependencies
+        run: |
+          source CI_venv/bin/activate
+          npm config set python "$(which python3)"
+          npm ci
+      - run: |
+          npm run test:node
+          npm run test:native
+      - run: npm publish --access public

.gitignore

@@ -6,6 +6,5 @@ ext
 
 /browser.js
 emsdk-portable
-package-lock.json
 
 vendor/libiconv

benchmark/native/marker-index-benchmark.cc

@@ -2,7 +2,7 @@
 #include <iostream>
 #include <vector>
 #include <stdlib.h>
-#include "catch.hpp"
+#include "catch_amalgamated.hpp"
 #include "point.h"
 #include "range.h"
 #include "marker-index.h"

binding.gyp

@@ -85,7 +85,7 @@
                     }
                 }],
                 ['OS=="win"', {
-                   'sources': [
+                    'sources': [
                        'vendor/win-iconv/win_iconv.c',
                     ],
                     'include_dirs': [
@@ -148,10 +148,16 @@
             "targets": [{
                 "target_name": "tests",
                 "type": "executable",
+                "cflags_cc": ["-std=c++17"],
                 "cflags_cc!": ["-fno-exceptions"],
                 "defines": [
-                    "CATCH_CONFIG_CPP11_NO_IS_ENUM"
+                    "CATCH_CONFIG_CPP11_NO_IS_ENUM",
+                    "CATCH_CONFIG_CPP17_STRING_VIEW"
                 ],
+                'xcode_settings': {
+                    'CLANG_CXX_LIBRARY': 'libc++',
+                    'CLANG_CXX_LANGUAGE_STANDARD': 'c++17',
+                },
                 "sources": [
                     "test/native/test-helpers.cc",
                     "test/native/tests.cc",
@@ -160,6 +166,7 @@
                     "test/native/text-buffer-test.cc",
                     "test/native/text-test.cc",
                     "test/native/text-diff-test.cc",
+                    "vendor/catch_amalgamated.cpp"
                 ],
                 "include_dirs": [
                     "vendor",
@@ -175,7 +182,7 @@
                         ],
                         "xcode_settings": {
                             "GCC_ENABLE_CPP_EXCEPTIONS": "YES",
-                            'MACOSX_DEPLOYMENT_TARGET': '10.8',
+                            'MACOSX_DEPLOYMENT_TARGET': '10.12',
                         }
                     }]
                 ]
@@ -189,7 +196,8 @@
             ['OS=="mac"', {
                 "xcode_settings": {
                     'CLANG_CXX_LIBRARY': 'libc++',
-                    'CLANG_CXX_LANGUAGE_STANDARD':'c++11',
+                    'CLANG_CXX_LANGUAGE_STANDARD': 'c++17',
+                    'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES',  # -fvisibility=hidden
                 }
             }],
             ['OS=="win"', {