esbuild-plugin-scriptable
Advanced tools
Comparing version 0.6.6 to 0.6.7
@@ -90,3 +90,5 @@ 'use strict'; | ||
if (result.outputFiles) { | ||
const outputFile = result.outputFiles.find((file) => file.path === outputPath || file.path === "<stdout>"); | ||
const outputFile = result.outputFiles.find( | ||
(file) => utils.isSamePath(file.path, outputPath) || file.path === "<stdout>" | ||
); | ||
if (outputFile) { | ||
@@ -93,0 +95,0 @@ outputFile.contents = Buffer.from(banner + outputFile.text.trimEnd()); |
@@ -89,3 +89,3 @@ 'use strict'; | ||
if (result.outputFiles) { | ||
const outputFile = result.outputFiles.find((f) => utils.isPathEqual(f.path, file)); | ||
const outputFile = result.outputFiles.find((f) => utils.isSamePath(f.path, file)); | ||
if (!outputFile) { | ||
@@ -92,0 +92,0 @@ throw new Error(`Output file not found: ${file}`); |
@@ -53,3 +53,3 @@ 'use strict'; | ||
const np = normalizePath; | ||
function isPathEqual(path1, path2) { | ||
function isSamePath(path1, path2) { | ||
return path.resolve(normalizePath(path1)) === path.resolve(normalizePath(path2)); | ||
@@ -60,3 +60,3 @@ } | ||
exports.isMatch = isMatch; | ||
exports.isPathEqual = isPathEqual; | ||
exports.isSamePath = isSamePath; | ||
exports.normalizeAndResolvePath = normalizeAndResolvePath; | ||
@@ -63,0 +63,0 @@ exports.normalizePath = normalizePath; |
@@ -8,3 +8,3 @@ import { generateScriptableBanner } from "@scriptables/manifest/generateScriptableBanner"; | ||
import { createLogger } from "./logger.js"; | ||
import { isMatch, normalizeAndResolvePath, waitForFile } from "./utils.js"; | ||
import { isMatch, normalizeAndResolvePath, isSamePath, waitForFile } from "./utils.js"; | ||
const DEFAULT_MANIFEST_EXTENSIONS = [".manifest.json", ".manifest", ".json"]; | ||
@@ -79,3 +79,3 @@ function scriptableBanner(options = {}) { | ||
if (result.outputFiles) { | ||
const outputFile = result.outputFiles.find((file) => file.path === outputPath || file.path === "<stdout>"); | ||
const outputFile = result.outputFiles.find((file) => isSamePath(file.path, outputPath) || file.path === "<stdout>"); | ||
if (outputFile) { | ||
@@ -82,0 +82,0 @@ outputFile.contents = Buffer.from(banner + outputFile.text.trimEnd()); |
@@ -7,3 +7,3 @@ import { generateScriptableBanner } from "@scriptables/manifest/generateScriptableBanner"; | ||
import { createLogger } from "./logger.js"; | ||
import { createPatternMatcher, normalizeAndResolvePath, isPathEqual, waitForFile } from "./utils.js"; | ||
import { createPatternMatcher, normalizeAndResolvePath, isSamePath, waitForFile } from "./utils.js"; | ||
const findICloudBugsUrl = "https://github.com/hexxspark/findicloud/issues"; | ||
@@ -82,3 +82,3 @@ async function tryReadManifest(filePath, extensions) { | ||
if (result.outputFiles) { | ||
const outputFile = result.outputFiles.find((f) => isPathEqual(f.path, file)); | ||
const outputFile = result.outputFiles.find((f) => isSamePath(f.path, file)); | ||
if (!outputFile) { | ||
@@ -85,0 +85,0 @@ throw new Error(`Output file not found: ${file}`); |
@@ -22,4 +22,4 @@ import micromatch from 'micromatch'; | ||
declare const np: typeof normalizePath; | ||
declare function isPathEqual(path1: string, path2: string): boolean; | ||
declare function isSamePath(path1: string, path2: string): boolean; | ||
export { createPatternMatcher, isMatch, isPathEqual, normalizeAndResolvePath, normalizePath, np, waitForFile }; | ||
export { createPatternMatcher, isMatch, isSamePath, normalizeAndResolvePath, normalizePath, np, waitForFile }; |
@@ -46,8 +46,8 @@ import { existsSync, realpathSync } from 'fs'; | ||
const np = normalizePath; | ||
function isPathEqual(path1, path2) { | ||
function isSamePath(path1, path2) { | ||
return resolve(normalizePath(path1)) === resolve(normalizePath(path2)); | ||
} | ||
export { createPatternMatcher, isMatch, isPathEqual, normalizeAndResolvePath, normalizePath, np, waitForFile }; | ||
export { createPatternMatcher, isMatch, isSamePath, normalizeAndResolvePath, normalizePath, np, waitForFile }; | ||
//# sourceMappingURL=utils.js.map | ||
//# sourceMappingURL=utils.js.map |
{ | ||
"name": "esbuild-plugin-scriptable", | ||
"description": "An ESBuild plugin for developing Scriptable iOS app scripts with TypeScript, manifest support and auto-deployment", | ||
"version": "0.6.6", | ||
"version": "0.6.7", | ||
"keywords": [ | ||
@@ -6,0 +6,0 @@ "scriptable", |
@@ -11,3 +11,3 @@ import type {ScriptableManifest} from '@scriptables/manifest'; | ||
import {createLogger} from './logger'; | ||
import {isMatch, normalizeAndResolvePath, waitForFile} from './utils'; | ||
import {isMatch, isSamePath, normalizeAndResolvePath, waitForFile} from './utils'; | ||
@@ -140,3 +140,5 @@ const DEFAULT_MANIFEST_EXTENSIONS = ['.manifest.json', '.manifest', '.json']; | ||
// Memory mode: Modify outputFiles directly | ||
const outputFile = result.outputFiles.find(file => file.path === outputPath || file.path === '<stdout>'); | ||
const outputFile = result.outputFiles.find( | ||
file => isSamePath(file.path, outputPath) || file.path === '<stdout>', | ||
); | ||
if (outputFile) { | ||
@@ -143,0 +145,0 @@ outputFile.contents = Buffer.from(banner + outputFile.text.trimEnd()); |
@@ -10,3 +10,3 @@ import type {ScriptableManifest} from '@scriptables/manifest'; | ||
import {createLogger} from './logger'; | ||
import {createPatternMatcher, isPathEqual as isSamePath, normalizeAndResolvePath, waitForFile} from './utils'; | ||
import {createPatternMatcher, isSamePath, normalizeAndResolvePath, waitForFile} from './utils'; | ||
@@ -13,0 +13,0 @@ export interface ScriptableDeployOptions { |
@@ -81,4 +81,4 @@ import {existsSync, realpathSync} from 'fs'; | ||
export function isPathEqual(path1: string, path2: string): boolean { | ||
export function isSamePath(path1: string, path2: string): boolean { | ||
return resolve(normalizePath(path1)) === resolve(normalizePath(path2)); | ||
} |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
124761
1322