Skip to content

fix(deps): resolve Zalgo issue #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bin/weex.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

// first, do a sniff test to ensure our dependencies are met
const sniff = require('../lib/sniff')
const colors = require('colors')
const colors = require('@colors/colors')

// check the node version
if (!sniff.isNewEnough) {
Expand All @@ -16,4 +16,4 @@ require('../lib/cli')(process.argv);

process.on('SIGINT', function () {
process.exit();
});
});
2 changes: 1 addition & 1 deletion lib/cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const debug = require('debug')('weex:cli');

const pkg = require('../package.json');
const colors = require('colors/safe');
const colors = require('@colors/colors/safe');
const semver = require('semver');
const spawn = require('cross-spawn');
const path = require('path');
Expand Down
4 changes: 2 additions & 2 deletions lib/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const debug = require('debug')('weex:cli');

const fse = require('fs-extra');
const path = require('path');
const colors = require('colors');
const colors = require('@colors/colors');
const onExist = require('on-exit');
const trash = require('./trash');
const installer = require('./installer');
Expand Down Expand Up @@ -181,4 +181,4 @@ module.exports = {
readJson,
install,
confirm
}
}
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"author": "Mario <[email protected]>",
"license": "MIT",
"dependencies": {
"colors": "^1.3.0",
"@colors/colors": "^1.3.0",
"cross-spawn": "^6.0.5",
"debug": "^3.1.0",
"fs-extra": "^6.0.1",
Expand All @@ -37,6 +37,7 @@
"yargs-parser": "^10.1.0"
},
"devDependencies": {
"co": "^4.6.0",
"eslint": "^5.11.1",
"eslint-plugin-node": "^8.0.0",
"jest": "^23.6.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ test('spin', () => {
expect(typeof logger.spin).toBe('function')
})

test('colors', () => {
test('@colors/colors', () => {
expect(typeof logger.colors.highlight).toBe('function')
expect(typeof logger.colors.info).toBe('function')
expect(typeof logger.colors.warning).toBe('function')
Expand Down
2 changes: 1 addition & 1 deletion packages/@weex/core/src/toolbox/installer-tools.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { fs } from './fs-tools'
import * as path from 'path'
import * as importedColors from 'colors/safe'
import * as importedColors from '@colors/colors/safe'
import { InstallerOption } from './installer-types'
import * as childProcess from 'child_process'
import * as npmii from 'npminstall'
Expand Down
2 changes: 1 addition & 1 deletion packages/@weex/core/src/toolbox/logger-tools.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ test('progress', () => {
expect(typeof progress.setTemplate).toBe('function')
})

test('colors', () => {
test('@colors/colors', () => {
expect(typeof logger.colors.highlight).toBe('function')
expect(typeof logger.colors.info).toBe('function')
expect(typeof logger.colors.warning).toBe('function')
Expand Down
2 changes: 1 addition & 1 deletion packages/@weex/core/src/toolbox/logger-tools.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as CLITable from 'cli-table2'
import * as importedColors from 'colors/safe'
import * as importedColors from '@colors/colors/safe'
import * as Gauge from 'gauge'
import { commandInfo } from './meta-tools'
import { Toolbox } from '../core/toolbox'
Expand Down
2 changes: 1 addition & 1 deletion packages/@weex/plugins/doctor/src/doctor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import { AndroidWorkflow, AndroidValidator } from './android/android-workflow'
import { IOSWorkflow, IOSValidator } from './ios/ios-workflow'
import { isWindows } from '@weex-cli/utils/lib/platform/platform'
import * as colors from 'colors'
import * as colors from '@colors/colors'

export const enum ValidationType {
missing,
Expand Down
2 changes: 1 addition & 1 deletion packages/@weex/plugins/plugin/src/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import * as fse from 'fs-extra'
import * as path from 'path'
import * as xcode from 'xcode'
import * as merge from 'merge'
import * as colors from 'colors'
import * as colors from '@colors/colors'
import * as plist from 'plist'
import * as EventEmitter from 'events'
import { LOGLEVEL } from './log-types'
Expand Down
2 changes: 1 addition & 1 deletion scripts/verifyCommitMessage.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

const colors = require('colors') // eslint-disable-line
const colors = require('@colors/colors') // eslint-disable-line
const msgPath = process.env.GIT_PARAMS
const msg = require('fs').readFileSync(msgPath, 'utf-8').trim()

Expand Down