(release)

Author: ggaidelevicius

manifest.json

@@ -1,7 +1,7 @@
 {
 	"manifest_version": 3,
 	"name": "__MSG_appName__",
-	"version": "2.8.6",
+	"version": "2.8.7",
 	"description": "__MSG_appDesc__",
 	"author": "Gus Gaidelevicius",
 	"default_locale": "en",

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "weather-please",
-	"version": "2.8.6",
+	"version": "2.8.7",
 	"description": "Savor the elegance and grace of Weather Please as it integrates flawlessly into your browser. A symphony of design and performance awaits – where weather meets artistry in the most subtle, yet captivating, manner.",
 	"private": true,
 	"author": {
@@ -21,10 +21,10 @@
 	"license": "SEE LICENSE IN LICENSE.md",
 	"scripts": {
 		"dev": "next dev",
-		"build": "node renameAppDir rename && pnpm compile && next build && node build && node renameAppDir restore",
+		"build": "node scripts/renameAppDir.mjs rename && pnpm compile && next build && node scripts/build.mjs && node scripts/renameAppDir.mjs restore",
 		"start": "next start",
 		"lint": "pnpm tsc && pnpm prettier . --write",
-		"release": "pnpm build && node release",
+		"release": "pnpm build && node scripts/release.mjs",
 		"extract": "lingui extract",
 		"compile": "lingui compile",
 		"prepare": "husky",

build.js scripts/build.mjsbuild.js renamed to scripts/build.mjs

@@ -1,16 +1,16 @@
 /* eslint-disable no-console */
-const fs = require('fs-extra')
-const glob = require('glob')
-const { execSync } = require('child_process')
-const os = require('os')
-const path = require('path')
+import fs from 'fs-extra'
+import { globSync } from 'glob'
+import path from 'path'
+import { setCwdToRoot } from './lib/root.mjs'
+
+setCwdToRoot()
 
-const moveCommand = os.platform() === 'win32' ? 'move' : 'mv'
 const sourcePath = 'out/_next'
 const destinationPath = 'out/next'
 
 try {
-	execSync(`${moveCommand} ${sourcePath} ${destinationPath}`)
+	fs.moveSync(sourcePath, destinationPath, { overwrite: true })
 	console.log('Moved _next directory to next.')
 } catch (error) {
 	console.error('Move operation failed:', error)
@@ -35,7 +35,7 @@ const main = () => {
 	}
 
 	// Replace content in HTML and JS files
-	const files = glob.sync('out/**/*.{html,js}', { nodir: true })
+	const files = globSync('out/**/*.{html,js}', { nodir: true })
 	for (const file of files) {
 		let content = fs.readFileSync(file, 'utf-8')
 		content = content.replace(/\/_next\//g, '/next/')

scripts/lib/json.mjs

@@ -0,0 +1,9 @@
+import fs from 'fs-extra'
+
+const readJson = ({ filePath }) => fs.readJsonSync(filePath)
+
+const writeJson = ({ filePath, data }) => {
+	fs.writeJsonSync(filePath, data, { spaces: 2 })
+}
+
+export { readJson, writeJson }

scripts/lib/root.mjs

@@ -0,0 +1,13 @@
+import path from 'path'
+import { fileURLToPath } from 'url'
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
+
+const rootPath = path.resolve(__dirname, '..', '..')
+
+const setCwdToRoot = () => {
+	process.chdir(rootPath)
+}
+
+export { rootPath, setCwdToRoot }

release.js scripts/release.mjsrelease.js renamed to scripts/release.mjs

@@ -1,11 +1,16 @@
 /* eslint-disable no-console */
-const fs = require('fs')
-const path = require('path')
-const AdmZip = require('adm-zip')
+import fs from 'fs'
+import path from 'path'
+import AdmZip from 'adm-zip'
+import { readJson, writeJson } from './lib/json.mjs'
+import { setCwdToRoot } from './lib/root.mjs'
+
+setCwdToRoot()
 
 const EXTENSION_DIR = 'extension'
 const MANIFEST_PATH = 'manifest.json'
 const PACKAGE_PATH = 'package.json'
+const EXTENSION_MANIFEST_PATH = path.join(EXTENSION_DIR, MANIFEST_PATH)
 
 const args = process.argv.slice(2)
 const releaseType = args[0]
@@ -55,38 +60,26 @@ const createZipWithContents = (zip, contentPath, zipName) => {
 	fs.renameSync(zipName, EXTENSION_DIR + '/' + zipName)
 }
 
-const addAttributesToManifest = (attributes) => {
-	const manifestContent = JSON.parse(
-		fs.readFileSync(path.join(EXTENSION_DIR, MANIFEST_PATH), 'utf-8'),
-	)
-	Object.assign(manifestContent, attributes)
-	fs.writeFileSync(
-		path.join(EXTENSION_DIR, MANIFEST_PATH),
-		JSON.stringify(manifestContent, null, 2),
-	)
-}
+const readExtensionManifest = () =>
+	readJson({ filePath: EXTENSION_MANIFEST_PATH })
 
-const removeAttributesFromManifest = (attributes) => {
-	const manifestContent = JSON.parse(
-		fs.readFileSync(path.join(EXTENSION_DIR, MANIFEST_PATH), 'utf-8'),
-	)
-	attributes.forEach((attribute) => {
-		delete manifestContent[attribute]
-	})
-	fs.writeFileSync(
-		path.join(EXTENSION_DIR, MANIFEST_PATH),
-		JSON.stringify(manifestContent, null, 2),
-	)
+const writeExtensionManifest = (manifestContent) => {
+	writeJson({ filePath: EXTENSION_MANIFEST_PATH, data: manifestContent })
 }
 
-const modifyManifest = (attributesToAdd, attributesToRemove) => {
-	if (attributesToAdd && Object.keys(attributesToAdd).length > 0) {
-		addAttributesToManifest(attributesToAdd)
-	}
+const updateExtensionManifest = ({
+	baseManifest,
+	attributesToAdd = {},
+	attributesToRemove = [],
+}) => {
+	const nextManifest = { ...baseManifest, ...attributesToAdd }
 
-	if (attributesToRemove && attributesToRemove.length > 0) {
-		removeAttributesFromManifest(attributesToRemove)
+	for (const attribute of attributesToRemove) {
+		delete nextManifest[attribute]
 	}
+
+	writeExtensionManifest(nextManifest)
+	return nextManifest
 }
 
 const processReleaseType = (releaseType) => {
@@ -98,37 +91,42 @@ const processReleaseType = (releaseType) => {
 		process.exit(1)
 	}
 
-	const manifestContent = JSON.parse(fs.readFileSync(MANIFEST_PATH, 'utf-8'))
-	const packageContent = JSON.parse(fs.readFileSync(PACKAGE_PATH, 'utf-8'))
+	const manifestContent = readJson({ filePath: MANIFEST_PATH })
+	const packageContent = readJson({ filePath: PACKAGE_PATH })
 
 	const newVersion = bumpVersion(manifestContent.version, releaseType)
 
 	manifestContent.version = newVersion
 	packageContent.version = newVersion
 
-	fs.writeFileSync(MANIFEST_PATH, JSON.stringify(manifestContent, null, 2))
-	fs.writeFileSync(PACKAGE_PATH, JSON.stringify(packageContent, null, 2))
+	writeJson({ filePath: MANIFEST_PATH, data: manifestContent })
+	writeJson({ filePath: PACKAGE_PATH, data: packageContent })
 
 	console.log(
 		`Version in manifest.json and package.json updated to: ${newVersion}`,
 	)
 
-	modifyManifest({ version: newVersion }, [])
+	const extensionManifest = readExtensionManifest()
+	const baseExtensionManifest = updateExtensionManifest({
+		baseManifest: extensionManifest,
+		attributesToAdd: { version: newVersion },
+	})
 	processZipCreation(EXTENSION_DIR, newVersion, '')
 
-	modifyManifest(
-		{
+	updateExtensionManifest({
+		baseManifest: baseExtensionManifest,
+		attributesToAdd: {
 			browser_specific_settings: {
 				gecko: {
 					id: '{9282bc49-b1b4-4f46-b135-1dfe00f182c9}',
 				},
 			},
 		},
-		['background'],
-	)
+		attributesToRemove: ['background'],
+	})
 	processZipCreation(EXTENSION_DIR, newVersion, '-firefox')
 
-	modifyManifest({}, ['browser_specific_settings'])
+	writeExtensionManifest(baseExtensionManifest)
 
 	packageSource()
 	process.exit(0)

renameAppDir.js scripts/renameAppDir.mjsrenameAppDir.js renamed to scripts/renameAppDir.mjs

@@ -1,8 +1,8 @@
-const fs = require('fs-extra')
-const path = require('path')
-
-const srcAppPath = path.join(__dirname, 'src', 'app')
-const destAppPath = path.join(__dirname, 'src', '_app')
+import fs from 'fs-extra'
+import path from 'path'
+import { rootPath } from './lib/root.mjs'
+const srcAppPath = path.join(rootPath, 'src', 'app')
+const destAppPath = path.join(rootPath, 'src', '_app')
 
 async function renameAppDir(action) {
 	try {

src/locales/bn/messages.po

@@ -53,19 +53,19 @@ msgstr "{0} মাইল/ঘণ্টা"
 #~ msgid "{label}"
 #~ msgstr "ভাষা"
 
-#: src/components/weather-alert.tsx:247
+#: src/components/weather-alert.tsx:258
 msgid "{precipitationInches} inches of precipitation expected over the next {durationHours} hours"
 msgstr "আগামী {durationHours} ঘণ্টায় {precipitationInches} ইঞ্চি বৃষ্টিপাত প্রত্যাশিত."
 
-#: src/components/weather-alert.tsx:239
+#: src/components/weather-alert.tsx:250
 msgid "{precipitationInches} inches of precipitation expected over the next hour"
 msgstr "আগামী এক ঘণ্টায় {precipitationInches} ইঞ্চি বৃষ্টিপাত প্রত্যাশিত."
 
-#: src/components/weather-alert.tsx:231
+#: src/components/weather-alert.tsx:242
 msgid "{precipitationMm}mm of precipitation expected over the next {durationHours} hours"
 msgstr "আগামী {durationHours} ঘণ্টায় {precipitationMm} mm বৃষ্টিপাত প্রত্যাশিত."
 
-#: src/components/weather-alert.tsx:224
+#: src/components/weather-alert.tsx:235
 msgid "{precipitationMm}mm of precipitation expected over the next hour"
 msgstr "আগামী এক ঘণ্টায় {precipitationMm} mm বৃষ্টিপাত প্রত্যাশিত."
 
@@ -463,19 +463,19 @@ msgstr "আজও কাগজের হৃদয় আর নীরব ছোট
 msgid "Evergreens, candles, bells, and stars echo a shared theme drawn from those early traditions: light enduring through the darkest part of the year in the cultures where the holiday first formed."
 msgstr "চিরসবুজ গাছ, মোমবাতি, ঘণ্টা, আর তারা একটি যৌথ থিমকে স্মরণ করিয়ে দেয় ... যে সংস্কৃতিগুলোতে এই উৎসব প্রথম গড়ে উঠেছিল, বছরের সবচেয়ে অন্ধকার সময়ে আলো টিকে থাকার থিম।"
 
-#: src/components/weather-alert.tsx:191
+#: src/components/weather-alert.tsx:202
 msgid "Extreme UV for the next {durationOfExtremeUv} hours"
 msgstr "পরের {durationOfExtremeUv} ঘণ্টা ধরে আত্যধিক ইউভি"
 
 #: src/components/weather-alert.tsx:49
 #~ msgid "Extreme UV for the next 12 hours"
 #~ msgstr "পরের 12 ঘণ্টা ধরে আত্যধিক ইউভি"
 
-#: src/components/weather-alert.tsx:195
+#: src/components/weather-alert.tsx:206
 msgid "Extreme UV for the next hour"
 msgstr "পরের এক ঘণ্টা ধরে আত্যধিক ইউভি"
 
-#: src/components/weather-alert.tsx:182
+#: src/components/weather-alert.tsx:193
 msgid "Extreme UV starting in {timeUntilExtremeUv} hours"
 msgstr "{timeUntilExtremeUv} ঘণ্টা পরে আত্যধিক ইউভি শুরু হবে"
 
@@ -563,19 +563,19 @@ msgstr "জেমিনিডস উল্কাবৃষ্টি"
 msgid "General"
 msgstr "সাধারণ"
 
-#: src/components/weather-alert.tsx:277
+#: src/components/weather-alert.tsx:291
 msgid "Generally strong wind for the next {durationOfStrongWind} hours"
 msgstr "আগামী {durationOfStrongWind} ঘণ্টা ধরে সাধারণত প্রবল বাতাস"
 
-#: src/components/weather-alert.tsx:283
+#: src/components/weather-alert.tsx:297
 msgid "Generally strong wind for the next 24 hours"
 msgstr "আগামী ২৪ ঘণ্টা ধরে সাধারণত প্রবল বাতাস"
 
-#: src/components/weather-alert.tsx:286
+#: src/components/weather-alert.tsx:300
 msgid "Generally strong wind for the next hour"
 msgstr "আগামী এক ঘণ্টা ধরে সাধারণত প্রবল বাতাস"
 
-#: src/components/weather-alert.tsx:269
+#: src/components/weather-alert.tsx:283
 msgid "Generally strong wind starting in {timeUntilStrongWind} hours"
 msgstr "{timeUntilStrongWind} ঘণ্টা পর থেকে সাধারণত প্রবল বাতাস শুরু হবে"
 
@@ -927,19 +927,19 @@ msgstr "দ্রাঘিমাংশ"
 #~ msgid "Looks like we can't grab your location info automatically."
 #~ msgstr "মনে হচ্ছে আমরা আপনার অবস্থানের তথ্য স্বয়ংক্রিয়ভাবে পেতে পারছি না।"
 
-#: src/components/weather-alert.tsx:345
+#: src/components/weather-alert.tsx:369
 msgid "Low visibility for the next {durationOfLowVisibility} hours"
 msgstr "পরের {durationOfLowVisibility} ঘণ্টা ধরে কম দৃশ্যতা"
 
-#: src/components/weather-alert.tsx:351
+#: src/components/weather-alert.tsx:375
 msgid "Low visibility for the next 24 hours"
 msgstr "পরের 24 ঘণ্টা ধরে কম দৃশ্যতা"
 
-#: src/components/weather-alert.tsx:354
+#: src/components/weather-alert.tsx:378
 msgid "Low visibility for the next hour"
 msgstr "পরের এক ঘণ্টা ধরে কম দৃশ্যতা"
 
-#: src/components/weather-alert.tsx:339
+#: src/components/weather-alert.tsx:361
 msgid "Low visibility starting in {timeUntilLowVisibility} hours"
 msgstr "{timeUntilLowVisibility} ঘণ্টা পরে কম দৃশ্যতা শুরু হবে"
 
@@ -1424,19 +1424,19 @@ msgstr "হোলিকে ঘিরে গল্প অঞ্চলভেদে
 #~ msgid "Strong wind for the next hour"
 #~ msgstr "পরের এক ঘণ্টা ধরে শক্তিশালী বাতাস"
 
-#: src/components/weather-alert.tsx:311
+#: src/components/weather-alert.tsx:330
 msgid "Strong wind gusts for the next {durationOfStrongWind} hours"
 msgstr "পরের {durationOfStrongWind} ঘণ্টা ধরে শক্তিশালী বাতাসের ঝড়"
 
-#: src/components/weather-alert.tsx:317
+#: src/components/weather-alert.tsx:336
 msgid "Strong wind gusts for the next 24 hours"
 msgstr "পরের 24 ঘণ্টা ধরে শক্তিশালী বাতাসের ঝড়"
 
-#: src/components/weather-alert.tsx:320
+#: src/components/weather-alert.tsx:339
 msgid "Strong wind gusts for the next hour"
 msgstr "পরের এক ঘণ্টা ধরে শক্তিশালী বাতাসের ঝড়"
 
-#: src/components/weather-alert.tsx:305
+#: src/components/weather-alert.tsx:322
 msgid "Strong wind gusts starting in {timeUntilStrongWind} hours"
 msgstr "{timeUntilStrongWind} ঘণ্টা পর শক্তিশালী বাতাসের ঝড় শুরু হবে"