Skip to content

Commit

Permalink
Merge branch 'main' into fix-lint
Browse files Browse the repository at this point in the history
  • Loading branch information
northword authored Jul 13, 2023
2 parents 0971bd0 + 10d9879 commit 79e87f0
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"eslint-config-prettier": "^8.8.0",
"prettier": "^3.0.0",
"release-it": "^16.1.0",
"replace-in-file": "^6.3.5",
"replace-in-file": "^7.0.1",
"typescript": "^5.1.6",
"zotero-types": "^1.0.16"
}
Expand Down
14 changes: 7 additions & 7 deletions scripts/build.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,11 @@ function replaceString() {

const optionsAddon = {
files: [
path.join(buildDir, "**/*.xhtml"),
path.join(buildDir, "**/*.json"),
path.join(buildDir, "addon/prefs.js"),
path.join(buildDir, "addon/manifest.json"),
path.join(buildDir, "addon/bootstrap.js"),
`${buildDir}/addon/**/*.xhtml`,
`${buildDir}/addon/**/*.json`,
`${buildDir}/addon/prefs.js`,
`${buildDir}/addon/manifest.json`,
`${buildDir}/addon/bootstrap.js`,
"update.json",
],
from: replaceFrom,
Expand All @@ -148,7 +148,7 @@ function replaceString() {
const localeMessageMiss = new Set();

const replaceResultFlt = replaceInFileSync({
files: [path.join(buildDir, "addon/**/*.ftl")],
files: [`${buildDir}/addon/locale/**/*.ftl`],
processor: (fltContent) => {
const lines = fltContent.split("\n");
const prefixedLines = lines.map((line) => {
Expand All @@ -168,7 +168,7 @@ function replaceString() {
});

const replaceResultXhtml = replaceInFileSync({
files: [path.join(buildDir, "addon/**/*.xhtml")],
files: [`${buildDir}/addon/**/*.xhtml`],
processor: (input) => {
const matchs = [...input.matchAll(/(data-l10n-id)="(\S*)"/g)];
matchs.map((match) => {
Expand Down
2 changes: 1 addition & 1 deletion scripts/start.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ if (existsSync(profilePath)) {
throw new Error("The given Zotero profile does not exist.");
}

const startZotero = `"${zoteroBinPath}" --debugger --purgecaches -profile ${profilePath}`;
const startZotero = `"${zoteroBinPath}" --debugger --purgecaches -profile "${profilePath}"`;

execSync(startZotero);
exit(0);

0 comments on commit 79e87f0

Please sign in to comment.