diva.js 7.2.5 → 7.2.6

package/package.json

@@ -1,11 +1,25 @@
 {
   "name": "diva.js",
-  "version": "7.2.5",
+  "version": "7.2.6",
   "license": "MIT",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/DDMAL/diva.js.git"
   },
+  "main": "./build/diva.js",
+  "module": "./build/diva.esm.js",
+  "browser": "./build/diva.js",
+  "exports": {
+    ".": {
+      "import": "./build/diva.esm.js",
+      "default": "./build/diva.js"
+    }
+  },
+  "files": [
+    "build/",
+    "README.md",
+    "LICENSE"
+  ],
   "scripts": {
     "format": "find src -name \"*.ts\" -print0 | xargs -0 clang-format -i",
     "develop": "chokidar \"src/**/*\" \"scripts/elm-esm.sh\" \"Makefile\" -c \"make build-dev\""

package/.clang-format

@@ -1,7 +0,0 @@
-BasedOnStyle: None
-Language: JavaScript
-IndentWidth: 4
-TabWidth: 4
-UseTab: Never
-ColumnLimit: 0
-BreakBeforeBraces: Allman

package/.github/workflows/npm-publish.yml

@@ -1,45 +0,0 @@
-name: Publish to NPM
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-permissions:
-  contents: read
-  id-token: write
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    environment: npm
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v6
-        with:
-          node-version: '24'
-          registry-url: 'https://registry.npmjs.org'
-
-      - name: Install dependencies
-        run: yarn install
-
-      - name: Install Elm globally
-        run: npm install -g elm
-
-      - name: Build
-        run: make build
-
-      - name: Verify tag matches package version
-        run: |
-          PACKAGE_VERSION="$(node -p "require('./package.json').version")"
-          TAG_VERSION="${GITHUB_REF_NAME#v}"
-          if [ "$PACKAGE_VERSION" != "$TAG_VERSION" ]; then
-            echo "Tag version ($TAG_VERSION) does not match package.json version ($PACKAGE_VERSION)." >&2
-            exit 1
-          fi
-
-      - name: Publish to NPM
-        run: npm publish --provenance

package/Makefile

@@ -1,75 +0,0 @@
-SHELL := /bin/sh
-
-ELM_SRC := src/Main.elm
-TS_SRC := src/diva.ts
-TS_VE_SRC := src/viewer-element.ts
-TS_FT_SRC := src/filters.ts
-CSS_SRC := $(wildcard src/styles/*.css)
-DIVA_CSS := cache/diva.css
-ELM_OUT := cache/elm.js
-ELM_ESM := cache/elm-esm.js
-DIVA_DEBUG := build/diva.debug.js
-DIVA_JS := build/diva.js
-ELM_ESM_SCRIPT := scripts/elm-esm.sh
-ELM_FLAGS ?= --optimize
-VERSION ?= $(shell node -p "require('./package.json').version")
-RELEASE_PREFIX := diva.js-$(VERSION)
-RELEASE_DIR := release
-RELEASE_TAR := $(RELEASE_DIR)/$(RELEASE_PREFIX).tar.gz
-RELEASE_ZIP := $(RELEASE_DIR)/$(RELEASE_PREFIX).zip
-
-.PHONY: all build build-dev clean clean-cache release
-
-all: build
-
-build: clean-cache $(DIVA_JS)
-
-build-dev: ELM_FLAGS = --debug
-build-dev:
-	$(MAKE) -B ELM_FLAGS=--debug clean-cache $(DIVA_DEBUG)
-
-$(ELM_OUT): $(ELM_SRC)
-	mkdir -p build
-	elm make $(ELM_FLAGS) $(ELM_SRC) --output=$(ELM_OUT)
-
-$(ELM_ESM): $(ELM_OUT) $(ELM_ESM_SCRIPT)
-	./scripts/elm-esm.sh $(ELM_OUT) $(ELM_ESM)
-
-$(DIVA_CSS): $(CSS_SRC) scripts/minify-css.mjs
-	node ./scripts/minify-css.mjs
-
-$(DIVA_DEBUG): $(TS_SRC) $(TS_VE_SRC) $(TS_FT_SRC) $(DIVA_CSS) $(ELM_ESM)
-	mkdir -p public
-	yarn -s esbuild $(TS_SRC) --bundle --format=iife --platform=browser --target=es2019 --loader:.css=text --outfile=$(DIVA_DEBUG)
-
-$(DIVA_JS): $(TS_SRC) $(TS_VE_SRC) $(TS_FT_SRC) $(DIVA_CSS) $(ELM_ESM)
-	yarn -s esbuild $(TS_SRC) --bundle --format=iife --platform=browser --target=es2019 --loader:.css=text --minify --drop:console --pure:F2 --pure:F3 --pure:F4 --pure:F5 --pure:F6 --pure:F7 --pure:F8 --pure:F9 --pure:A2 --pure:A3 --pure:A4 --pure:A5 --pure:A6 --pure:A7 --pure:A8 --pure:A9 --outfile=$(DIVA_JS)
-	@min="$(DIVA_JS)"; \
-	MINIFIED_SIZE=$$(wc -c < "$$min"); \
-	GZIPPED_SIZE=$$(gzip -c "$$min" | wc -c); \
-	MINIFIED_HR=$$(numfmt --to=iec-i --suffix=B "$$MINIFIED_SIZE"); \
-	GZIPPED_HR=$$(numfmt --to=iec-i --suffix=B "$$GZIPPED_SIZE"); \
-	printf "%-18s %10s (%7s)  %s\n" "Minified size:" "$$MINIFIED_SIZE bytes" "$$MINIFIED_HR" "$$min"; \
-	printf "%-18s %10s (%7s)\n" "Gzipped size:" "$$GZIPPED_SIZE bytes" "$$GZIPPED_HR";
-
-clean:
-	rm -f $(ELM_OUT) $(ELM_ESM) $(DIVA_JS) $(DIVA_DEBUG) $(DIVA_CSS) build/diva.css build/diva.min.css
-
-clean-cache:
-	rm -f cache/*
-
-release: clean build build-dev
-	mkdir -p $(RELEASE_DIR)
-	@LICENSE_FILE=$$(ls LICENSE* 2>/dev/null | head -n 1); \
-	if [ -z "$$LICENSE_FILE" ]; then \
-		echo "Error: no LICENSE file found in project root."; \
-		exit 1; \
-	fi; \
-	tar -czf "$(RELEASE_TAR)" build README.md "$$LICENSE_FILE"; \
-	zip -rq "$(RELEASE_ZIP)" build README.md "$$LICENSE_FILE"; \
-	echo "Created $(RELEASE_TAR)"; \
-	echo "Created $(RELEASE_ZIP)"
-
-publish: clean build
-	cp -r build .
-	npm publish

package/elm.json

@@ -1,32 +0,0 @@
-{
-    "type": "application",
-    "source-directories": [
-        "src"
-    ],
-    "elm-version": "0.19.1",
-    "dependencies": {
-        "direct": {
-            "elm/browser": "1.0.2",
-            "elm/core": "1.0.5",
-            "elm/html": "1.0.1",
-            "elm/http": "2.0.0",
-            "elm/json": "1.1.4",
-            "elm/svg": "1.0.1",
-            "hecrj/html-parser": "2.4.0",
-            "rism-digital/elm-iiif": "1.0.3"
-        },
-        "indirect": {
-            "elm/bytes": "1.0.8",
-            "elm/file": "1.0.5",
-            "elm/parser": "1.1.0",
-            "elm/time": "1.0.0",
-            "elm/url": "1.0.0",
-            "elm/virtual-dom": "1.0.5",
-            "rtfeldman/elm-hex": "1.0.0"
-        }
-    },
-    "test-dependencies": {
-        "direct": {},
-        "indirect": {}
-    }
-}

package/review/elm.json

@@ -1,52 +0,0 @@
-{
-    "type": "application",
-    "source-directories": [
-        "src"
-    ],
-    "elm-version": "0.19.1",
-    "dependencies": {
-        "direct": {
-            "SiriusStarr/elm-review-no-single-pattern-case": "2.1.2",
-            "SiriusStarr/elm-review-no-unsorted": "1.1.8",
-            "elm/core": "1.0.5",
-            "jfmengels/elm-review": "2.16.4",
-            "jfmengels/elm-review-code-style": "1.2.0",
-            "jfmengels/elm-review-common": "1.3.5",
-            "jfmengels/elm-review-debug": "1.0.8",
-            "jfmengels/elm-review-performance": "1.0.2",
-            "jfmengels/elm-review-simplify": "2.1.15",
-            "jfmengels/elm-review-unused": "1.2.6",
-            "sparksp/elm-review-imports": "1.0.2",
-            "stil4m/elm-syntax": "7.3.9"
-        },
-        "indirect": {
-            "avh4/elm-fifo": "1.0.4",
-            "elm/bytes": "1.0.8",
-            "elm/html": "1.0.1",
-            "elm/json": "1.1.4",
-            "elm/parser": "1.1.0",
-            "elm/project-metadata-utils": "1.0.2",
-            "elm/random": "1.0.0",
-            "elm/regex": "1.0.0",
-            "elm/time": "1.0.0",
-            "elm/virtual-dom": "1.0.5",
-            "elm-community/dict-extra": "2.4.0",
-            "elm-community/graph": "6.0.0",
-            "elm-community/intdict": "3.1.0",
-            "elm-community/list-extra": "8.7.0",
-            "elm-community/maybe-extra": "5.3.0",
-            "elm-community/result-extra": "2.4.0",
-            "elm-community/string-extra": "4.0.1",
-            "elm-explorations/test": "2.2.1",
-            "pzp1997/assoc-list": "1.0.0",
-            "rtfeldman/elm-hex": "1.0.0",
-            "stil4m/structured-writer": "1.0.3"
-        }
-    },
-    "test-dependencies": {
-        "direct": {
-            "elm-explorations/test": "2.2.1"
-        },
-        "indirect": {}
-    }
-}

package/review/src/ReviewConfig.elm

@@ -1,87 +0,0 @@
-module ReviewConfig exposing (config)
-
-{-| Do not rename the ReviewConfig module or the config function, because
-`elm-review` will look for these.
-
-To add packages that contain rules, add them to this review project using
-
-    `elm install author/packagename`
-
-when inside the directory containing this file.
-
--}
-
-import NoConfusingPrefixOperator
-import NoDebug.Log
-import NoDebug.TodoOrToString
-import NoExposingEverything
-import NoImportingEverything
-import NoInconsistentAliases
-import NoMissingTypeAnnotation
-import NoMissingTypeAnnotationInLetIn
-import NoMissingTypeExpose
-import NoModuleOnExposedNames
-import NoPrematureLetComputation
-import NoSimpleLetBody
-import NoSinglePatternCase
-import NoUnoptimizedRecursion
-import NoUnsortedCases
-import NoUnsortedLetDeclarations
-import NoUnsortedRecords
-import NoUnsortedTopLevelDeclarations
-import NoUnused.CustomTypeConstructorArgs
-import NoUnused.CustomTypeConstructors
-import NoUnused.Dependencies
-import NoUnused.Exports
-import NoUnused.Parameters
-import NoUnused.Patterns
-import NoUnused.Variables
-import Review.Rule as Rule exposing (Rule)
-import Simplify
-
-
-config : List Rule
-config =
-    [ NoConfusingPrefixOperator.rule
-    , NoDebug.Log.rule
-    , NoDebug.TodoOrToString.rule
-        |> Rule.ignoreErrorsForDirectories [ "tests/" ]
-    , NoExposingEverything.rule
-    , NoImportingEverything.rule []
-    , NoMissingTypeAnnotation.rule
-    , NoMissingTypeExpose.rule
-    , NoSimpleLetBody.rule
-    , NoPrematureLetComputation.rule
-    , NoUnused.CustomTypeConstructors.rule []
-    , NoUnused.CustomTypeConstructorArgs.rule
-    , NoUnused.Dependencies.rule
-    , NoUnused.Exports.rule
-    , NoUnused.Parameters.rule
-    , NoUnused.Patterns.rule
-    , NoUnused.Variables.rule
-    , Simplify.rule Simplify.defaults
-    , NoSinglePatternCase.rule NoSinglePatternCase.fixInArgument
-
-    --, NoUnsortedRecords.rule NoUnsortedRecords.defaults
-    , NoUnsortedLetDeclarations.rule
-        (NoUnsortedLetDeclarations.sortLetDeclarations
-            |> NoUnsortedLetDeclarations.usedInExpressionLast
-            |> NoUnsortedLetDeclarations.glueHelpersBefore
-        )
-    , NoUnsortedCases.rule NoUnsortedCases.defaults
-    , NoUnsortedTopLevelDeclarations.rule
-        (NoUnsortedTopLevelDeclarations.sortTopLevelDeclarations
-            |> NoUnsortedTopLevelDeclarations.portsFirst
-            |> NoUnsortedTopLevelDeclarations.exposedOrderWithPrivateLast
-            |> NoUnsortedTopLevelDeclarations.alphabetically
-        )
-    , NoInconsistentAliases.config
-        [ ( "Html.Attributes", "HA" )
-        , ( "Json.Decode", "Decode" )
-        , ( "Json.Encode", "Encode" )
-        ]
-        |> NoInconsistentAliases.noMissingAliases
-        |> NoInconsistentAliases.rule
-    , NoModuleOnExposedNames.rule
-    , NoUnoptimizedRecursion.rule (NoUnoptimizedRecursion.optOutWithComment "IGNORE TCO")
-    ]

package/scripts/elm-esm.sh

@@ -1,40 +0,0 @@
-#!/bin/sh
-
-# Converts an Elm build into an ESM module so that it can
-# be imported and used as part of a JS library.
-
-set -e
-
-INPUT="$1"
-OUTPUT="$2"
-
-
-
-if [ -z "$INPUT" ] || [ -z "$OUTPUT" ]; then
-  echo "Usage: scripts/elm-esm.sh <input> <output>" 1>&2
-  exit 1
-fi
-
-perl -0777 -e '
-my ($input, $output) = @ARGV;
-open my $fh, "<", $input or die "Failed to read $input: $!";
-my $js = do { local $/; <$fh> };
-close $fh;
-
-if ($js !~ /^\s*_Platform_export\(([\s\S]*)\);\n?}\(this\)\);/m) {
-  die "Could not find Elm export payload.";
-}
-my $elm_exports = $1;
-
-my $out = $js;
-$out =~ s/\(function\s*\(scope\)\s*\{$/\/\/ -- $&/m;
-$out =~ s/["'"]use strict["'"];$/\/\/ -- $&/m;
-$out =~ s/function _Platform_export([\s\S]*?)\}\n/\/\*\n$&\n\*\//g;
-$out =~ s/function _Platform_mergeExports([\s\S]*?)\}\n\s*}/\/\*\n$&\n\*\//g;
-$out =~ s/^\s*_Platform_export\(([\s\S]*)\);\n?}\(this\)\);/\/\*\n$&\n\*\//m;
-$out .= "\nexport const Elm = $elm_exports;\n";
-
-open my $out_fh, ">", $output or die "Failed to write $output: $!";
-print {$out_fh} $out;
-close $out_fh;
-' "$INPUT" "$OUTPUT"

package/scripts/minify-css.mjs

@@ -1,31 +0,0 @@
-import fs from "node:fs/promises";
-import path from "node:path";
-import {fileURLToPath} from "node:url";
-import {transform} from "lightningcss";
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-const rootDir = path.resolve(__dirname, "..");
-
-const sources = [
-  "src/styles/theme.css",
-  "src/styles/app.css",
-  "src/styles/sidebar.css",
-  "src/styles/toolbar.css",
-  "src/styles/modal.css",
-  "src/styles/collection.css",
-];
-
-const input = await Promise.all(
-  sources.map((file) => fs.readFile(path.join(rootDir, file), "utf8"))
-);
-
-const css = input.join("\n");
-const result = transform({
-  code: Buffer.from(css),
-  minify: true,
-});
-
-const outDir = path.join(rootDir, "cache");
-await fs.mkdir(outDir, {recursive: true});
-await fs.writeFile(path.join(outDir, "diva.css"), result.code);