diff --git a/bin/log.js b/bin/log.js index 5a587d1..0c762a3 100644 --- a/bin/log.js +++ b/bin/log.js @@ -1,7 +1,7 @@ +const fs = require('node:fs') +const util = require('node:util') +const tty = require('node:tty') const debug = require('debug') -const fs = require('fs') -const util = require('util') -const tty = require('tty') /* Thumbsup uses the package for logging. diff --git a/src/cli/options.js b/src/cli/options.js index 5dff953..1ec8d26 100644 --- a/src/cli/options.js +++ b/src/cli/options.js @@ -1,9 +1,9 @@ /* eslint-disable quote-props */ -const messages = require('./messages') -const path = require('path') -const yargs = require('yargs') -const os = require('os') +const path = require('node:path') +const os = require('node:os') const _ = require('lodash') +const yargs = require('yargs') +const messages = require('./messages') const OPTIONS = { diff --git a/src/components/exiftool/parallel.js b/src/components/exiftool/parallel.js index d77f9c4..082d2e0 100644 --- a/src/components/exiftool/parallel.js +++ b/src/components/exiftool/parallel.js @@ -1,8 +1,8 @@ +const os = require('node:os') const _ = require('lodash') const debug = require('debug')('thumbsup:debug') const es = require('event-stream') const exiftool = require('./stream.js') -const os = require('os') /* Fans out the list of files to multiple exiftool processes (default = CPU count) diff --git a/src/components/exiftool/stream.js b/src/components/exiftool/stream.js index 51259e1..8b72753 100644 --- a/src/components/exiftool/stream.js +++ b/src/components/exiftool/stream.js @@ -1,4 +1,4 @@ -const childProcess = require('child_process') +const childProcess = require('node:child_process') const trace = require('debug')('thumbsup:trace') const debug = require('debug')('thumbsup:debug') const error = require('debug')('thumbsup:error') diff --git a/src/components/index/index.js b/src/components/index/index.js index b7f1bca..0f530b4 100644 --- a/src/components/index/index.js +++ b/src/components/index/index.js @@ -1,12 +1,12 @@ +const EventEmitter = require('node:events') +const path = require('node:path') const _ = require('lodash') const Database = require('better-sqlite3') +const fs = require('fs-extra') +const moment = require('moment') const delta = require('./delta') -const EventEmitter = require('events') const exiftool = require('../exiftool/parallel') -const fs = require('fs-extra') const globber = require('./glob') -const moment = require('moment') -const path = require('path') const EXIF_DATE_FORMAT = 'YYYY:MM:DD HH:mm:ssZ' diff --git a/src/components/index/pattern.js b/src/components/index/pattern.js index ead17d4..5d1e01d 100644 --- a/src/components/index/pattern.js +++ b/src/components/index/pattern.js @@ -1,5 +1,5 @@ +const path = require('node:path') const _ = require('lodash') -const path = require('path') const micromatch = require('micromatch') class GlobPattern { diff --git a/src/input/album-mapper.js b/src/input/album-mapper.js index a6ae80f..0860347 100644 --- a/src/input/album-mapper.js +++ b/src/input/album-mapper.js @@ -5,8 +5,8 @@ based on the --albums-from array of patterns provided -------------------------------------------------------------------------------- */ +const path = require('node:path') const _ = require('lodash') -const path = require('path') const albumPattern = require('./album-pattern') class AlbumMapper { diff --git a/src/input/album-pattern.js b/src/input/album-pattern.js index 76bd3df..940a951 100644 --- a/src/input/album-pattern.js +++ b/src/input/album-pattern.js @@ -5,8 +5,8 @@ Can be based on anything, e.g. directory name, date, metadata keywords... e.g. `Holidays/London/IMG_00001.jpg` -> `Holidays/London` -------------------------------------------------------------------------------- */ +const path = require('node:path') const moment = require('moment') -const path = require('path') const TOKEN_REGEX = /%[a-z]+/g const DATE_REGEX = /{[^}]+}/g diff --git a/src/input/hierarchy.js b/src/input/hierarchy.js index 5d8fd3f..41a79a8 100644 --- a/src/input/hierarchy.js +++ b/src/input/hierarchy.js @@ -1,5 +1,5 @@ +const path = require('node:path') const _ = require('lodash') -const path = require('path') const Album = require('../model/album') exports.createAlbums = function (collection, mapper, opts, picasaReader) { diff --git a/src/input/picasa.js b/src/input/picasa.js index 5003e9f..2df23d3 100644 --- a/src/input/picasa.js +++ b/src/input/picasa.js @@ -4,9 +4,9 @@ Provides Picasa metadata based on files in the input folder -------------------------------------------------------------------------------- */ +const fs = require('node:fs') +const path = require('node:path') const ini = require('ini') -const fs = require('fs') -const path = require('path') class Picasa { constructor () { diff --git a/src/model/album.js b/src/model/album.js index bee51b9..c08c3ac 100644 --- a/src/model/album.js +++ b/src/model/album.js @@ -6,8 +6,8 @@ A single photo/video could exist in multiple albums -------------------------------------------------------------------------------- */ +const path = require('node:path') const _ = require('lodash') -const path = require('path') const slugify = require('slugify') const url = require('./url') diff --git a/src/model/file.js b/src/model/file.js index 1bb42fa..5cf7994 100644 --- a/src/model/file.js +++ b/src/model/file.js @@ -5,8 +5,8 @@ Also includes how it maps to the different output files -------------------------------------------------------------------------------- */ +const path = require('node:path') const _ = require('lodash') -const path = require('path') const moment = require('moment') const output = require('./output') const url = require('./url') diff --git a/src/model/metadata.js b/src/model/metadata.js index 4103ebc..02ac63f 100644 --- a/src/model/metadata.js +++ b/src/model/metadata.js @@ -5,9 +5,9 @@ This is based on parsing "provider data" such as Exiftool or Picasa -------------------------------------------------------------------------------- */ +const path = require('node:path') const _ = require('lodash') const moment = require('moment') -const path = require('path') // mime type for videos const MIME_VIDEO_REGEX = /^video\/.*$/ diff --git a/src/model/structure.js b/src/model/structure.js index a33b321..b34133b 100644 --- a/src/model/structure.js +++ b/src/model/structure.js @@ -1,4 +1,4 @@ -const path = require('path') +const path = require('node:path') const urljoin = require('url-join') const url = require('./url') diff --git a/src/model/url.js b/src/model/url.js index 953e38d..cc547d1 100644 --- a/src/model/url.js +++ b/src/model/url.js @@ -1,5 +1,5 @@ -const path = require('path') -const process = require('process') +const path = require('node:path') +const process = require('node:process') exports.fromPath = function (filepath) { // already a URL (typically provided as a CLI argument, e.g. link prefix) diff --git a/src/steps/step-album-zip.js b/src/steps/step-album-zip.js index 58128c9..a60d77b 100644 --- a/src/steps/step-album-zip.js +++ b/src/steps/step-album-zip.js @@ -1,7 +1,7 @@ +const path = require('node:path') +const childProcess = require('node:child_process') const async = require('async') -const childProcess = require('child_process') const Observable = require('zen-observable') -const path = require('path') const trace = require('debug')('thumbsup:trace') const debug = require('debug')('thumbsup:debug') const error = require('debug')('thumbsup:error') diff --git a/src/steps/step-cleanup.js b/src/steps/step-cleanup.js index a31ae2c..4af0692 100644 --- a/src/steps/step-cleanup.js +++ b/src/steps/step-cleanup.js @@ -1,8 +1,8 @@ +const fs = require('node:fs') +const path = require('node:path') const _ = require('lodash') -const fs = require('fs') const debug = require('debug')('thumbsup:debug') const Observable = require('zen-observable') -const path = require('path') const readdir = require('fs-readdir-recursive') exports.run = function (fileCollection, outputRoot, dryRun) { diff --git a/src/steps/step-index.js b/src/steps/step-index.js index d6c6cd4..be4ff38 100644 --- a/src/steps/step-index.js +++ b/src/steps/step-index.js @@ -5,7 +5,7 @@ Caches the results in for faster re-runs -------------------------------------------------------------------------------- */ -const path = require('path') +const path = require('node:path') const hierarchy = require('../input/hierarchy.js') const Index = require('../components/index/index') const info = require('debug')('thumbsup:info') diff --git a/src/steps/step-process.js b/src/steps/step-process.js index b143bc6..1ae857e 100644 --- a/src/steps/step-process.js +++ b/src/steps/step-process.js @@ -1,9 +1,9 @@ +const path = require('node:path') +const fs = require('fs-extra') const debug = require('debug')('thumbsup:debug') const error = require('debug')('thumbsup:error') -const fs = require('fs-extra') const info = require('debug')('thumbsup:info') const ListrWorkQueue = require('../components/listr-work-queue/index') -const path = require('path') const actions = require('./actions') exports.run = function (files, problems, opts, parentTask) { diff --git a/src/website/seo.js b/src/website/seo.js index 44e5aa2..60a43cf 100644 --- a/src/website/seo.js +++ b/src/website/seo.js @@ -1,5 +1,5 @@ -const fs = require('fs') -const path = require('path') +const fs = require('node:fs') +const path = require('node:path') class SEO { constructor (output, seoLocation, rootAlbum) { diff --git a/src/website/theme-base/helpers/relative.js b/src/website/theme-base/helpers/relative.js index 6eddf23..584c185 100644 --- a/src/website/theme-base/helpers/relative.js +++ b/src/website/theme-base/helpers/relative.js @@ -1,4 +1,4 @@ -const path = require('path') +const path = require('node:path') module.exports = (target, options) => { // if already an absolute URL, do nothing diff --git a/src/website/theme.js b/src/website/theme.js index 8674b24..dadddf4 100644 --- a/src/website/theme.js +++ b/src/website/theme.js @@ -1,9 +1,9 @@ +const path = require('node:path') const async = require('async') const debug = require('debug')('thumbsup:debug') const fs = require('fs-extra') const handlebars = require('handlebars') const less = require('less') -const path = require('path') class Theme { constructor (themeDir, destDir, opts) { diff --git a/src/website/website.js b/src/website/website.js index 75bbc4b..d95bc9c 100644 --- a/src/website/website.js +++ b/src/website/website.js @@ -1,5 +1,5 @@ -const fs = require('fs') -const path = require('path') +const fs = require('node:fs') +const path = require('node:path') const async = require('async') const resolvePkg = require('resolve-pkg') const Theme = require('./theme') diff --git a/test/cli/options.spec.js b/test/cli/options.spec.js index ef33868..37605b8 100644 --- a/test/cli/options.spec.js +++ b/test/cli/options.spec.js @@ -1,5 +1,5 @@ -const path = require('path') -const process = require('process') +const path = require('node:path') +const process = require('node:process') const should = require('should/as-function') const sinon = require('sinon') const options = require('../../src/cli/options.js') diff --git a/test/components/exiftool/integration.spec.js b/test/components/exiftool/integration.spec.js index 76ec2a2..0b1eb46 100644 --- a/test/components/exiftool/integration.spec.js +++ b/test/components/exiftool/integration.spec.js @@ -1,4 +1,4 @@ -const path = require('path') +const path = require('node:path') const should = require('should/as-function') const fixtures = require('../../fixtures') const exiftool = require('../../../src/components/exiftool/parallel') diff --git a/test/components/exiftool/stream.spec.js b/test/components/exiftool/stream.spec.js index 05ce13d..900c76f 100644 --- a/test/components/exiftool/stream.spec.js +++ b/test/components/exiftool/stream.spec.js @@ -1,4 +1,4 @@ -const childProcess = require('child_process') +const childProcess = require('node:child_process') const debug = require('debug') const mockSpawn = require('mock-spawn') const should = require('should/as-function') diff --git a/test/components/index/glob.spec.js b/test/components/index/glob.spec.js index f9b8040..9ec6ef6 100644 --- a/test/components/index/glob.spec.js +++ b/test/components/index/glob.spec.js @@ -1,9 +1,9 @@ -const fs = require('fs') -const glob = require('../../../src/components/index/glob') -const { sep } = require('path') -const os = require('os') +const fs = require('node:fs') +const { sep } = require('node:path') +const os = require('node:os') const should = require('should/as-function') const tmp = require('tmp') +const glob = require('../../../src/components/index/glob') describe('Index: glob', function () { this.slow(500) diff --git a/test/components/index/index.spec.js b/test/components/index/index.spec.js index 19c1854..50ebfdd 100644 --- a/test/components/index/index.spec.js +++ b/test/components/index/index.spec.js @@ -1,4 +1,4 @@ -const path = require('path') +const path = require('node:path') const should = require('should/as-function') const Index = require('../../../src/components/index/index') const fixtures = require('../../fixtures') diff --git a/test/fixtures.js b/test/fixtures.js index 38da22f..e869365 100644 --- a/test/fixtures.js +++ b/test/fixtures.js @@ -1,7 +1,7 @@ +const path = require('node:path') const _ = require('lodash') const fs = require('fs-extra') const moment = require('moment') -const path = require('path') const tmp = require('tmp') const File = require('../src/model/file') const Metadata = require('../src/model/metadata') diff --git a/test/input/album-mapper.spec.js b/test/input/album-mapper.spec.js index 0f4ece1..aa25798 100644 --- a/test/input/album-mapper.spec.js +++ b/test/input/album-mapper.spec.js @@ -1,5 +1,5 @@ -const fs = require('fs') -const path = require('path') +const fs = require('node:fs') +const path = require('node:path') const should = require('should/as-function') const tmp = require('tmp') const AlbumMapper = require('../../src/input/album-mapper.js') diff --git a/test/input/hierarchy.spec.js b/test/input/hierarchy.spec.js index 351dbd8..7d8c978 100644 --- a/test/input/hierarchy.spec.js +++ b/test/input/hierarchy.spec.js @@ -1,4 +1,4 @@ -const path = require('path') +const path = require('node:path') const should = require('should/as-function') const sinon = require('sinon') const hierarchy = require('../../src/input/hierarchy.js') diff --git a/test/input/picasa.spec.js b/test/input/picasa.spec.js index d8e5711..fb7e17c 100644 --- a/test/input/picasa.spec.js +++ b/test/input/picasa.spec.js @@ -1,4 +1,4 @@ -const fs = require('fs') +const fs = require('node:fs') const sinon = require('sinon') const should = require('should/as-function') const Picasa = require('../../src/input/picasa.js') diff --git a/test/integration/integration-test.js b/test/integration/integration-test.js index 87b7bb2..37ea2f4 100644 --- a/test/integration/integration-test.js +++ b/test/integration/integration-test.js @@ -1,7 +1,7 @@ -const fs = require('fs') +const fs = require('node:fs') +const path = require('node:path') const debug = require('debug') const glob = require('glob') -const path = require('path') const YAML = require('yaml') const should = require('should/as-function') const fixtures = require('../fixtures') diff --git a/test/log.js b/test/log.js index b6d0fb1..acdc8c9 100644 --- a/test/log.js +++ b/test/log.js @@ -1,5 +1,5 @@ +const util = require('node:util') const debug = require('debug') -const util = require('util') debug.recorded = [] diff --git a/test/steps/step-cleanup.spec.js b/test/steps/step-cleanup.spec.js index fc1eacd..6657e24 100644 --- a/test/steps/step-cleanup.spec.js +++ b/test/steps/step-cleanup.spec.js @@ -1,4 +1,4 @@ -const fs = require('fs') +const fs = require('node:fs') const sinon = require('sinon') const debug = require('debug') const should = require('should/as-function') diff --git a/test/themes/theme.spec.js b/test/themes/theme.spec.js index 02a6f99..5e002db 100644 --- a/test/themes/theme.spec.js +++ b/test/themes/theme.spec.js @@ -1,5 +1,5 @@ +const path = require('node:path') const fs = require('fs-extra') -const path = require('path') const should = require('should/as-function') const fixtures = require('../fixtures') const Theme = require('../../src/website/theme')