forked from cybrespace/pinafore
		
	chore: remove pify dependency, use util.promisify (#901)
This commit is contained in:
		
							parent
							
								
									4a8f65b7fc
								
							
						
					
					
						commit
						6b3d53a795
					
				
					 8 changed files with 18 additions and 24 deletions
				
			
		| 
						 | 
					@ -1,6 +1,6 @@
 | 
				
			||||||
import crypto from 'crypto'
 | 
					import crypto from 'crypto'
 | 
				
			||||||
import fs from 'fs'
 | 
					import fs from 'fs'
 | 
				
			||||||
import pify from 'pify'
 | 
					import { promisify } from 'util'
 | 
				
			||||||
import path from 'path'
 | 
					import path from 'path'
 | 
				
			||||||
import { rollup } from 'rollup'
 | 
					import { rollup } from 'rollup'
 | 
				
			||||||
import { terser } from 'rollup-plugin-terser'
 | 
					import { terser } from 'rollup-plugin-terser'
 | 
				
			||||||
| 
						 | 
					@ -8,7 +8,7 @@ import replace from 'rollup-plugin-replace'
 | 
				
			||||||
import fromPairs from 'lodash-es/fromPairs'
 | 
					import fromPairs from 'lodash-es/fromPairs'
 | 
				
			||||||
import { themes } from '../src/routes/_static/themes'
 | 
					import { themes } from '../src/routes/_static/themes'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const writeFile = pify(fs.writeFile.bind(fs))
 | 
					const writeFile = promisify(fs.writeFile)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const themeColors = fromPairs(themes.map(_ => ([_.name, _.color])))
 | 
					const themeColors = fromPairs(themes.map(_ => ([_.name, _.color])))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,11 +1,11 @@
 | 
				
			||||||
import sass from 'node-sass'
 | 
					import sass from 'node-sass'
 | 
				
			||||||
import path from 'path'
 | 
					import path from 'path'
 | 
				
			||||||
import fs from 'fs'
 | 
					import fs from 'fs'
 | 
				
			||||||
import pify from 'pify'
 | 
					import { promisify } from 'util'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const writeFile = pify(fs.writeFile.bind(fs))
 | 
					const writeFile = promisify(fs.writeFile)
 | 
				
			||||||
const readdir = pify(fs.readdir.bind(fs))
 | 
					const readdir = promisify(fs.readdir)
 | 
				
			||||||
const render = pify(sass.render.bind(sass))
 | 
					const render = promisify(sass.render.bind(sass))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const globalScss = path.join(__dirname, '../src/scss/global.scss')
 | 
					const globalScss = path.join(__dirname, '../src/scss/global.scss')
 | 
				
			||||||
const defaultThemeScss = path.join(__dirname, '../src/scss/themes/_default.scss')
 | 
					const defaultThemeScss = path.join(__dirname, '../src/scss/themes/_default.scss')
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,12 +1,12 @@
 | 
				
			||||||
import svgs from './svgs'
 | 
					import svgs from './svgs'
 | 
				
			||||||
import path from 'path'
 | 
					import path from 'path'
 | 
				
			||||||
import fs from 'fs'
 | 
					import fs from 'fs'
 | 
				
			||||||
import pify from 'pify'
 | 
					import { promisify } from 'util'
 | 
				
			||||||
import SVGO from 'svgo'
 | 
					import SVGO from 'svgo'
 | 
				
			||||||
import $ from 'cheerio'
 | 
					import $ from 'cheerio'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const svgo = new SVGO()
 | 
					const svgo = new SVGO()
 | 
				
			||||||
const readFile = pify(fs.readFile.bind(fs))
 | 
					const readFile = promisify(fs.readFile)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export async function buildSvg () {
 | 
					export async function buildSvg () {
 | 
				
			||||||
  let result = (await Promise.all(svgs.map(async svg => {
 | 
					  let result = (await Promise.all(svgs.map(async svg => {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,14 +1,14 @@
 | 
				
			||||||
import chokidar from 'chokidar'
 | 
					import chokidar from 'chokidar'
 | 
				
			||||||
import fs from 'fs'
 | 
					import fs from 'fs'
 | 
				
			||||||
import path from 'path'
 | 
					import path from 'path'
 | 
				
			||||||
import pify from 'pify'
 | 
					import { promisify } from 'util'
 | 
				
			||||||
import { buildSass } from './build-sass'
 | 
					import { buildSass } from './build-sass'
 | 
				
			||||||
import { buildInlineScript } from './build-inline-script'
 | 
					import { buildInlineScript } from './build-inline-script'
 | 
				
			||||||
import { buildSvg } from './build-svg'
 | 
					import { buildSvg } from './build-svg'
 | 
				
			||||||
import now from 'performance-now'
 | 
					import now from 'performance-now'
 | 
				
			||||||
import debounce from 'lodash-es/debounce'
 | 
					import debounce from 'lodash-es/debounce'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const writeFile = pify(fs.writeFile.bind(fs))
 | 
					const writeFile = promisify(fs.writeFile)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const DEBOUNCE = 500
 | 
					const DEBOUNCE = 500
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,11 +1,11 @@
 | 
				
			||||||
import path from 'path'
 | 
					import path from 'path'
 | 
				
			||||||
import fs from 'fs'
 | 
					import fs from 'fs'
 | 
				
			||||||
import pify from 'pify'
 | 
					import { promisify } from 'util'
 | 
				
			||||||
import CleanCSS from 'clean-css'
 | 
					import CleanCSS from 'clean-css'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const writeFile = pify(fs.writeFile.bind(fs))
 | 
					const writeFile = promisify(fs.writeFile)
 | 
				
			||||||
const readFile = pify(fs.readFile.bind(fs))
 | 
					const readFile = promisify(fs.readFile)
 | 
				
			||||||
const copyFile = pify(fs.copyFile.bind(fs))
 | 
					const copyFile = promisify(fs.copyFile)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
async function compileThirdPartyCss () {
 | 
					async function compileThirdPartyCss () {
 | 
				
			||||||
  let css = await readFile(path.resolve(__dirname, '../node_modules/emoji-mart/css/emoji-mart.css'), 'utf8')
 | 
					  let css = await readFile(path.resolve(__dirname, '../node_modules/emoji-mart/css/emoji-mart.css'), 'utf8')
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
import { restoreMastodonData } from './restore-mastodon-data'
 | 
					import { restoreMastodonData } from './restore-mastodon-data'
 | 
				
			||||||
import pify from 'pify'
 | 
					import { promisify } from 'util'
 | 
				
			||||||
import childProcessPromise from 'child-process-promise'
 | 
					import childProcessPromise from 'child-process-promise'
 | 
				
			||||||
import path from 'path'
 | 
					import path from 'path'
 | 
				
			||||||
import fs from 'fs'
 | 
					import fs from 'fs'
 | 
				
			||||||
| 
						 | 
					@ -8,9 +8,9 @@ import mkdirpCB from 'mkdirp'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const exec = childProcessPromise.exec
 | 
					const exec = childProcessPromise.exec
 | 
				
			||||||
const spawn = childProcessPromise.spawn
 | 
					const spawn = childProcessPromise.spawn
 | 
				
			||||||
const mkdirp = pify(mkdirpCB)
 | 
					const mkdirp = promisify(mkdirpCB)
 | 
				
			||||||
const stat = pify(fs.stat.bind(fs))
 | 
					const stat = promisify(fs.stat)
 | 
				
			||||||
const writeFile = pify(fs.writeFile.bind(fs))
 | 
					const writeFile = promisify(fs.writeFile)
 | 
				
			||||||
const dir = __dirname
 | 
					const dir = __dirname
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const GIT_URL = 'https://github.com/tootsuite/mastodon.git'
 | 
					const GIT_URL = 'https://github.com/tootsuite/mastodon.git'
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										5
									
								
								package-lock.json
									
										
									
										generated
									
									
									
								
							
							
						
						
									
										5
									
								
								package-lock.json
									
										
									
										generated
									
									
									
								
							| 
						 | 
					@ -7338,11 +7338,6 @@
 | 
				
			||||||
      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.0.tgz",
 | 
					      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.0.tgz",
 | 
				
			||||||
      "integrity": "sha512-9CT4NFlDcosssyg8KVFltgokyKZIFjoBxw8CTGy+5F38Y1eQWrt8tRayiUOXE+zVKQnYu5BR8JjCtvK3BcnBhg=="
 | 
					      "integrity": "sha512-9CT4NFlDcosssyg8KVFltgokyKZIFjoBxw8CTGy+5F38Y1eQWrt8tRayiUOXE+zVKQnYu5BR8JjCtvK3BcnBhg=="
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "pify": {
 | 
					 | 
				
			||||||
      "version": "4.0.1",
 | 
					 | 
				
			||||||
      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
 | 
					 | 
				
			||||||
      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
 | 
					 | 
				
			||||||
    },
 | 
					 | 
				
			||||||
    "pinkie": {
 | 
					    "pinkie": {
 | 
				
			||||||
      "version": "2.0.4",
 | 
					      "version": "2.0.4",
 | 
				
			||||||
      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
 | 
					      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -79,7 +79,6 @@
 | 
				
			||||||
    "p-any": "^1.1.0",
 | 
					    "p-any": "^1.1.0",
 | 
				
			||||||
    "page-lifecycle": "^0.1.1",
 | 
					    "page-lifecycle": "^0.1.1",
 | 
				
			||||||
    "performance-now": "^2.1.0",
 | 
					    "performance-now": "^2.1.0",
 | 
				
			||||||
    "pify": "^4.0.1",
 | 
					 | 
				
			||||||
    "prop-types": "^15.6.2",
 | 
					    "prop-types": "^15.6.2",
 | 
				
			||||||
    "quick-lru": "^2.0.0",
 | 
					    "quick-lru": "^2.0.0",
 | 
				
			||||||
    "remount": "^0.9.3",
 | 
					    "remount": "^0.9.3",
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue