m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-10-22 11:22:43 +02:00
Code

Fix node/no-path-concat issues (#9669)

Browse Source 
Refs #9663

See [`node/no-path-concat`][1] for more information.

This change enables `node/no-path-concat` and fixes the issues raised by the rule.

  [1]:https://github.com/mysticatea/eslint-plugin-node/blob/v11.1.0/docs/rules/no-path-concat.md
This commit is contained in:
Whymarrh Whitby 2020-10-22 00:04:52 -02:30 committed by GitHub
parent e5688c024e
commit b704eaeb66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintrc.js
View File

@ -95,7 +95,6 @@ module.exports = {
'node/no-unpublished-import': 'off',
'node/no-unpublished-require': 'off',
'node/no-unsupported-features/node-builtins': 'off',
'node/no-path-concat': 'off',
'dot-notation': 'off',
'mocha/max-top-level-suites': 'off',
},

21
development/build/manifest.js
View File

@ -1,4 +1,5 @@
const { promises: fs } = require('fs')
const path = require('path')
const { merge, cloneDeep } = require('lodash')
const baseManifest = require('../../app/manifest/_base.json')
@ -16,11 +17,11 @@ function createManifestTasks ({ browserPlatforms }) {
// merge base manifest with per-platform manifests
const prepPlatforms = async () => {
return Promise.all(browserPlatforms.map(async (platform) => {
const platformModifications = await readJson(`${__dirname}/../../app/manifest/${platform}.json`)
const platformModifications = await readJson(path.join(__dirname, '..', '..', 'app', 'manifest', `${platform}.json`))
const result = merge(cloneDeep(baseManifest), platformModifications)
const dir = `./dist/${platform}`
const dir = path.join('.', 'dist', platform)
await fs.mkdir(dir, { recursive: true })
await writeJson(result, `${dir}/manifest.json`)
await writeJson(result, path.join(dir, 'manifest.json'))
}))
}
@ -75,10 +76,10 @@ function createManifestTasks ({ browserPlatforms }) {
function createTaskForModifyManifestForEnvironment (transformFn) {
return () => {
return Promise.all(browserPlatforms.map(async (platform) => {
const path = `./dist/${platform}/manifest.json`
const manifest = await readJson(path)
const manifestPath = path.join('.', 'dist', platform, 'manifest.json')
const manifest = await readJson(manifestPath)
transformFn(manifest)
await writeJson(manifest, path)
await writeJson(manifest, manifestPath)
}))
}
}
@ -86,11 +87,11 @@ function createManifestTasks ({ browserPlatforms }) {
}
// helper for reading and deserializing json from fs
async function readJson (path) {
return JSON.parse(await fs.readFile(path, 'utf8'))
async function readJson (file) {
return JSON.parse(await fs.readFile(file, 'utf8'))
}
// helper for serializing and writing json to fs
async function writeJson (obj, path) {
return fs.writeFile(path, JSON.stringify(obj, null, 2))
async function writeJson (obj, file) {
return fs.writeFile(file, JSON.stringify(obj, null, 2))
}