chore(deps): lock file maintenance

Reviewed-on: https://git2.f3l.de/saluu/darkness-dependent-vision/pulls/4

.eslintrc.cjs

@@ -19,6 +19,7 @@ module.exports = {
   plugins: [],
 
   globals: {
+    DefaultTokenConfig: false,
     PrototypeTokenDocument: false,
   },
 
@@ -28,7 +29,7 @@ module.exports = {
 
   overrides: [
     {
-      files: ['./*.js', './tools/**/*'],
+      files: ['./*.js', './*.cjs', './*.mjs', './tools/**/*'],
       env: {
         node: true,
         browser: false,

.gitlab-ci.yml

@@ -1,160 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Johannes Loher
-# SPDX-FileCopyrightText: 2021 Oliver Rümpelein
-#
-# SPDX-License-Identifier: MIT
-
-image: node:lts
-
-stages:
-  - test
-  - build
-  - prepare-release
-  - release
-  - publish
-
-cache: &global_cache
-  paths:
-    - .yarn/cache
-
-lint:
-  stage: test
-  before_script:
-    - yarn install --immutable
-  script:
-    - yarn lint
-  cache:
-    <<: *global_cache
-
-reuse:
-  stage: test
-  image:
-    name: fsfe/reuse:latest
-    entrypoint: ['']
-  script:
-    - reuse lint
-
-build:
-  stage: build
-  before_script:
-    - yarn install --immutable
-    - if [[ ! -z ${CI_COMMIT_TAG+x} ]]; then export NODE_ENV=production; fi
-  script:
-    - yarn build
-    - mv dist darkness-dependent-vision
-  cache:
-    <<: *global_cache
-  artifacts:
-    paths:
-      - darkness-dependent-vision
-    expire_in: 1 week
-
-publish-artifacts:
-  stage: prepare-release
-  image: alpine:latest
-  before_script:
-    - apk update
-    - apk add zip curl
-  script: |
-    zip -r darkness-dependent-vision.zip darkness-dependent-vision/*
-    curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file darkness-dependent-vision.zip "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/darkness-dependent-vision/$CI_COMMIT_TAG/darkness-dependent-vision.zip"
-    curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file darkness-dependent-vision/module.json "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/darkness-dependent-vision/$CI_COMMIT_TAG/module.json"
-  rules:
-    - if: '$CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+$/'
-
-changelog:
-  stage: prepare-release
-  before_script:
-    - yarn install --immutable
-  script:
-    - yarn changelog
-  cache:
-    <<: *global_cache
-  artifacts:
-    paths:
-      - CHANGELOG.md
-  rules:
-    - if: '$CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+$/'
-
-.release-template: &release-template
-  stage: release
-  before_script:
-    - yarn install --immutable
-    - apt update
-    - apt install --yes jq
-    - REPOSITORY_URL=$(echo "${CI_REPOSITORY_URL}" | sed -e "s|gitlab-ci-token:.*@|${RELEASE_TOKEN}:${RELEASE_TOKEN_SECRET}@|g")
-    - git remote set-url origin $REPOSITORY_URL
-    - git config user.name $GITLAB_USER_LOGIN
-    - git config user.email $GITLAB_USER_EMAIL
-    - git branch -D ci-processing || true
-    - git checkout -b ci-processing
-  cache:
-    <<: *global_cache
-  script: |
-    yarn bump-version --release=${RELEASE_TYPE}
-    RELEASE_VERSION=$(jq -r '.version' < package.json)
-    git add package.json module.json
-    git --no-pager diff
-    git commit -m "chore(release): ${RELEASE_VERSION}"
-    git tag -f ${RELEASE_VERSION}
-    git push origin ci-processing:${CI_BUILD_REF_NAME} -o ci.skip
-    git push origin ${RELEASE_VERSION}
-  only:
-    - master
-  when: manual
-
-release-patch:
-  variables:
-    RELEASE_TYPE: patch
-  <<: *release-template
-
-release-minor:
-  variables:
-    RELEASE_TYPE: minor
-  <<: *release-template
-
-release-major:
-  variables:
-    RELEASE_TYPE: major
-  <<: *release-template
-
-release:
-  stage: release
-  image: registry.gitlab.com/gitlab-org/release-cli:latest
-  script:
-    - echo 'release job'
-  rules:
-    - if: '$CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+$/'
-  release:
-    tag_name: $CI_COMMIT_TAG
-    description: './CHANGELOG.md'
-    assets:
-      links:
-        - name: 'darkness-dependent-vision.zip'
-          url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/darkness-dependent-vision/$CI_COMMIT_TAG/darkness-dependent-vision.zip'
-          filepath: /darkness-dependent-vision.zip
-          link_type: package
-        - name: 'module.json'
-          url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/darkness-dependent-vision/$CI_COMMIT_TAG/module.json'
-          filepath: /module.json
-          link_type: other
-
-publish-latest-manifest:
-  stage: publish
-  image: alpine:latest
-  before_script:
-    - apk update
-    - apk add zip curl
-  script: |
-    curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file darkness-dependent-vision/module.json "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/darkness-dependent-vision/latest/module.json"
-  rules:
-    - if: '$CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+$/'
-
-publish-to-foundry-admin:
-  stage: publish
-  image: johannesloher/foundry-publish
-  variables:
-    FVTT_MANIFEST_PATH: darkness-dependent-vision/module.json
-    FVTT_MANIFEST_URL: ${CI_PROJECT_URL}/-/releases/${CI_COMMIT_TAG}/downloads/module.json
-  script: foundry-publish
-  rules:
-    - if: '$CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+$/'

.reuse/dep5

@@ -1,7 +1,7 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: darkness-dependent-vision
 Upstream-Contact: Johannes Loher <johannes.loher@fg4f.de>
-Source: https://git.f3l.de/ghost/darkness-dependent-vision
+Source: https://git2.f3l.de/saluu/darkness-dependent-vision
 
 Files: .yarn/**
 Copyright: Copyright (c) 2016-present, Yarn Contributors. All rights reserved.

.woodpecker/checks.yml

@@ -0,0 +1,32 @@
+# SPDX-FileCopyrightText: 2023 Johannes Loher
+#
+# SPDX-License-Identifier: MIT
+
+variables:
+  - &node_image node:lts
+
+when:
+  - event: push
+  - event: tag
+  - event: manual
+
+steps:
+  install:
+    image: *node_image
+    commands:
+      - yarn install --immutable
+  lint:
+    group: test
+    image: *node_image
+    commands:
+      - yarn lint
+  reuse:
+    group: test
+    image: fsfe/reuse:latest
+    commands:
+      - reuse lint
+  build:
+    group: build
+    image: *node_image
+    commands:
+      - yarn build

.woodpecker/publish.yml

@@ -0,0 +1,72 @@
+# SPDX-FileCopyrightText: 2023 Johannes Loher
+#
+# SPDX-License-Identifier: MIT
+
+variables:
+  - &node_image node:lts
+
+when:
+  event: tag
+  evaluate: CI_COMMIT_TAG matches "^[0-9]+\\\\.[0-9]+\\\\.[0-9]+$"
+
+depends_on:
+  - checks
+
+steps:
+  install:
+    image: *node_image
+    commands:
+      - yarn install --immutable
+  build:
+    image: *node_image
+    environment:
+      NODE_ENV: production
+    commands:
+      - yarn build
+  package:
+    group: prepare-release
+    image: alpine:latest
+    commands:
+      - apk update
+      - apk add zip curl
+      - mv dist ${CI_REPO_NAME}
+      - zip -r ${CI_REPO_NAME}.zip ${CI_REPO_NAME}/*
+  changelog:
+    group: prepare-release
+    image: *node_image
+    commands:
+      - yarn changelog
+  release:
+    image: woodpeckerci/plugin-gitea-release
+    settings:
+      base_url: ${CI_FORGE_URL}
+      title: ${CI_COMMIT_TAG}
+      note: CHANGELOG.md
+      files:
+        - ${CI_REPO_NAME}.zip
+        - ${CI_REPO_NAME}/module.json
+      api_key:
+        from_secret: forge_token
+  publish-latest-manifest:
+    group: publish
+    image: alpine:latest
+    commands:
+      - apk update
+      - apk add curl
+      - 'curl --header "Authorization: token $${FORGE_TOKEN}" -X "DELETE" "${CI_FORGE_URL}/api/packages/${CI_REPO_OWNER}/generic/${CI_REPO_NAME}/latest/module.json"'
+      - 'curl --fail --header "Authorization: token $${FORGE_TOKEN}" --upload-file ${CI_REPO_NAME}/module.json "${CI_FORGE_URL}/api/packages/${CI_REPO_OWNER}/generic/${CI_REPO_NAME}/latest/module.json"'
+    secrets:
+      - forge_token
+  publish-to-foundry-admin:
+    group: publish
+    image: johannesloher/foundry-publish
+    environment:
+      FVTT_DELETE_OBSOLETE_VERSIONS: 'true'
+    commands:
+      - export FVTT_MANIFEST_PATH=${CI_REPO_NAME}/module.json
+      - export FVTT_MANIFEST_URL=${CI_REPO_URL}/releases/download/${CI_COMMIT_TAG}/module.json
+      - foundry-publish
+    secrets:
+      - fvtt_package_id
+      - fvtt_username
+      - fvtt_password

.woodpecker/release.yml

@@ -0,0 +1,39 @@
+# SPDX-FileCopyrightText: 2023 Johannes Loher
+#
+# SPDX-License-Identifier: MIT
+
+variables:
+  - &node_image node:lts
+
+when:
+  event: manual
+  branch: ${CI_REPO_DEFAULT_BRANCH}
+
+depends_on:
+  - checks
+
+steps:
+  install:
+    image: *node_image
+    commands:
+      - yarn install --immutable
+  release:
+    image: *node_image
+    commands:
+      - apt-get update
+      - apt-get install --yes jq
+      - export REPOSITORY_URL=$(echo "${CI_REPO_CLONE_URL}" | sed -e "s|://|://$${FORGE_TOKEN_NAME}:$${FORGE_TOKEN}@|g")
+      - git remote set-url origin $${REPOSITORY_URL}
+      - git config user.name woodpecker[bot]
+      - git config user.email woodpecker[bot]@${CI_SYSTEM_HOST}
+      - yarn bump-version --release=${RELEASE_TYPE}
+      - export RELEASE_VERSION=$(jq -r '.version' < package.json)
+      - git --no-pager diff
+      - git add package.json module.json
+      - 'git commit -m "chore(release): $${RELEASE_VERSION}"'
+      - git tag -f $${RELEASE_VERSION}
+      - git push origin ${CI_COMMIT_BRANCH}
+      - git push origin $${RELEASE_VERSION}
+    secrets:
+      - forge_token_name
+      - forge_token

.yarn/sdks/eslint/bin/eslint.js

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 
 const {existsSync} = require(`fs`);
-const {createRequire, createRequireFromPath} = require(`module`);
+const {createRequire} = require(`module`);
 const {resolve} = require(`path`);
 
-const relPnpApiPath = "../../../../.pnp.js";
+const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
 
 if (existsSync(absPnpApiPath)) {
   if (!process.versions.pnp) {

.yarn/sdks/eslint/lib/api.js

@@ -1,20 +1,20 @@
 #!/usr/bin/env node
 
 const {existsSync} = require(`fs`);
-const {createRequire, createRequireFromPath} = require(`module`);
+const {createRequire} = require(`module`);
 const {resolve} = require(`path`);
 
-const relPnpApiPath = "../../../../.pnp.js";
+const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
 
 if (existsSync(absPnpApiPath)) {
   if (!process.versions.pnp) {
-    // Setup the environment to be able to require eslint/lib/api.js
+    // Setup the environment to be able to require eslint
     require(absPnpApiPath).setup();
   }
 }
 
-// Defer to the real eslint/lib/api.js your application uses
-module.exports = absRequire(`eslint/lib/api.js`);
+// Defer to the real eslint your application uses
+module.exports = absRequire(`eslint`);

.yarn/sdks/eslint/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint",
-  "version": "8.1.0-sdk",
+  "version": "8.25.0-sdk",
   "main": "./lib/api.js",
   "type": "commonjs"
 }

.yarn/sdks/prettier/index.js

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 
 const {existsSync} = require(`fs`);
-const {createRequire, createRequireFromPath} = require(`module`);
+const {createRequire} = require(`module`);
 const {resolve} = require(`path`);
 
-const relPnpApiPath = "../../../.pnp.js";
+const relPnpApiPath = "../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
 
 if (existsSync(absPnpApiPath)) {
   if (!process.versions.pnp) {

.yarn/sdks/prettier/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier",
-  "version": "2.4.1-sdk",
+  "version": "2.7.1-sdk",
   "main": "./index.js",
   "type": "commonjs"
 }

.yarnrc.yml

@@ -2,4 +2,4 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
     spec: '@yarnpkg/plugin-interactive-tools'
 
-yarnPath: .yarn/releases/yarn-3.1.1.cjs
+yarnPath: .yarn/releases/yarn-3.7.0.cjs

README.md

@@ -6,6 +6,12 @@ SPDX-License-Identifier: MIT
 
 # Darkness Dependent Vision
 
+[![status-badge](https://ci.f3l.de/api/badges/1/status.svg)](https://ci.f3l.de/repos/1)
+[![REUSE status](https://api.reuse.software/badge/git2.f3l.de/saluu/darkness-dependent-vision)](https://api.reuse.software/info/git2.f3l.de/saluu/darkness-dependent-vision)
+[![Forge installs](https://img.shields.io/badge/dynamic/json?label=Forge%20Installs&query=package.installs&suffix=%25&url=https%3A%2F%2Fforge-vtt.com%2Fapi%2Fbazaar%2Fpackage%2Fdarkness-dependent-vision&colorB=4aa94a)](https://forge-vtt.com/bazaar#package=darkness-dependent-vision)
+[![Supported foundry versions](https://img.shields.io/endpoint?url=https://foundryshields.com/version?url=https%3A%2F%2Fgit2.f3l.de%2Fapi%2Fpackages%2Fsaluu%2Fgeneric%2Fdarkness-dependent-vision%2Flatest%2Fmodule.json)](https://git2.f3l.de/saluu/darkness-dependent-vision)
+[![Ko-fi](https://img.shields.io/badge/Ko--fi-ghostfvtt-00B9FE?logo=kofi)](https://ko-fi.com/ghostfvtt)
+
 A module for [Foundry Virtual Tabletop] that provides functionality to make the
 dim and bright vision of tokens depend on the scene's darkness level.
 
@@ -15,7 +21,7 @@ To install and use the Darkness Dependent Vision module for Foundry Virtual
 Tabletop, simply paste the following URL into the **Install Module** dialog on
 the Setup menu of the application.
 
-https://git.f3l.de/ghost/darkness-dependent-vision/-/raw/latest/src/module.json?inline=false
+https://git2.f3l.de/api/packages/saluu/generic/darkness-dependent-vision/latest/module.json
 
 ### libWrapper
 

module.json

@@ -1,8 +1,9 @@
 {
   "name": "darkness-dependent-vision",
+  "id": "darkness-dependent-vision",
   "title": "Darkness Dependent Vision",
   "description": "A module for Foundry Virtual Tabletop that provides functionality to make the dim and bright vision of tokens depend on the scene's darkness level.",
-  "version": "0.3.4",
+  "version": "0.3.13",
   "author": "Johannes Loher",
   "authors": [
     {
@@ -12,6 +13,11 @@
   ],
   "minimumCoreVersion": "9.236",
   "compatibleCoreVersion": "9",
+  "compatibility": {
+    "minimum": "9.236",
+    "verified": "9",
+    "maximum": "9"
+  },
   "esmodules": ["darkness-dependent-vision.js"],
   "languages": [
     {
@@ -25,11 +31,11 @@
       "path": "lang/en.json"
     }
   ],
-  "url": "https://git.f3l.de/ghost/darkness-dependent-vision",
-  "manifest": "https://git.f3l.de/api/v4/projects/ghost%2Fdarkness-dependent-vision/packages/generic/darkness-dependent-vision/latest/module.json",
-  "download": "https://git.f3l.de/ghost/darkness-dependent-vision/-/releases/0.3.4/downloads/darkness-dependent-vision.zip",
-  "bugs": "https://git.f3l.de/ghost/darkness-dependent-vision/-/issues",
-  "changelog": "https://git.f3l.de/ghost/darkness-dependent-vision/-/releases/0.3.4",
-  "readme": "./README.md",
-  "license": "./LICENSE.md"
+  "url": "https://git2.f3l.de/saluu/darkness-dependent-vision",
+  "manifest": "https://git2.f3l.de/api/packages/saluu/generic/darkness-dependent-vision/latest/module.json",
+  "download": "https://git2.f3l.de/saluu/darkness-dependent-vision/releases/download/0.3.13/darkness-dependent-vision.zip",
+  "bugs": "https://git2.f3l.de/saluu/darkness-dependent-vision/issues",
+  "changelog": "https://git2.f3l.de/saluu/darkness-dependent-vision/releases/tag/0.3.13",
+  "readme": "https://git2.f3l.de/saluu/darkness-dependent-vision/raw/tag/0.3.13/README.md",
+  "license": "https://git2.f3l.de/saluu/darkness-dependent-vision/raw/tag/0.3.13/LICENSE.md"
 }

package.json

@@ -1,16 +1,16 @@
 {
   "private": true,
   "name": "darkness-dependent-vision",
-  "version": "0.3.4",
+  "version": "0.3.13",
   "description": "A module for Foundry Virtual Tabletop that provides functionality to make the dim and bright vision of tokens depend on the scene's darkness level.",
-  "license": "https://git.f3l.de/ghost/darkness-dependent-vision#licensing",
-  "homepage": "https://git.f3l.de/ghost/darkness-dependent-vision",
+  "license": "https://git2.f3l.de/saluu/darkness-dependent-vision/src/branch/master/LICENSE.md",
+  "homepage": "https://git2.f3l.de/saluu/darkness-dependent-vision",
   "repository": {
     "type": "git",
-    "url": "https://git.f3l.de/ghost/darkness-dependent-vision"
+    "url": "https://git2.f3l.de/saluu/darkness-dependent-vision"
   },
   "bugs": {
-    "url": "https://git.f3l.de/ghost/darkness-dependent-vision/-/issues"
+    "url": "https://git2.f3l.de/saluu/darkness-dependent-vision/issues"
   },
   "contributors": [
     {
@@ -18,6 +18,7 @@
       "email": "johannes.loher@fg4f.de"
     }
   ],
+  "type": "module",
   "scripts": {
     "build": "run-s clean:files build:files",
     "build:files": "rollup -c",
@@ -35,30 +36,30 @@
     "changelog": "conventional-changelog -p conventionalcommits -o CHANGELOG.md -r 2"
   },
   "devDependencies": {
-    "@commitlint/cli": "16.1.0",
-    "@commitlint/config-conventional": "16.0.0",
-    "@guanghechen/rollup-plugin-copy": "1.8.6",
+    "@commitlint/cli": "18.4.3",
+    "@commitlint/config-conventional": "18.4.3",
+    "@guanghechen/rollup-plugin-copy": "5.0.12",
     "@typhonjs-fvtt/eslint-config-foundry.js": "0.8.0",
-    "conventional-changelog-cli": "2.2.2",
-    "conventional-changelog-conventionalcommits": "4.6.3",
-    "eslint": "8.8.0",
-    "eslint-config-prettier": "8.3.0",
-    "eslint-plugin-prettier": "4.0.0",
-    "fs-extra": "10.0.0",
+    "conventional-changelog-cli": "4.1.0",
+    "conventional-changelog-conventionalcommits": "7.0.2",
+    "eslint": "8.56.0",
+    "eslint-config-prettier": "9.1.0",
+    "eslint-plugin-prettier": "4.2.1",
+    "fs-extra": "11.2.0",
     "gulp": "4.0.2",
-    "husky": "7.0.4",
-    "lint-staged": "12.3.3",
+    "husky": "8.0.3",
+    "lint-staged": "15.2.0",
     "npm-run-all": "4.1.5",
-    "prettier": "2.5.1",
-    "rimraf": "3.0.2",
-    "rollup": "2.66.1",
+    "prettier": "2.8.8",
+    "rimraf": "5.0.5",
+    "rollup": "4.9.1",
     "rollup-plugin-terser": "7.0.2",
-    "semver": "7.3.5",
-    "yargs": "17.3.1"
+    "semver": "7.5.4",
+    "yargs": "17.7.2"
   },
   "lint-staged": {
     "*.(js|mjs|cjs)": "eslint --fix",
     "*.(json|css|yml)": "prettier --write"
   },
-  "packageManager": "yarn@3.1.1"
+  "packageManager": "yarn@3.7.0"
 }

renovate.json

@@ -1,4 +1,7 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["config:base", ":automergeAll", ":automergeBranch", ":prHourlyLimitNone", ":prConcurrentLimitNone"]
+  "extends": ["config:base", ":automergeAll", ":automergeBranch", ":prHourlyLimitNone", ":prConcurrentLimitNone"],
+  "lockFileMaintenance": {
+    "enabled": true
+  }
 }

rollup.config.js

@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-import copy from '@guanghechen/rollup-plugin-copy';
+import { copy } from '@guanghechen/rollup-plugin-copy';
 import { terser } from 'rollup-plugin-terser';
 import { distDirectory, name, sourceDirectory } from './tools/const.mjs';
 

src/darkness-dependent-vision-config.js

@@ -52,6 +52,10 @@ export class DarknessDependentVisionConfig extends FormApplication {
     return `${name}: ${game.i18n.localize('DarknessDependentVision.Title')}`;
   }
 
+  get isDefault() {
+    return this.options.tokenConfig instanceof DefaultTokenConfig;
+  }
+
   async getData() {
     const data = this.isPrototype ? this.actor.data.token : this.token.data;
     return {
@@ -69,9 +73,23 @@ export class DarknessDependentVisionConfig extends FormApplication {
   }
 
   async _updateObject(event, formData) {
+    // Configure the Default Token Configuration
+    if (this.isDefault) {
+      const current = game.settings.get('core', DefaultTokenConfig.SETTING);
+      const update = foundry.utils.mergeObject(current, formData, { inplace: false });
+      const result = await game.settings.set('core', DefaultTokenConfig.SETTING, update);
+      const tokenConfig = this.options.tokenConfig;
+      tokenConfig.data = new foundry.data.TokenData(result);
+      tokenConfig.object = new TokenDocument(tokenConfig.data, { actor: null });
+      tokenConfig.token = tokenConfig.object;
+      tokenConfig.render();
+      return result;
+    }
+
     // Configure the Prototype Token data of an Actor
     if (this.isPrototype) return this.actor.update({ token: formData });
+
     // Update an embedded Token document
-    else return this.token.update(formData);
+    return this.token.update(formData);
   }
 }

src/hooks/getTokenConfigHeaderButtons.js

@@ -22,7 +22,7 @@ function onGetTokenConfigHeaderButtons(tokenConfig, buttons) {
     class: 'configure-darkness-dependent-vision',
     icon: 'fas fa-eye',
     onclick: async () => {
-      return new DarknessDependentVisionConfig(tokenConfig.object).render(true);
+      return new DarknessDependentVisionConfig(tokenConfig.object, { tokenConfig }).render(true);
     },
   });
 }

src/shims/libWrapperShim.js

@@ -1,11 +1,16 @@
-// Copyright © 2021 fvtt-lib-wrapper Rui Pinheiro
-// 2021 Johannes Loher
-//
 // SPDX-License-Identifier: MIT
+// Copyright © 2021 fvtt-lib-wrapper Rui Pinheiro
+
+'use strict';
 
 // A shim for the libWrapper library
 export let libWrapper = undefined;
 
+export const VERSIONS = [1, 12, 1];
+export const TGT_SPLIT_RE = new RegExp('([^.[]+|\\[(\'([^\'\\\\]|\\\\.)+?\'|"([^"\\\\]|\\\\.)+?")\\])', 'g');
+export const TGT_CLEANUP_RE = new RegExp('(^\\[\'|\'\\]$|^\\["|"\\]$)', 'g');
+
+// Main shim code
 Hooks.once('init', () => {
   // Check if the real module is already loaded - if so, use it
   if (globalThis.libWrapper && !(globalThis.libWrapper.is_fallback ?? true)) {
@@ -19,14 +24,31 @@ Hooks.once('init', () => {
       return true;
     }
 
-    static register(package_id, target, fn, type = 'MIXED', { chain = undefined } = {}) {
+    static get WRAPPER() {
+      return 'WRAPPER';
+    }
+    static get MIXED() {
+      return 'MIXED';
+    }
+    static get OVERRIDE() {
+      return 'OVERRIDE';
+    }
+
+    static register(package_id, target, fn, type = 'MIXED', { chain = undefined, bind = [] } = {}) {
       const is_setter = target.endsWith('#set');
       target = !is_setter ? target : target.slice(0, -4);
-      const split = target.split('.');
-      const fn_name = split.pop();
+      const split = target.match(TGT_SPLIT_RE).map((x) => x.replace(/\\(.)/g, '$1').replace(TGT_CLEANUP_RE, ''));
       const root_nm = split.splice(0, 1)[0];
-      const _eval = eval; // The browser doesn't expose all global variables (e.g. 'Game') inside globalThis, but it does to an eval. We copy it to a variable to have it run in global scope.
-      const obj = split.reduce((x, y) => x[y], globalThis[root_nm] ?? _eval(root_nm));
+
+      let obj, fn_name;
+      if (split.length == 0) {
+        obj = globalThis;
+        fn_name = root_nm;
+      } else {
+        const _eval = eval;
+        fn_name = split.pop();
+        obj = split.reduce((x, y) => x[y], globalThis[root_nm] ?? _eval(root_nm));
+      }
 
       let iObj = obj;
       let descriptor = null;
@@ -36,18 +58,19 @@ Hooks.once('init', () => {
         iObj = Object.getPrototypeOf(iObj);
       }
       if (!descriptor || descriptor?.configurable === false)
-        throw `libWrapper Shim: '${target}' does not exist, could not be found, or has a non-configurable descriptor.`;
+        throw new Error(
+          `libWrapper Shim: '${target}' does not exist, could not be found, or has a non-configurable descriptor.`,
+        );
 
       let original = null;
       const wrapper =
-        chain ?? type != 'OVERRIDE'
-          ? function () {
-              return fn.call(this, original.bind(this), ...arguments);
+        chain ?? (type.toUpperCase?.() != 'OVERRIDE' && type != 3)
+          ? function (...args) {
+              return fn.call(this, original.bind(this), ...bind, ...args);
             }
-          : function () {
-              return fn.apply(this, arguments);
+          : function (...args) {
+              return fn.call(this, ...bind, ...args);
             };
-
       if (!is_setter) {
         if (descriptor.value) {
           original = descriptor.value;
@@ -57,7 +80,7 @@ Hooks.once('init', () => {
           descriptor.get = wrapper;
         }
       } else {
-        if (!descriptor.set) throw `libWrapper Shim: '${target}' does not have a setter`;
+        if (!descriptor.set) throw new Error(`libWrapper Shim: '${target}' does not have a setter`);
         original = descriptor.set;
         descriptor.set = wrapper;
       }
@@ -68,11 +91,8 @@ Hooks.once('init', () => {
   };
 
   //************** USER CUSTOMIZABLE:
-  // Whether to warn GM that the fallback is being used
-  const WARN_FALLBACK = true;
-
-  // Set up the ready hook that shows the "libWrapper not installed" warning dialog
-  if (WARN_FALLBACK) {
+  // Set up the ready hook that shows the "libWrapper not installed" warning dialog. Remove if undesired.
+  {
     //************** USER CUSTOMIZABLE:
     // Package ID & Package Title - by default attempts to auto-detect, but you might want to hardcode your package ID and title here to avoid potential auto-detect issues
     const [PACKAGE_ID, PACKAGE_TITLE] = (() => {

tools/bump-version.mjs

@@ -7,11 +7,20 @@ import semver from 'semver';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
 
-const getDownloadURL = (version) =>
-  `https://git.f3l.de/ghost/darkness-dependent-vision/-/releases/${version}/downloads/darkness-dependent-vision.zip`;
-const getChangelogURL = (version) => `https://git.f3l.de/ghost/darkness-dependent-vision/-/releases/${version}`;
+const packageType = 'module';
+const repositoryOwner = process.env.CI_REPO_OWNER;
+const repositoryName = process.env.CI_REPO_NAME;
+const repositoryURL = process.env.CI_REPO_LINK;
+const forgeURL = process.env.CI_FORGE_URL;
 
-const manifestPath = 'module.json';
+const manifestURL = `${forgeURL}/api/packages/${repositoryOwner}/generic/${repositoryName}/latest/${packageType}.json`;
+const getDownloadURL = (version) => `${repositoryURL}/releases/download/${version}/${repositoryName}.zip`;
+const bugsURL = `${repositoryURL}/issues`;
+const getChangelogURL = (version) => `${repositoryURL}/releases/tag/${version}`;
+const getReadmeURL = (version) => `${repositoryURL}/raw/tag/${version}/README.md`;
+const getLicenseURL = (version) => `${repositoryURL}/raw/tag/${version}/LICENSE.md`;
+
+const manifestPath = `${packageType}.json`;
 
 /**
  * Get the contents of the manifest file as object.
@@ -62,11 +71,16 @@ function bumpVersion(release) {
 
   console.log(`Bumping version number to '${targetVersion}'`);
   packageJson.version = targetVersion;
-  fs.writeJSONSync('package.json', packageJson, { spaces: 4 });
+  fs.writeJSONSync('package.json', packageJson, { spaces: 2 });
   manifest.version = targetVersion;
+  manifest.url = repositoryURL;
+  manifest.manifest = manifestURL;
   manifest.download = getDownloadURL(targetVersion);
+  manifest.bugs = bugsURL;
   manifest.changelog = getChangelogURL(targetVersion);
-  fs.writeJSONSync(manifestPath, manifest, { spaces: 4 });
+  manifest.readme = getReadmeURL(targetVersion);
+  manifest.license = getLicenseURL(targetVersion);
+  fs.writeJSONSync(manifestPath, manifest, { spaces: 2 });
 }
 
 const argv = yargs(hideBin(process.argv)).usage('Usage: $0').option('release', {